mirror of
https://github.com/Leseratte10/acsm-calibre-plugin.git
synced 2024-12-22 17:29:56 +06:00
Update some dependencies
This commit is contained in:
Florian Bach
parent
2380177448
commit
21644b25b2
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
/calibre-plugin/*.zip
|
||||
/calibre-plugin/keyextract/*.exe
|
||||
/calibre-plugin/module_id.txt
|
||||
@ -14,6 +14,8 @@ make
|
||||
|
||||
popd
|
||||
|
||||
echo -n "2021-12-15-01" > module_id.txt
|
||||
|
||||
zip -r ../calibre-plugin.zip *
|
||||
|
||||
popd
|
||||
|
||||
@ -45,7 +45,7 @@ __version__ = PLUGIN_VERSION = ".".join([str(x)for x in PLUGIN_VERSION_TUPLE])
|
||||
from calibre.utils.config import config_dir # type: ignore
|
||||
from calibre.constants import isosx, iswindows, islinux # type: ignore
|
||||
|
||||
import os, shutil, traceback, sys, time, io
|
||||
import os, shutil, traceback, sys, time, io, random
|
||||
import zipfile
|
||||
from lxml import etree
|
||||
|
||||
@ -95,16 +95,54 @@ class DeACSM(FileTypePlugin):
|
||||
if not os.path.exists(self.moddir):
|
||||
os.mkdir(self.moddir)
|
||||
|
||||
# Check if we have a module id:
|
||||
# Modules will only be extracted if this has changed.
|
||||
# This A) saves time because we don't extract every time,
|
||||
# and B) prevents a race condition.
|
||||
# The compiling scripts need to be adapted to modify
|
||||
# the module_id.txt in the plugin ZIP every time the
|
||||
# modules change
|
||||
|
||||
try:
|
||||
ts_file = os.path.join(self.moddir, "module_id.txt")
|
||||
f = open(ts_file, "r")
|
||||
id = f.readline().strip()
|
||||
f.close()
|
||||
except:
|
||||
# No timestamp found, probably upgrading from an older version.
|
||||
id = None
|
||||
|
||||
# Check ID file in the plugin ZIP
|
||||
try:
|
||||
ts_dict = self.load_resources( ["module_id.txt"] )
|
||||
id_plugin = ts_dict["module_id.txt"].decode("latin-1").split('\n')[0].strip()
|
||||
except:
|
||||
# No timestamp found in the plugin ZIP?
|
||||
# Assume that I made a mistake bundling the plugin, extract anyways.
|
||||
id_plugin = None
|
||||
|
||||
if id is None or id_plugin is None or id != id_plugin:
|
||||
print("Module update from \"{0}\" to \"{1}\", extracting ...".format(id, id_plugin))
|
||||
# Something changed, extract modules.
|
||||
|
||||
|
||||
if os.path.exists(self.moddir):
|
||||
shutil.rmtree(self.moddir, ignore_errors=True)
|
||||
|
||||
rand_path = self.moddir + str(random.randint(0, 1000000000))
|
||||
# Generate random name so we don't get conflicts with multiple instances of the plugin running at once.
|
||||
# Hack-y solution, but it should work.
|
||||
|
||||
os.mkdir(rand_path)
|
||||
|
||||
names = ["cryptography.zip", "rsa.zip", "oscrypto.zip", "asn1crypto.zip", "pyasn1.zip"]
|
||||
|
||||
lib_dict = self.load_resources(names)
|
||||
# print("{0} v{1}: Copying needed library files from plugin zip".format(PLUGIN_NAME, PLUGIN_VERSION))
|
||||
|
||||
for entry, data in lib_dict.items():
|
||||
file_path = os.path.join(self.moddir, entry)
|
||||
try:
|
||||
with zipfile.ZipFile(io.BytesIO(data), 'r') as ref:
|
||||
ref.extractall(self.moddir)
|
||||
ref.extractall(rand_path)
|
||||
|
||||
except:
|
||||
print("{0} v{1}: Exception when copying needed library files".format(PLUGIN_NAME, PLUGIN_VERSION))
|
||||
@ -116,11 +154,23 @@ class DeACSM(FileTypePlugin):
|
||||
names = [ "keyextract/decrypt_win32.exe", "keyextract/decrypt_win64.exe" ]
|
||||
lib_dict = self.load_resources(names)
|
||||
for entry, data in lib_dict.items():
|
||||
file_path = os.path.join(self.moddir, entry.split('/')[1])
|
||||
file_path = os.path.join(rand_path, entry.split('/')[1])
|
||||
f = open(file_path, "wb")
|
||||
f.write(data)
|
||||
f.close()
|
||||
|
||||
|
||||
# Write module ID
|
||||
if id_plugin is not None:
|
||||
mod_file = os.path.join(rand_path, "module_id.txt")
|
||||
f = open(mod_file, "w")
|
||||
f.write(id_plugin)
|
||||
f.close()
|
||||
|
||||
|
||||
# Rename temporary path to actual module path so this will be used next time.
|
||||
os.rename(rand_path, self.moddir)
|
||||
|
||||
sys.path.insert(0, os.path.join(self.moddir, "cryptography"))
|
||||
sys.path.insert(0, os.path.join(self.moddir, "rsa"))
|
||||
sys.path.insert(0, os.path.join(self.moddir, "oscrypto"))
|
||||
|
||||
@ -1176,7 +1176,7 @@ class RentedBooksDialog(QDialog):
|
||||
timestamp = datetime.datetime.strptime(book_time_stamp, "%Y-%m-%dT%H:%M:%SZ")
|
||||
currenttime = datetime.datetime.utcnow()
|
||||
except:
|
||||
print("Invalid book timestamp")
|
||||
# Invalid book timestano
|
||||
continue
|
||||
|
||||
|
||||
@ -1228,8 +1228,7 @@ class RentedBooksDialog(QDialog):
|
||||
ret, msg = tryReturnBook(Ret_book)
|
||||
|
||||
if (ret):
|
||||
print("Book successfully returned:")
|
||||
print(msg)
|
||||
print("Book successfully returned.")
|
||||
self.delete_book_entry(nomsg=True)
|
||||
self.populate_list()
|
||||
return info_dialog(None, "Done", "Book successfully returned", show=True, show_copy_button=False)
|
||||
|
||||
@ -36,7 +36,6 @@ def download(replyData):
|
||||
print (replyData)
|
||||
|
||||
|
||||
metadata_node = adobe_fulfill_response.find("./%s/%s/%s" % (adNS("fulfillmentResult"), adNS("resourceItemInfo"), adNS("metadata")))
|
||||
download_url = adobe_fulfill_response.find("./%s/%s/%s" % (adNS("fulfillmentResult"), adNS("resourceItemInfo"), adNS("src"))).text
|
||||
resource_id = adobe_fulfill_response.find("./%s/%s/%s" % (adNS("fulfillmentResult"), adNS("resourceItemInfo"), adNS("resource"))).text
|
||||
license_token_node = adobe_fulfill_response.find("./%s/%s/%s" % (adNS("fulfillmentResult"), adNS("resourceItemInfo"), adNS("licenseToken")))
|
||||
@ -50,6 +49,7 @@ def download(replyData):
|
||||
book_name = None
|
||||
|
||||
try:
|
||||
metadata_node = adobe_fulfill_response.find("./%s/%s/%s" % (adNS("fulfillmentResult"), adNS("resourceItemInfo"), adNS("metadata")))
|
||||
book_name = metadata_node.find("./%s" % (adDC("title"))).text
|
||||
except:
|
||||
book_name = "Book"
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
pushd calibre-plugin
|
||||
|
||||
wget https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/asn1crypto.zip -O asn1crypto.zip
|
||||
wget https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/cryptography.zip -O cryptography.zip
|
||||
wget https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/oscrypto.zip -O oscrypto.zip
|
||||
wget https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/pyasn1.zip -O pyasn1.zip
|
||||
wget https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/rsa.zip -O rsa.zip
|
||||
wget https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/asn1crypto_1.4.0.zip -O asn1crypto.zip
|
||||
wget https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/cryptography_36.0.1.zip -O cryptography.zip
|
||||
wget https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/oscrypto_1.2.1.zip -O oscrypto.zip
|
||||
wget https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/pyasn1_0.4.8.zip -O pyasn1.zip
|
||||
wget https://github.com/Leseratte10/acsm-calibre-plugin/releases/download/config/rsa_4.8.zip -O rsa.zip
|
||||
|
||||
popd
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user