Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-04-30 02:13:42 +02:00
Code Issues Projects Releases Wiki Activity

Oops

Browse source
This commit is contained in:
Kovid Goyal 2009-07-13 16:39:25 -06:00
parent 2ca1777869
commit 8e754b3245
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,9 +32,9 @@ class PRS505(CLI, Device):
WINDOWS_CARD_A_MEM = re.compile(r'PRS-505/\S+:MS')
WINDOWS_CARD_B_MEM = re.compile(r'PRS-505/\S+:SD')
OSX_MAIN_MEM = re.compile(r'Sony PRS-505/\S+ Media')
OSX_CARD_A_MEM = re.compile(r'Sony PRS-505/\S+:MS Media')
OSX_CARD_B_MEM = re.compile(r'Sony PRS-505/\S+:SD')
OSX_MAIN_MEM = re.compile(r'Sony PRS-505/[^:]+ Media')
OSX_CARD_A_MEM = re.compile(r'Sony PRS-505/[^:]+:MS Media')
OSX_CARD_B_MEM = re.compile(r'Sony PRS-505/[^:]+:SD Media')
MAIN_MEMORY_VOLUME_LABEL = 'Sony Reader Main Memory'
STORAGE_CARD_VOLUME_LABEL = 'Sony Reader Storage Card'

6
src/calibre/devices/usbms/device.py
View file

@ -306,11 +306,11 @@ def get_dev_node(lines, loc):
break
for i, line in enumerate(lines):
if self.check_ioreg_line(line, self.OSX_MAIN_MEM):
if 'main' not in names and self.check_ioreg_line(line, self.OSX_MAIN_MEM):
get_dev_node(lines[i+1:], 'main')
if self.check_ioreg_line(line, self.OSX_CARD_A_MEM):
if 'carda' not in names and self.check_ioreg_line(line, self.OSX_CARD_A_MEM):
get_dev_node(lines[i+1:], 'carda')
if self.check_ioreg_line(line, self.OSX_CARD_B_MEM):
if 'cardb' not in names and self.check_ioreg_line(line, self.OSX_CARD_B_MEM):
get_dev_node(lines[i+1:], 'cardb')
if len(names.keys()) == 3:
break