v0.0.12: Fix Calibre plugin index

Leseratte10 · Nov 15, 2021 · 1f61d97 · 1f61d97
1 parent c8f1081
commit 1f61d97
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
+# v0.0.12: Fix Calibre Plugin index / updater
 
+PLUGIN_NAME = "DeACSM"
+PLUGIN_VERSION_TUPLE = (0, 0, 12)
 
 from calibre.customize import FileTypePlugin        # type: ignore
-__version__ = '0.0.11'
+__version__ = PLUGIN_VERSION = ".".join([str(x)for x in PLUGIN_VERSION_TUPLE])
 
-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])
 
 
 from calibre.utils.config import config_dir         # type: ignore

diff --git 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