mirrors/acsm-calibre-plugin
mirrors/acsm-calibre-plugin
1
0
Fork 0
mirror of https://github.com/Leseratte10/acsm-calibre-plugin.git synced 2024-12-22 17:29:56 +06:00
Code Issues Projects Releases Wiki Activity

Fix race condition when importing multiple files at once

Browse Source
This commit is contained in:
Florian Bach 2021-11-15 12:09:11 +01:00
parent 1f61d972f5
commit a7290b536a
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
calibre-plugin/__init__.py
View File

@ -30,7 +30,7 @@ __version__ = PLUGIN_VERSION = ".".join([str(x)for x in PLUGIN_VERSION_TUPLE])
from calibre.utils.config import config_dir # type: ignore from calibre.utils.config import config_dir # type: ignore
import os, shutil, traceback, sys, time import os, shutil, traceback, sys, time, io
import zipfile import zipfile
from lxml import etree from lxml import etree
@ -74,13 +74,11 @@ class DeACSM(FileTypePlugin):
if not os.path.exists(self.maindir): if not os.path.exists(self.maindir):
os.mkdir(self.maindir) os.mkdir(self.maindir)
# Re-Extract modules # Extract new modules
self.moddir = os.path.join(self.maindir,"modules") self.moddir = os.path.join(self.maindir,"modules")
if os.path.exists(self.moddir): if not os.path.exists(self.moddir):
shutil.rmtree(self.moddir, ignore_errors=True) os.mkdir(self.moddir)
os.mkdir(self.moddir)
names = ["cryptography.zip", "rsa.zip", "oscrypto.zip", "asn1crypto.zip", "pyasn1.zip"] names = ["cryptography.zip", "rsa.zip", "oscrypto.zip", "asn1crypto.zip", "pyasn1.zip"]
@ -90,15 +88,8 @@ class DeACSM(FileTypePlugin):
for entry, data in lib_dict.items(): for entry, data in lib_dict.items():
file_path = os.path.join(self.moddir, entry) file_path = os.path.join(self.moddir, entry)
try: try:
os.remove(file_path) with zipfile.ZipFile(io.BytesIO(data), 'r') as ref:
except:
pass
try:
open(file_path,'wb').write(data)
with zipfile.ZipFile(file_path, 'r') as ref:
ref.extractall(self.moddir) ref.extractall(self.moddir)
os.remove(file_path)
except: except:
print("{0} v{1}: Exception when copying needed library files".format(PLUGIN_NAME, PLUGIN_VERSION)) print("{0} v{1}: Exception when copying needed library files".format(PLUGIN_NAME, PLUGIN_VERSION))