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

Fix #1365 (PRS-505 SD Storage card does not show up under Calibre 0.4.111)

Browse Source
This commit is contained in:
Kovid Goyal 2008-12-09 13:28:30 -08:00
parent 463b406312
commit cb62a146b3
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,9 +64,11 @@ class PRS505(Device):
<match key="info.category" string="volume"> <match key="info.category" string="volume">
<match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.vendor_id" int="%(vendor_id)s"> <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.vendor_id" int="%(vendor_id)s">
<match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.product_id" int="%(product_id)s"> <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.product_id" int="%(product_id)s">
<match key="volume.is_partition" bool="true"> <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.device_revision_bcd" int="%(bcd)s">
<merge key="volume.label" type="string">%(storage_card)s</merge> <match key="volume.is_partition" bool="true">
<merge key="%(app)s.cardvolume" type="string">%(deviceclass)s</merge> <merge key="volume.label" type="string">%(storage_card)s</merge>
<merge key="%(app)s.cardvolume" type="string">%(deviceclass)s</merge>
</match>
</match> </match>
</match> </match>
</match> </match>

3
src/calibre/devices/scanner.py
View File

@ -43,7 +43,8 @@ class DeviceScanner(object):
if iswindows: if iswindows:
for device_id in self.devices: for device_id in self.devices:
vid, pid = 'vid_%4.4x'%device.VENDOR_ID, 'pid_%4.4x'%device.PRODUCT_ID vid, pid = 'vid_%4.4x'%device.VENDOR_ID, 'pid_%4.4x'%device.PRODUCT_ID
if vid in device_id and pid in device_id: rev = ('rev_%4.4x'%device.BCD).replace('a', ':') # Bug in winutil.get_usb_devices converts a to :
if vid in device_id and pid in device_id and rev in device_id:
return True return True
return False return False
else: else:

5
src/calibre/manual/faq.rst
View File

@ -153,8 +153,9 @@ Content From The Web
My downloaded news content causes the reader to reset. My downloaded news content causes the reader to reset.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This is a bug in the SONY firmware. The problem can be mitigated by switching the output format to EPUB This is a bug in the SONY firmware. The problem can be mitigated by switching the output format to EPUB
in the configuration dialog. EPUB files typically only cause the reader to reset when clicking on certain in the configuration dialog. Alternatively, you can use the LRF output format and use the SONY software
links. Alternatively, you can use the LRF output format and use the SONY software to transfer the files to the reader. The SONY software pre-paginates the LRF file, thereby reducing the number of resets. to transfer the files to the reader. The SONY software pre-paginates the LRF file,
thereby reducing the number of resets.
I obtained a recipe for a news site as a .py file from somewhere, how do I use it? I obtained a recipe for a news site as a .py file from somewhere, how do I use it?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~