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

IGN:64-bit linux binary. Also initial windows only PRS600 driver

Browse Source
This commit is contained in:
Kovid Goyal 2009-08-27 09:40:05 -06:00
parent 48fece41e7
commit b99bec90d3
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/customize/builtins.py
View File

@ -364,7 +364,7 @@ from calibre.devices.jetbook.driver import JETBOOK
from calibre.devices.kindle.driver import KINDLE, KINDLE2, KINDLE_DX from calibre.devices.kindle.driver import KINDLE, KINDLE2, KINDLE_DX
from calibre.devices.prs500.driver import PRS500 from calibre.devices.prs500.driver import PRS500
from calibre.devices.prs505.driver import PRS505 from calibre.devices.prs505.driver import PRS505
from calibre.devices.prs700.driver import PRS700 from calibre.devices.prs700.driver import PRS700, PRS600
from calibre.devices.android.driver import ANDROID from calibre.devices.android.driver import ANDROID
plugins = [HTML2ZIP] plugins = [HTML2ZIP]
@ -413,6 +413,7 @@ plugins += [
PRS500, PRS500,
PRS505, PRS505,
PRS700, PRS700,
PRS600,
ANDROID, ANDROID,
CYBOOK_OPUS, CYBOOK_OPUS,
COOL_ER COOL_ER

9
src/calibre/devices/prs700/driver.py
View File

@ -28,3 +28,12 @@ class PRS700(PRS505):
OSX_CARD_A_MEM = re.compile(r'Sony PRS-700/[^:]+:MS Media') OSX_CARD_A_MEM = re.compile(r'Sony PRS-700/[^:]+:MS Media')
OSX_CARD_B_MEM = re.compile(r'Sony PRS-700/[^:]+:SD Media') OSX_CARD_B_MEM = re.compile(r'Sony PRS-700/[^:]+:SD Media')
class PRS600(PRS700):
name = 'PRS-600 Device Interface'
description = PRS700.description.replace('700', '600')
WINDOWS_MAIN_MEM = 'PRS-600'
WINDOWS_CARD_A_MEM = re.compile(r'PRS-700/\S+:MS')
WINDOWS_CARD_B_MEM = re.compile(r'PRS-700/\S+:SD')

1
src/calibre/gui2/wizard/__init__.py
View File

@ -486,6 +486,7 @@ class LibraryPage(QWizardPage, LibraryUI):
try: try:
os.makedirs(lp) os.makedirs(lp)
except: except:
traceback.print_exc()
lp = os.path.expanduser('~') lp = os.path.expanduser('~')
self.location.setText(lp) self.location.setText(lp)

11
src/calibre/trac/plugins/templates/linux.html
View File

@ -78,7 +78,7 @@
and press Enter: and press Enter:
</p> </p>
<pre class="wiki"> <pre class="wiki">
sudo python -c "import urllib2; exec urllib2.urlopen('http://calibre.kovidgoyal.net/download_linux_binary_installer').read(); main()" sudo python -c "import urllib2; exec urllib2.urlopen('http://status.calibre-ebook.com/linux_installer').read(); main()"
</pre> </pre>
<h4>Note</h4> <h4>Note</h4>
<ul> <ul>
@ -91,15 +91,6 @@ sudo python -c "import urllib2; exec urllib2.urlopen('http://calibre.kovidgoyal.
You must have xdg-utils installed You must have xdg-utils installed
on your system before running the installer. on your system before running the installer.
</li> </li>
<li>
For device automounting to work, you must have the pmount
package installed on your system.
</li>
<li>
On a 64bit machine, you must have 32-bit versions
of common libraries like X11, freetype, fontconfig,
expat and their various dependencies installed.
</li>
</ul> </ul>
<h3>Source install</h3> <h3>Source install</h3>
<p> <p>