From 1f61d972f5322a3e2fbf2d57985306ffeb1041dd Mon Sep 17 00:00:00 2001 From: Florian Bach Date: Mon, 15 Nov 2021 06:46:48 +0100 Subject: [PATCH] v0.0.12: Fix Calibre plugin index --- calibre-plugin/__init__.py | 12 ++++++------ calibre-plugin/libadobeAccount.py | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index a03f6d6..1ba3ad8 100644 --- a/calibre-plugin/__init__.py +++ b/calibre-plugin/__init__.py @@ -18,14 +18,14 @@ # v0.0.11: Ignore SSL errors during ACS notify, improve element hashing code, # improve PassHash support, include UUID in key export filename, # fix bug that would block other FileTypePlugins - - -from calibre.customize import FileTypePlugin # type: ignore -__version__ = '0.0.11' +# v0.0.12: Fix Calibre Plugin index / updater PLUGIN_NAME = "DeACSM" -PLUGIN_VERSION_TUPLE = tuple([int(x) for x in __version__.split(".")]) -PLUGIN_VERSION = ".".join([str(x)for x in PLUGIN_VERSION_TUPLE]) +PLUGIN_VERSION_TUPLE = (0, 0, 12) + +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 diff --git a/calibre-plugin/libadobeAccount.py b/calibre-plugin/libadobeAccount.py index 33c2c45..0a7638b 100644 --- a/calibre-plugin/libadobeAccount.py +++ b/calibre-plugin/libadobeAccount.py @@ -218,6 +218,8 @@ def signIn(username: str, passwd: str): err = credentialsXML.get("data") if ("E_AUTH_FAILED" in err and "CUS05051" in err): 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: return False, "Unknown Adobe error:" + credentials