From 4acd87130b0107583d091ff9e78ba356b2157cab Mon Sep 17 00:00:00 2001 From: Jamie Osborne Date: Fri, 29 Dec 2017 17:30:37 +0000 Subject: [PATCH] Workaround URL differences for .com search when outside US --- Contents/Code/__init__.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Contents/Code/__init__.py b/Contents/Code/__init__.py index a97c08a..1eced33 100644 --- a/Contents/Code/__init__.py +++ b/Contents/Code/__init__.py @@ -38,7 +38,7 @@ def json_decode(output): } sites_langs={ - 'www.audible.com' : { 'lang' : 'en', 'urltitle' : u'title=' , 'rel_date' : u'Release date' , 'nar_by' : u'Narrated By' , 'nar_by2': u'Narrated by'}, + 'www.audible.com' : { 'lang' : 'en', 'urltitle' : u'title=' , 'rel_date' : u'Release ' , 'nar_by' : u'Narrated By' , 'nar_by2': u'Narrated by'}, 'www.audible.co.uk' : { 'lang' : 'en', 'urltitle' : u'searchTitle=' , 'rel_date' : u'Release Date' , 'nar_by' : u'Narrated By' , 'nar_by2': u'Narrated by'}, 'www.audible.com.au' : { 'lang' : 'en', 'urltitle' : u'searchTitle=' , 'rel_date' : u'Release Date' , 'nar_by' : u'Narrated By' , 'nar_by2': u'Narrated by'}, 'www.audible.fr' : { 'lang' : 'fr', 'urltitle' : u'searchTitle=' , 'rel_date' : u'Date de publication' , 'nar_by' : u'Narrateur(s)' , 'nar_by2': u'Lu par'}, @@ -102,12 +102,15 @@ def SetupUrls(sitetype, base, lang='en'): # Match titles using more flexible keyword search if Prefs['keyword_searching']: urlsearchtitle = "advsearchKeywords=" + else: + # fallback for .com title search outside US + urlsearchtitle += "{0}&searchTitle=" AUD_BASE_URL='https://' + str(base) + '/' AUD_TITLE_URL=urlsearchtitle ctx['AUD_BOOK_INFO' ]=AUD_BASE_URL + 'pd/%s?ipRedirectOverride=true' ctx['AUD_ARTIST_SEARCH_URL' ]=AUD_BASE_URL + 'search?searchAuthor=%s&ipRedirectOverride=true' - ctx['AUD_ALBUM_SEARCH_URL' ]=AUD_BASE_URL + 'search?' + AUD_TITLE_URL + '%s&x=41&ipRedirectOverride=true' + ctx['AUD_ALBUM_SEARCH_URL' ]=AUD_BASE_URL + 'search?' + AUD_TITLE_URL + '{0}&x=41&ipRedirectOverride=true' ctx['AUD_KEYWORD_SEARCH_URL']=AUD_BASE_URL + 'search?filterby=field-keywords&advsearchKeywords=%s&x=41&ipRedirectOverride=true' ctx['AUD_SEARCH_URL' ]=AUD_BASE_URL + 'search?' + AUD_TITLE_URL + '{0}&searchAuthor={1}&x=41&ipRedirectOverride=true' return ctx @@ -357,7 +360,7 @@ def search(self, results, media, lang, manual): elif media.artist is not None: searchUrl = ctx['AUD_SEARCH_URL'].format((String.Quote((normalizedName).encode('utf-8'), usePlus=True)), (String.Quote((media.artist).encode('utf-8'), usePlus=True))) else: - searchUrl = ctx['AUD_ALBUM_SEARCH_URL'] % (String.Quote((normalizedName).encode('utf-8'), usePlus=True)) + searchUrl = ctx['AUD_ALBUM_SEARCH_URL'].format((String.Quote((normalizedName).encode('utf-8'), usePlus=True))) found = self.doSearch(searchUrl, ctx) # Write search result status to log