Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix detection of UK firmware 505s on OS X and update USA Today recipe

Browse Source
This commit is contained in:
Kovid Goyal 2009-07-13 10:52:05 -06:00
parent f4841f4d9b
commit a5c5880cb9
3 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/devices/prs505/driver.py
View File

@ -33,9 +33,9 @@ class PRS505(CLI, Device):
WINDOWS_CARD_A_MEM = ['PRS-505/UC:MS', 'PRS-505/CE:MS'] WINDOWS_CARD_A_MEM = ['PRS-505/UC:MS', 'PRS-505/CE:MS']
WINDOWS_CARD_B_MEM = ['PRS-505/UC:SD', 'PRS-505/CE:SD'] WINDOWS_CARD_B_MEM = ['PRS-505/UC:SD', 'PRS-505/CE:SD']
OSX_MAIN_MEM = 'Sony PRS-505/UC Media' OSX_MAIN_MEM = ['Sony PRS-505/UC Media', 'Sony PRS-505/CE Media']
OSX_CARD_A_MEM = 'Sony PRS-505/UC:MS Media' OSX_CARD_A_MEM = ['Sony PRS-505/UC:MS Media', 'Sony PRS-505/CE:MS Media']
OSX_CARD_B_MEM = 'Sony PRS-505/UC:SD' OSX_CARD_B_MEM = ['Sony PRS-505/UC:SD', 'Sony PRS-505/CE:SD']
MAIN_MEMORY_VOLUME_LABEL = 'Sony Reader Main Memory' MAIN_MEMORY_VOLUME_LABEL = 'Sony Reader Main Memory'
STORAGE_CARD_VOLUME_LABEL = 'Sony Reader Storage Card' STORAGE_CARD_VOLUME_LABEL = 'Sony Reader Storage Card'

18
src/calibre/devices/usbms/device.py
View File

@ -284,12 +284,24 @@ class Device(DeviceConfig, DevicePlugin):
names[loc] = match.group(1) names[loc] = match.group(1)
break break
def check_line(line, pat):
if pat is None:
return False
if not line.strip().endswith('<class IOMedia>'):
return False
if isinstance(pat, basestring):
pat = [pat]
for x in pat:
if x in line:
return True
return False
for i, line in enumerate(lines): for i, line in enumerate(lines):
if self.OSX_MAIN_MEM is not None and line.strip().endswith('<class IOMedia>') and self.OSX_MAIN_MEM in line: if check_line(line, self.OSX_MAIN_MEM):
get_dev_node(lines[i+1:], 'main') get_dev_node(lines[i+1:], 'main')
if self.OSX_CARD_A_MEM is not None and line.strip().endswith('<class IOMedia>') and self.OSX_CARD_A_MEM in line: if check_line(line, self.OSX_CARD_A_MEM):
get_dev_node(lines[i+1:], 'carda') get_dev_node(lines[i+1:], 'carda')
if self.OSX_CARD_B_MEM is not None and line.strip().endswith('<class IOMedia>') and self.OSX_CARD_B_MEM in line: if check_line(line, self.OSX_CARD_B_MEM):
get_dev_node(lines[i+1:], 'cardb') get_dev_node(lines[i+1:], 'cardb')
if len(names.keys()) == 3: if len(names.keys()) == 3:
break break

25
src/calibre/web/feeds/recipes/recipe_usatoday.py
View File

@ -14,14 +14,26 @@ class USAToday(BasicNewsRecipe):
title = 'USA Today' title = 'USA Today'
timefmt = ' [%d %b %Y]' timefmt = ' [%d %b %Y]'
max_articles_per_feed = 20 max_articles_per_feed = 20
no_stylesheets = True
language = _('English') language = _('English')
__author__ = _('Kovid Goyal and Sujata Raman')
no_stylesheets = True
extra_css = ''' extra_css = '''
.inside-head { font: x-large bold } .inside-head{font-family:Arial,Helvetica,sans-serif; font-size:large; font-weight:bold }
.inside-head2 { font: x-large bold } .inside-head2{font-family:Arial,Helvetica,sans-serif; font-size:large; font-weight:bold }
.inside-head3 { font: x-large bold } .inside-head3{font-family:Arial,Helvetica,sans-serif; font-size:large; font-weight:bold }
.byLine { font: large } h3{font-family:Arial,Helvetica,sans-serif; font-size:large; font-weight:bold }
''' h4{font-family:Arial,Helvetica,sans-serif; font-size:x-small; font-weight:bold }
.side-by-side{font-family:Arial,Helvetica,sans-serif; font-size:x-small;}
#byLineTag{font-family:Arial,Helvetica,sans-serif; font-size:xx-small;}
.inside-copy{font-family:Arial,Helvetica,sans-serif; font-size:x-small;text-align:left}
.caption{font-family:Arial,Helvetica,sans-serif; font-size:x-small;}
'''
remove_tags = [
dict(name='div', attrs={'class':'inside-copy'}),
{'class':['tagListLabel','piped-taglist-string',]}
]
html2lrf_options = ['--ignore-tables'] html2lrf_options = ['--ignore-tables']
preprocess_regexps = [ preprocess_regexps = [
@ -29,6 +41,7 @@ class USAToday(BasicNewsRecipe):
(re.compile(r'<!--Article End-->.*?</BODY>', re.IGNORECASE | re.DOTALL), lambda match : '</BODY>'), (re.compile(r'<!--Article End-->.*?</BODY>', re.IGNORECASE | re.DOTALL), lambda match : '</BODY>'),
] ]
feeds = [ feeds = [
('Top Headlines', 'http://rssfeeds.usatoday.com/usatoday-NewsTopStories'), ('Top Headlines', 'http://rssfeeds.usatoday.com/usatoday-NewsTopStories'),
('Sport Headlines', 'http://rssfeeds.usatoday.com/UsatodaycomSports-TopStories'), ('Sport Headlines', 'http://rssfeeds.usatoday.com/UsatodaycomSports-TopStories'),