Merge branch 'python3-dev'

FIX:(mylar3#1463) Truncated image retrieval check - if failure, will retrieve alternate image quality
FIX:(mylar3#1469) incorrect logger reference causing traceback on SAB snatches that are completed quickly
FIX:(mylar3#1471) pillow check so it's case-insensitive (went from Pillow to pillow)
FIX: Move gzip header to fix tempermental ddl (@scooterpsu)
FIX: requirements -> bump versions for cheroot (>8.2.1) and pillow (>10.1 due to python3.12 not working on less than this verison)

mylar/getcomics.py

@@ -910,7 +910,7 @@ def downloadit(self, id, link, mainlink, resume=None, issueid=None, remote_files
         myDB = db.DBConnection()
         filename = None
         self.cookie_receipt()
-        self.headers['Accept-encoding'] = 'gzip'
+        #self.headers['Accept-encoding'] = 'gzip'
         try:
             with requests.Session() as s:
                 if resume is not None:
@@ -956,6 +956,7 @@ def downloadit(self, id, link, mainlink, resume=None, issueid=None, remote_files
                                 stream=True,
                                 timeout=(30,10)
                             )
+                            t.headers['Accept-encoding'] = 'gzip'
                             filename = os.path.basename(
                                 urllib.parse.unquote(t.url)
                             )  # .decode('utf-8'))

mylar/helpers.py

@@ -38,6 +38,7 @@
 from urllib.parse import urljoin
 from io import StringIO
 from apscheduler.triggers.interval import IntervalTrigger
+from PIL import Image
 
 import mylar
 from . import logger
@@ -4167,6 +4168,14 @@ def getImage(comicid, url, issueid=None, thumbnail_path=None, apicall=False):
             statinfo = os.stat(coverfile)
             coversize = statinfo.st_size
 
+        #quick test for image integrity
+        try:
+            im = Image.open(coverfile)
+        except OSError as e:
+            logger.warn('Truncated image retrieved - trying alternate image file.')
+            return {'coversize': coversize,
+                    'status': 'retry'}
+
         return {'coversize': coversize,
                 'status':    'success'}
 

mylar/req_test.py

@@ -102,7 +102,7 @@ def check_the_pip(self):
             for rq in self.req_list:
                 version_match = False
                 for pl in self.pip_list:
-                    if re.sub('[\-\_]', '', rq['module']).strip() == re.sub('[\-\_]', '', pl['module']).strip():
+                    if re.sub('[\-\_]', '', rq['module'].lower()).strip() == re.sub('[\-\_]', '', pl['module'].lower()).strip():
                         if parse_version(pl['version']) == parse_version(rq['version']):
                             version_match = 'OK'
                         elif parse_version(pl['version']) < parse_version(rq['version']):
@@ -145,6 +145,8 @@ def check_the_pip(self):
                             targ = '<'
                         elif x['arg'] == '<=':
                             targ = '>'
+                        else:
+                            targ = '='
                         pip_message = "%s installed %s %s required" % (x['pip_version'], targ, x['req_version'])
                     else:
                         pip_message = "%s %s" % (x['req_version'], x['pip_version'])

mylar/sabnzbd.py

@@ -99,7 +99,7 @@ def processor(self):
                     queueinfo = queueresponse['queue']['slots'][0]
                     logger.info('monitoring ... detected download - %s [%s]' % (queueinfo['filename'], queueinfo['status']))
             except Exception as e:
-                logger.warning('unable to locate item within sabnzbd active queue - it could be finished already?')
+                logger.warn('Unable to locate item within sabnzbd active queue - it could be finished already?')
                 queueinfo = queueresponse['queue']
             try:
                 logger.fdebug('SABnzbd Queued item status : %s' % queueinfo['status'])

requirements.txt

@@ -7,13 +7,13 @@
 APScheduler>=3.6.3
 beautifulsoup4>=4.8.2
 cfscrape>=2.0.8
-cheroot==8.2.1
+cheroot>=8.2.1
 CherryPy>=18.5.0
 configparser>=4.0.2
 feedparser>=5.2.1
 Mako>=1.1.0
 natsort>=3.5.2
-Pillow>=8
+Pillow>=10.1
 portend>=2.6
 pystun>=0.1.0
 pytz>=2019.3