Scoring against normalised search/result titles

Author: jmeosbn

Contents/Code/__init__.py

@@ -237,6 +237,37 @@ def getDateFromString(self, string):
         except:
             return None
 
+    def strippedAlbumName(self, name):
+        stripped = name.strip()
+
+        # Chop off "unabridged"
+        # stripped = re.sub(r"[\(\[].*?[\)\]]", "", stripped)
+        # Log('chopping bracketed text = %s', stripped)
+
+        # Chop off more agressively
+        stripped = re.sub(r"[\(\[].*?$", "", stripped)
+        Log('agressively chopping bracketed text = %s', stripped)
+
+        # remove series subtitle
+        # TODO: use subtitle tag to replace series
+        stripped = re.sub(r": .*, \w+ \d+$", "", stripped)
+        Log('chopping book series info = %s', stripped)
+
+        return stripped.strip()
+
+    def normalizeAlbumName(self, name, stripped=True):
+        normalized = String.StripDiacritics(name)
+
+        if len(normalized) == 0:
+            normalized = name
+        Log('normalizedName = %s', normalized)
+
+        # strip "unabridged", series, subtitle etc.
+        if stripped:
+            normalized = self.strippedAlbumName(normalized)
+
+        return normalized.strip()
+
     def getStringContentFromXPath(self, source, query):
         return source.xpath('string(' + query + ')')
 
@@ -325,16 +356,7 @@ def search(self, results, media, lang, manual):
         self.Log('-----------------------------------------------------------------------')
 
         # Normalize the name
-        normalizedName = String.StripDiacritics(media.album)
-        if len(normalizedName) == 0:
-            normalizedName = media.album
-        Log('normalizedName = %s', normalizedName)
-
-		# Chop off "unabridged"
-        normalizedName = re.sub(r"[\(\[].*?[\)\]]", "", normalizedName)
-        Log('chopping bracketed text = %s', normalizedName)
-        normalizedName = normalizedName.strip()
-        Log('normalizedName stripped = %s', normalizedName)
+        normalizedName = self.normalizeAlbumName(media.album)
 
         self.Log('***** SEARCHING FOR "%s" - AUDIBLE v.%s *****', normalizedName, VERSION_NO)
 
@@ -391,9 +413,9 @@ def search(self, results, media, lang, manual):
             if date is not None:
                 year = date.year
 
-            # Score the album name
-            scorebase1 = media.album
-            scorebase2 = title.encode('utf-8')
+            # Score the normalized album name against normalized title
+            scorebase1 = normalizedName
+            scorebase2 = self.normalizeAlbumName(title.encode('utf-8'))
             #self.Log('scorebase1:    %s', scorebase1)
             #self.Log('scorebase2:    %s', scorebase2)