e10f7dd7a7
Remove no longer used google scripts Remove convenience files from comicataggerlib and import comicapi directly Add type-hints to facilitate auto-complete tools Make PyQt5 code more compatible with PyQt6 Implement automatic tooling isort and black for code formatting Line length has been set to 120 flake8 for code standards with exceptions: E203 - Whitespace before ':' - format compatiblity with black E501 - Line too long - flake8 line limit cannot be set E722 - Do not use bare except - fixing bare except statements is a lot of overhead and there are already many in the codebase These changes, along with some manual fixes creates much more readable code. See examples below: diff --git a/comicapi/comet.py b/comicapi/comet.py index d1741c5..52dc195 100644 --- a/comicapi/comet.py +++ b/comicapi/comet.py @@ -166,7 +166,2 @@ class CoMet: - if credit['role'].lower() in set(self.editor_synonyms): - ET.SubElement( - root, - 'editor').text = "{0}".format( - credit['person']) @@ -174,2 +169,4 @@ class CoMet: self.indent(root) + if credit["role"].lower() in set(self.editor_synonyms): + ET.SubElement(root, "editor").text = str(credit["person"]) diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py index 4338176..9219f01 100644 --- a/comictaggerlib/autotagmatchwindow.py +++ b/comictaggerlib/autotagmatchwindow.py @@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog): self.skipButton, QtWidgets.QDialogButtonBox.ActionRole) - self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText( - "Accept and Write Tags") + self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags") diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py index 688907d..dbd0c2e 100644 --- a/comictaggerlib/cli.py +++ b/comictaggerlib/cli.py @@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results): if opts.raw: - print(( - "{0}".format( - str( - ca.readRawCIX(), - errors='ignore')))) + print(ca.read_raw_cix()) else:
174 lines
4.9 KiB
Python
174 lines
4.9 KiB
Python
"""A class to manage fetching and caching of images by URL"""
|
|
|
|
# Copyright 2012-2014 Anthony Beville
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import datetime
|
|
import os
|
|
import shutil
|
|
import sqlite3 as lite
|
|
import tempfile
|
|
|
|
import requests
|
|
|
|
try:
|
|
from PyQt5 import QtCore, QtNetwork
|
|
|
|
qt_available = True
|
|
except ImportError:
|
|
qt_available = False
|
|
|
|
|
|
from comictaggerlib import ctversion
|
|
from comictaggerlib.settings import ComicTaggerSettings
|
|
|
|
|
|
class ImageFetcherException(Exception):
|
|
pass
|
|
|
|
|
|
def fetch_complete(this, image_data):
|
|
...
|
|
|
|
|
|
class ImageFetcher:
|
|
|
|
image_fetch_complete = fetch_complete
|
|
|
|
def __init__(self):
|
|
|
|
self.settings_folder = ComicTaggerSettings.get_settings_folder()
|
|
self.db_file = os.path.join(self.settings_folder, "image_url_cache.db")
|
|
self.cache_folder = os.path.join(self.settings_folder, "image_cache")
|
|
|
|
self.user_data = None
|
|
self.fetched_url = ""
|
|
|
|
if not os.path.exists(self.db_file):
|
|
self.create_image_db()
|
|
|
|
if qt_available:
|
|
self.nam = QtNetwork.QNetworkAccessManager()
|
|
|
|
def clear_cache(self):
|
|
os.unlink(self.db_file)
|
|
if os.path.isdir(self.cache_folder):
|
|
shutil.rmtree(self.cache_folder)
|
|
|
|
def fetch(self, url, blocking=False):
|
|
"""
|
|
If called with blocking=True, this will block until the image is
|
|
fetched.
|
|
If called with blocking=False, this will run the fetch in the
|
|
background, and emit a signal when done
|
|
"""
|
|
|
|
self.fetched_url = url
|
|
|
|
# first look in the DB
|
|
image_data = self.get_image_from_cache(url)
|
|
if blocking or not qt_available:
|
|
if image_data is None:
|
|
try:
|
|
print(url)
|
|
image_data = requests.get(url, headers={"user-agent": "comictagger/" + ctversion.version}).content
|
|
except Exception as e:
|
|
print(e)
|
|
raise ImageFetcherException("Network Error!") from e
|
|
|
|
# save the image to the cache
|
|
self.add_image_to_cache(self.fetched_url, image_data)
|
|
return image_data
|
|
|
|
if qt_available:
|
|
# if we found it, just emit the signal asap
|
|
if image_data is not None:
|
|
self.image_fetch_complete(QtCore.QByteArray(image_data))
|
|
return bytes()
|
|
|
|
# didn't find it. look online
|
|
self.nam.finished.connect(self.finish_request)
|
|
self.nam.get(QtNetwork.QNetworkRequest(QtCore.QUrl(url)))
|
|
|
|
# we'll get called back when done...
|
|
return bytes()
|
|
|
|
def finish_request(self, reply):
|
|
# read in the image data
|
|
print("request finished")
|
|
image_data = reply.readAll()
|
|
|
|
# save the image to the cache
|
|
self.add_image_to_cache(self.fetched_url, image_data)
|
|
|
|
self.image_fetch_complete(image_data)
|
|
|
|
def create_image_db(self):
|
|
|
|
# this will wipe out any existing version
|
|
open(self.db_file, "w").close()
|
|
|
|
# wipe any existing image cache folder too
|
|
if os.path.isdir(self.cache_folder):
|
|
shutil.rmtree(self.cache_folder)
|
|
os.makedirs(self.cache_folder)
|
|
|
|
con = lite.connect(self.db_file)
|
|
|
|
# create tables
|
|
with con:
|
|
cur = con.cursor()
|
|
|
|
cur.execute("CREATE TABLE Images(url TEXT,filename TEXT,timestamp TEXT,PRIMARY KEY (url))")
|
|
|
|
def add_image_to_cache(self, url, image_data):
|
|
|
|
con = lite.connect(self.db_file)
|
|
|
|
with con:
|
|
cur = con.cursor()
|
|
|
|
timestamp = datetime.datetime.now()
|
|
|
|
tmp_fd, filename = tempfile.mkstemp(dir=self.cache_folder, prefix="img")
|
|
f = os.fdopen(tmp_fd, "w+b")
|
|
f.write(image_data)
|
|
f.close()
|
|
|
|
cur.execute("INSERT or REPLACE INTO Images VALUES(?, ?, ?)", (url, filename, timestamp))
|
|
|
|
def get_image_from_cache(self, url):
|
|
|
|
con = lite.connect(self.db_file)
|
|
with con:
|
|
cur = con.cursor()
|
|
|
|
cur.execute("SELECT filename FROM Images WHERE url=?", [url])
|
|
row = cur.fetchone()
|
|
|
|
if row is None:
|
|
return None
|
|
|
|
filename = row[0]
|
|
image_data = None
|
|
|
|
try:
|
|
with open(filename, "rb") as f:
|
|
image_data = f.read()
|
|
f.close()
|
|
except IOError:
|
|
pass
|
|
|
|
return image_data
|