Skip to content

Fix english but non-US site being forced to default US site #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix english but non-US site being forced to default US site #23

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bca340f
Fix english but non-US site being forced to default US site
jmeosbn Dec 20, 2017
fc6604f
Initialise rating as float to avoid error when not found
jmeosbn Dec 24, 2017
e1e2973
Workaround for 'Release Date' label differences
jmeosbn Dec 23, 2017
7e19570
Fix for no narrator returned via adbl_page_content
jmeosbn Jan 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Contents/Code/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def json_decode(output):
THREAD_MAX = 20

intl_sites={
Copy link
Author

@jmeosbn jmeosbn Dec 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think intl_sites could be removed and a search in sites_langs used instead?

'en' : { 'url': 'www.audible.com' , 'urltitle' : u'title=' , 'rel_date' : u'Release date' , 'nar_by' : u'Narrated By' , 'nar_by2': u'Narrated by'},
'en' : { 'url': 'www.audible.com' , 'urltitle' : u'title=' , 'rel_date' : u'Release ' , 'nar_by' : u'Narrated By' , 'nar_by2': u'Narrated by'},
'fr' : { 'url': 'www.audible.fr' , 'urltitle' : u'searchTitle=' , 'rel_date' : u'Date de publication' , 'nar_by' : u'Narrateur(s)' , 'nar_by2': u'Lu par'},
'de' : { 'url': 'www.audible.de' , 'urltitle' : u'searchTitle=' , 'rel_date' : u'Erscheinungsdatum' , 'nar_by' : u'Gesprochen von', 'rel_date2': u'Veröffentlicht'},
'it' : { 'url': 'www.audible.it' , 'urltitle' : u'searchTitle=' , 'rel_date' : u'Data di Pubblicazione', 'nar_by' : u'Narratore' },
Expand All @@ -57,7 +57,6 @@ def SetupUrls(sitetype, base, lang='en'):
Log('Pulling language from sites array')
lang=sites_langs[base]['lang']
if lang in intl_sites :
base=intl_sites[lang]['url']
urlsearchtitle=intl_sites[lang]['urltitle']
ctx['REL_DATE']=intl_sites[lang]['rel_date']
ctx['NAR_BY' ]=intl_sites[lang]['nar_by']
Expand Down Expand Up @@ -472,18 +471,19 @@ def update(self, metadata, media, lang, force=False):
pass

date=None
rating=None
rating=0.0
series=''
genre1=None
genre2=None

for r in html.xpath('//div[contains (@id, "adbl_page_content")]'):
date = self.getDateFromString(self.getStringContentFromXPath(r, '//li[contains (., "{0}")]/span[2]//text()'.format(ctx['REL_DATE_INFO']).decode('utf-8')))
title = self.getStringContentFromXPath(r, '//h1[contains (@class, "adbl-prod-h1-title")]/text()')
rating = self.getStringContentFromXPath(r, '//span[contains (@class, "rating-average")]/text()')
murl = self.getAnchorUrlFromXPath(r, 'div/div/div/div/a[1]')
thumb = self.getImageUrlFromXPath(r, 'div/div/div/div/div/img')
author = self.getStringContentFromXPath(r, '//li//a[contains (@class,"author-profile-link")][1]')
narrator = self.getStringContentFromXPath(r, '//li[contains (., "{0}")]//span[2]'.format(ctx['NAR_BY_INFO'])).strip().decode('utf-8')
narrator = self.getStringContentFromXPath(r, '//li[contains (@class,"adbl-narrator-row")]/span[2]').strip().decode('utf-8')
studio = self.getStringContentFromXPath(r, '//li//a[contains (@id,"PublisherSearchLink")][1]')
synopsis = self.getStringContentFromXPath(r, '//div[contains (@class, "disc-summary")]/div[*]').strip()
series = self.getStringContentFromXPath(r, '//div[contains (@class, "adbl-series-link")]//a[1]')
Expand Down Expand Up @@ -583,6 +583,9 @@ def update(self, metadata, media, lang, force=False):
metadata.summary = synopsis
metadata.posters[1] = Proxy.Media(HTTP.Request(thumb))
metadata.posters.validate_keys(thumb)

# make sure rating is not an empty string
rating = float(rating if rating != '' else '0')
metadata.rating = float(rating) * 2

metadata.title = title
Expand Down