mirrors/acsm-calibre-plugin
mirrors/acsm-calibre-plugin
1
0
Fork 0
mirror of https://github.com/Leseratte10/acsm-calibre-plugin.git synced 2025-01-03 07:17:38 +06:00
Code Issues Projects Releases Wiki Activity

v0.0.12: Fix Calibre plugin index

Browse Source
This commit is contained in:
Florian Bach 2021-11-15 06:46:48 +01:00
parent c8f1081e44
commit 1f61d972f5
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calibre-plugin/__init__.py
View File

@ -18,14 +18,14 @@
# v0.0.11: Ignore SSL errors during ACS notify, improve element hashing code, # v0.0.11: Ignore SSL errors during ACS notify, improve element hashing code,
# improve PassHash support, include UUID in key export filename, # improve PassHash support, include UUID in key export filename,
# fix bug that would block other FileTypePlugins # fix bug that would block other FileTypePlugins
# v0.0.12: Fix Calibre Plugin index / updater
from calibre.customize import FileTypePlugin # type: ignore
__version__ = '0.0.11'
PLUGIN_NAME = "DeACSM" PLUGIN_NAME = "DeACSM"
PLUGIN_VERSION_TUPLE = tuple([int(x) for x in __version__.split(".")]) PLUGIN_VERSION_TUPLE = (0, 0, 12)
PLUGIN_VERSION = ".".join([str(x)for x in PLUGIN_VERSION_TUPLE])
from calibre.customize import FileTypePlugin # type: ignore
__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

2
calibre-plugin/libadobeAccount.py
View File

@ -218,6 +218,8 @@ def signIn(username: str, passwd: str):
err = credentialsXML.get("data") err = credentialsXML.get("data")
if ("E_AUTH_FAILED" in err and "CUS05051" in err): if ("E_AUTH_FAILED" in err and "CUS05051" in err):
return False, "Invalid username or password!" return False, "Invalid username or password!"
elif ("E_AUTH_FAILED" in err and "LOGIN_FAILED" in err):
return False, "E_AUTH_FAILED/LOGIN_FAILED. If you have 2FA enabled, please disable that and try again."
else: else:
return False, "Unknown Adobe error:" + credentials return False, "Unknown Adobe error:" + credentials