FIX:(#2088) Fix for search erroring out when searching for issue numbers with decimal places, and/or alpha-numerics within, FIX: Fixed a DDL post-processing problem where it would not pass the full path back to the post-processing call, FIX: Added some more exception logging to aid in future DDL search-related problems

mylar/cmtagmylar.py

@@ -58,8 +58,8 @@ def run(dirName, nzbName=None, issueid=None, comversion=None, manual=None, filen
         else:
             shutil.copy(filepath, new_filepath)
         filepath = new_filepath  
-    except:
-        logger.warn(module + ' Unexpected Error: %s' % sys.exc_info()[0])
+    except Exception as e:
+        logger.warn('%s Unexpected Error: %s [%s]' % (module, sys.exc_info()[0], e))
         logger.warn(module + ' Unable to create temporary directory to perform meta-tagging. Processing without metatagging.')
         tidyup(og_filepath, new_filepath, new_folder, manualmeta)
         return "fail"

mylar/getcomics.py

@@ -139,7 +139,7 @@ class GC(object):
                 series = option_find
             elif 'Year' in option_find:
                 year = option_find.findNext(text=True)
-                year = re.sub('|', '', year).strip()
+                year = re.sub('\|', '', year).strip()
             else:
                 if 'Size' in prev_option:
                     size = option_find #.findNext(text=True)
@@ -238,7 +238,7 @@ class GC(object):
                             f.write(chunk)
                             f.flush()
 
-        except exception as e:
+        except Exception as e:
             logger.error('[ERROR] %s' % e)
             mylar.DDL_LOCK = False
             return ({"success":  False,
@@ -250,7 +250,7 @@ class GC(object):
             if os.path.isfile(path):
                 return ({"success":  True,
                          "filename": filename,
-                         "path":     path})
+                         "path":     mylar.CONFIG.DDL_LOCATION})
 
     def issue_list(self, pack):
         #packlist = [x.strip() for x in pack.split(',)]

mylar/search.py

@@ -897,7 +897,7 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, Publisher, IssueDa
                                 elif entry['site'] == 'DDL':
                                     comsize_b = helpers.human2bytes(entry['size'])
                             except Exception as e:
-                                logger.warn('[ERROR] %s' % e)
+                                logger.warn('[ERROR] %s [%s]' % (e, entry))
                                 tmpsz = entry.enclosures[0]
                                 comsize_b = tmpsz['length']
 
@@ -1369,7 +1369,7 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, Publisher, IssueDa
                         if parsed_comic['issue_number'] is None:
                             pc_in = None
                         else:
-                            pc_in = int(parsed_comic['issue_number'])
+                            pc_in = helpers.issuedigits(parsed_comic['issue_number'])
 
                         #issue comparison now as well
                         if int(intIss) == int(comintIss) or all([cmloopit == 4, findcomiciss is None, pc_in is None]) or all([cmloopit == 4, findcomiciss is None, pc_in == 1]):