From 40de445d8c155b72c998e3eaaf6b6fad211ea7de Mon Sep 17 00:00:00 2001
From: Bastian Kleineidam <bastian.kleineidam@web.de>
Date: Wed, 13 Feb 2013 22:18:05 +0100
Subject: [PATCH] Allow multiple comic name matches.

---
 dosage               | 20 ++++++++++----------
 dosagelib/scraper.py | 20 ++++++++++++--------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/dosage b/dosage
index b8313a488..67e3c7fdf 100755
--- a/dosage
+++ b/dosage
@@ -35,6 +35,7 @@ def setupOptions():
     parser.add_option('-t', '--timestamps', action='store_true', dest='timestamps', default=False, help='print timestamps for all output at any info level')
     parser.add_option('-o', '--output', action='store', dest='output', choices=events.getHandlers(), help='output formatting for downloaded comics')
     parser.add_option('--adult', action='store_true', dest='adult', default=False, help='confirms that you are old enough to view adult content')
+    parser.add_option('--multimatch', action='store_true', dest='multimatch', default=False, help='')
     try:
         import optcomplete
         optcomplete.autocomplete(parser)
@@ -106,7 +107,7 @@ def getComics(options, comics):
         events.installHandler(options.output, options.basepath, options.baseurl)
     events.getHandler().start()
     try:
-        for scraperobj in getScrapers(comics, options.basepath, options.adult):
+        for scraperobj in getScrapers(comics, options.basepath, options.adult, options.multimatch):
             errors += getStrips(scraperobj, options)
     except ValueError as msg:
         out.error(msg)
@@ -203,7 +204,7 @@ def getScraperName(scraperobj, limit=None):
     return name + suffix
 
 
-def getScrapers(comics, basepath=None, adult=True):
+def getScrapers(comics, basepath=None, adult=True, multiple_allowed=False):
     """Get scraper objects for the given comics."""
     if '@' in comics:
         # only scrapers whose directory already exists
@@ -234,14 +235,13 @@ def getScrapers(comics, basepath=None, adult=True):
             else:
                 name = comic
                 indexes = None
-            # XXX if matchmulti, search for a list of scrapers
-            scraperclass = scraper.get_scraper(name)
-            if not adult and scraperclass.adult:
-                warn_adult(scraperclass)
-                continue
-            scraperobj = scraperclass(indexes=indexes)
-            if scraperobj not in scrapers:
-                scrapers[scraperobj] = True
+            for scraperclass in scraper.find_scraperclasses(name, multiple_allowed=multiple_allowed):
+                if not adult and scraperclass.adult:
+                    warn_adult(scraperclass)
+                    continue
+                scraperobj = scraperclass(indexes=indexes)
+                if scraperobj not in scrapers:
+                    scrapers[scraperobj] = True
         for scraperobj in scrapers:
             yield scraperobj
 
diff --git a/dosagelib/scraper.py b/dosagelib/scraper.py
index 135bc94a8..e142588a0 100644
--- a/dosagelib/scraper.py
+++ b/dosagelib/scraper.py
@@ -185,8 +185,10 @@ class _BasicScraper(object):
         return self.starter()
 
 
-def get_scraper(comic):
-    """Returns a comic module object."""
+def find_scraperclasses(comic, multiple_allowed=False):
+    """Get a list comic scraper classes. Can return more than one entries if
+    multiple_allowed is True, else it raises a ValueError if multiple
+    modules match. The match is a case insensitive substring search."""
     if not comic:
         raise ValueError("empty comic name")
     candidates = []
@@ -195,16 +197,18 @@ def get_scraper(comic):
         lname = scraperclass.get_name().lower()
         if lname == cname:
             # perfect match
-            return scraperclass
-        if cname in lname:
+            if not multiple_allowed:
+                return scraperclass
+            else:
+                candidates.append(scraperclass)
+        elif cname in lname:
             candidates.append(scraperclass)
-    if len(candidates) == 1:
-        return candidates[0]
-    elif candidates:
+    if len(candidates) > 1 and not multiple_allowed:
         comics = ", ".join(x.get_name() for x in candidates)
         raise ValueError('multiple comics found: %s' % comics)
-    else:
+    elif not candidates:
         raise ValueError('comic %r not found' % comic)
+    return candidates
 
 
 _scraperclasses = None