diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 45a9bd29d1..02bc0b621f 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -433,9 +433,9 @@ plugins += [ KINDLE, KINDLE2, KINDLE_DX, - PRS500, PRS505, PRS700, + PRS500, ANDROID, CYBOOK_OPUS, COOL_ER, diff --git a/src/calibre/devices/prs505/driver.py b/src/calibre/devices/prs505/driver.py index 88a6bcc73e..8e68691589 100644 --- a/src/calibre/devices/prs505/driver.py +++ b/src/calibre/devices/prs505/driver.py @@ -23,24 +23,24 @@ class PRS505(CLI, Device): name = 'PRS-300/505 Device Interface' gui_name = 'SONY Pocket Edition' - description = _('Communicate with the Sony PRS-300/505 eBook reader.') + description = _('Communicate with the Sony PRS-300/505/500 eBook reader.') author = _('Kovid Goyal and John Schember') supported_platforms = ['windows', 'osx', 'linux'] FORMATS = ['epub', 'lrf', 'lrx', 'rtf', 'pdf', 'txt'] VENDOR_ID = [0x054c] #: SONY Vendor Id - PRODUCT_ID = [0x031e] #: Product Id for the PRS 300 and 505 - BCD = [0x229, 0x1000] + PRODUCT_ID = [0x031e] #: Product Id for the PRS 300/505/new 500 + BCD = [0x229, 0x1000, 0x22a] VENDOR_NAME = 'SONY' - WINDOWS_MAIN_MEM = re.compile('PRS-(505|300)') - WINDOWS_CARD_A_MEM = re.compile(r'PRS-505/\S+:MS') - WINDOWS_CARD_B_MEM = re.compile(r'PRS-505/\S+:SD') + WINDOWS_MAIN_MEM = re.compile('PRS-(505|300|500)') + WINDOWS_CARD_A_MEM = re.compile(r'PRS-(505|500)/\S+:MS') + WINDOWS_CARD_B_MEM = re.compile(r'PRS-(505|500)/\S+:SD') - OSX_MAIN_MEM = re.compile(r'Sony PRS-(((505|300)/[^:]+)|(300)) 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') + OSX_MAIN_MEM = re.compile(r'Sony PRS-(((505|300|500)/[^:]+)|(300)) Media') + OSX_CARD_A_MEM = re.compile(r'Sony PRS-(505|500)/[^:]+:MS Media') + OSX_CARD_B_MEM = re.compile(r'Sony PRS-(505|500)/[^:]+:SD Media') MAIN_MEMORY_VOLUME_LABEL = 'Sony Reader Main Memory' STORAGE_CARD_VOLUME_LABEL = 'Sony Reader Storage Card' @@ -196,3 +196,5 @@ class PRS505(CLI, Device): write_card_prefix(self._card_b_prefix, 2) self.report_progress(1.0, _('Sending metadata to device...')) + +