Merge branch 'main' into proxy

calibre-plugin/__init__.py

@@ -33,7 +33,7 @@ except NameError:
 from calibre.customize import InterfaceActionBase
 
 # pulled out from FanFicFareBase for saving in prefs.py
-__version__ = (4, 1, 5)
+__version__ = (4, 1, 6)
 
 ## Apparently the name for this class doesn't matter--it was still
 ## 'demo' for the first few versions.

calibre-plugin/basicinihighlighter.py

@@ -14,7 +14,7 @@ try:
 except ImportError as e:
     from PyQt4.Qt import (Qt, QSyntaxHighlighter, QTextCharFormat, QBrush)
 
-from .fanficfare.six import string_types
+from calibre_plugins.fanficfare_plugin.fanficfare.six import string_types
 
 class BasicIniHighlighter(QSyntaxHighlighter):
     '''

calibre-plugin/common_utils.py

@@ -29,7 +29,7 @@ from calibre.gui2.actions import menu_action_unique_name
 from calibre.gui2.keyboard import ShortcutConfig
 from calibre.utils.config import config_dir
 from calibre.utils.date import now, format_date, qt_to_dt, UNDEFINED_DATE
-from .fanficfare.six import text_type as unicode
+from calibre_plugins.fanficfare_plugin.fanficfare.six import text_type as unicode
 
 # Global definition of our plugin name. Used for common functions that require this.
 plugin_name = None

calibre-plugin/config.py

@@ -45,7 +45,7 @@ else:
 
 from calibre.gui2 import dynamic, info_dialog
 from calibre.gui2.complete2 import EditWithComplete
-from .fanficfare.six import text_type as unicode
+from calibre_plugins.fanficfare_plugin.fanficfare.six import text_type as unicode
 
 try:
     from calibre.ebooks.covers import generate_cover as cal_generate_cover

calibre-plugin/dialogs.py

@@ -53,7 +53,7 @@ from calibre.gui2 import gprefs
 show_download_options = 'fff:add new/update dialogs:show_download_options'
 from calibre.gui2.dialogs.confirm_delete import confirm
 from calibre.gui2.complete2 import EditWithComplete
-from .fanficfare.six import text_type as unicode, ensure_text
+from calibre_plugins.fanficfare_plugin.fanficfare.six import text_type as unicode, ensure_text
 
 # pulls in translation files for _() strings
 try:

calibre-plugin/fff_plugin.py

@@ -9,7 +9,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2021, Jim Miller'
 __docformat__ = 'restructuredtext en'
 
-from .fanficfare.six import ensure_text, string_types, text_type as unicode
+from calibre_plugins.fanficfare_plugin.fanficfare.six import ensure_text, string_types, text_type as unicode
 
 # import cProfile
 

calibre-plugin/fff_util.py

@@ -18,8 +18,8 @@ logger = logging.getLogger(__name__)
 from calibre_plugins.fanficfare_plugin.fanficfare import adapters
 from calibre_plugins.fanficfare_plugin.fanficfare.configurable import Configuration
 from calibre_plugins.fanficfare_plugin.prefs import prefs
-from .fanficfare.six import ensure_text
-from .fanficfare.six.moves import configparser
+from calibre_plugins.fanficfare_plugin.fanficfare.six import ensure_text
+from calibre_plugins.fanficfare_plugin.fanficfare.six.moves import configparser
 
 def get_fff_personalini():
     return prefs['personal.ini']

calibre-plugin/inihighlighter.py

@@ -17,7 +17,7 @@ try:
 except ImportError as e:
     from PyQt4.Qt import (QApplication, Qt, QColor, QSyntaxHighlighter, QTextCharFormat, QBrush, QFont)
 
-from .fanficfare.six import string_types
+from calibre_plugins.fanficfare_plugin.fanficfare.six import string_types
 
 class IniHighlighter(QSyntaxHighlighter):
     '''

calibre-plugin/jobs.py

@@ -20,8 +20,8 @@ from calibre.utils.ipc.server import Server
 from calibre.utils.ipc.job import ParallelJob
 from calibre.constants import numeric_version as calibre_version
 from calibre.utils.date import local_tz
-from .fanficfare.six import text_type as unicode
-from .fanficfare.six.moves.queue import Empty
+from calibre_plugins.fanficfare_plugin.fanficfare.six import text_type as unicode
+from calibre_plugins.fanficfare_plugin.fanficfare.six.moves.queue import Empty
 
 from calibre_plugins.fanficfare_plugin.wordcount import get_word_count
 from calibre_plugins.fanficfare_plugin.prefs import (SAVE_YES, SAVE_YES_UNLESS_SITE)

calibre-plugin/wordcount.py

@@ -18,7 +18,7 @@ logger = logging.getLogger(__name__)
 import re
 
 from calibre.ebooks.oeb.iterator import EbookIterator
-from .fanficfare.six import text_type as unicode
+from calibre_plugins.fanficfare_plugin.fanficfare.six import text_type as unicode
 
 RE_HTML_BODY = re.compile(u'<body[^>]*>(.*)</body>', re.UNICODE | re.DOTALL | re.IGNORECASE)
 RE_STRIP_MARKUP = re.compile(u'<[^>]+>', re.UNICODE)

fanficfare/cli.py

@@ -27,7 +27,7 @@ import pprint
 import string
 import os, sys
 
-version="4.1.5"
+version="4.1.6"
 os.environ['CURRENT_VERSION_ID']=version
 
 global_cache = 'global_cache'

included_dependencies/cloudscraper/__init__.py

@@ -58,7 +58,7 @@ from .user_agent import User_Agent
 
 # ------------------------------------------------------------------------------- #
 
-__version__ = '1.2.56py2'
+__version__ = '1.2.58py2'
 
 # ------------------------------------------------------------------------------- #
 
@@ -197,7 +197,7 @@ class CloudScraper(Session):
     @staticmethod
     def debugRequest(req):
         try:
-            print(dump.dump_all(req).decode('utf-8'))
+            print(dump.dump_all(req).decode('utf-8', errors='backslashreplace'))
         except ValueError as e:
             print("Debug Error: {}".format(getattr(e, 'message', e)))
 
@@ -355,7 +355,7 @@ class CloudScraper(Session):
                 resp.headers.get('Server', '').startswith('cloudflare')
                 and resp.status_code in [429, 503]
                 and re.search(
-                    r'cpo.src\s*=\s*"/cdn-cgi/challenge-platform/\S+orchestrate/jsch/v1"',
+                    r'cpo.src\s*=\s*"/cdn-cgi/challenge-platform/\S+orchestrate/jsch/v1',
                     resp.text,
                     re.M | re.S
                 )
@@ -376,7 +376,7 @@ class CloudScraper(Session):
             return (
                 CloudScraper.is_Captcha_Challenge(resp)
                 and re.search(
-                    r'cpo.src\s*=\s*"/cdn-cgi/challenge-platform/\S+orchestrate/captcha/v1"',
+                    r'cpo.src\s*=\s*"/cdn-cgi/challenge-platform/\S+orchestrate/captcha/v1',
                     resp.text,
                     re.M | re.S
                 )

setup.py

@@ -26,7 +26,7 @@ setup(
     name=package_name,
 
     # Versions should comply with PEP440.
-    version="4.1.5",
+    version="4.1.6",
 
     description='A tool for downloading fanfiction to eBook formats',
     long_description=long_description,