IGN:Misc. fixes

This commit is contained in:
Kovid Goyal 2009-09-04 11:19:50 -06:00
parent a8c7424a30
commit f21e4bb0b9
6 changed files with 139 additions and 125 deletions

View File

@ -38,7 +38,7 @@ class PRS505(CLI, Device):
WINDOWS_CARD_A_MEM = re.compile(r'PRS-505/\S+:MS') WINDOWS_CARD_A_MEM = re.compile(r'PRS-505/\S+:MS')
WINDOWS_CARD_B_MEM = re.compile(r'PRS-505/\S+:SD') WINDOWS_CARD_B_MEM = re.compile(r'PRS-505/\S+:SD')
OSX_MAIN_MEM = re.compile(r'Sony PRS-(505|300)/[^:]+ Media') 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_A_MEM = re.compile(r'Sony PRS-505/[^:]+:MS Media')
OSX_CARD_B_MEM = re.compile(r'Sony PRS-505/[^:]+:SD Media') OSX_CARD_B_MEM = re.compile(r'Sony PRS-505/[^:]+:SD Media')
@ -55,6 +55,7 @@ class PRS505(CLI, Device):
EBOOK_DIR_MAIN = 'database/media/books' EBOOK_DIR_MAIN = 'database/media/books'
def open(self): def open(self):
self.report_progress = lambda x, y: x
Device.open(self) Device.open(self)
def write_cache(prefix): def write_cache(prefix):

View File

@ -25,8 +25,8 @@ class PRS700(PRS505):
WINDOWS_CARD_A_MEM = re.compile(r'PRS-[67]00/\S+:MS') WINDOWS_CARD_A_MEM = re.compile(r'PRS-[67]00/\S+:MS')
WINDOWS_CARD_B_MEM = re.compile(r'PRS-[67]00/\S+:SD') WINDOWS_CARD_B_MEM = re.compile(r'PRS-[67]00/\S+:SD')
OSX_MAIN_MEM = re.compile(r'Sony PRS-[67]00/[^:]+ Media') OSX_MAIN_MEM = re.compile(r'Sony PRS-((700/[^:]+)|(600)) Media')
OSX_CARD_A_MEM = re.compile(r'Sony PRS-[67]00/[^:]+:MS Media') OSX_CARD_A_MEM = re.compile(r'Sony PRS-((700/[^:]+:)|(600 ))MS Media')
OSX_CARD_B_MEM = re.compile(r'Sony PRS-[67]00/[^:]+:SD Media') OSX_CARD_B_MEM = re.compile(r'Sony PRS-((700/[^:]+:)|(600 ))SD Media')

View File

@ -23,7 +23,8 @@ class TXTInput(InputFormatPlugin):
'With this option it will assume that every line represents ' 'With this option it will assume that every line represents '
'a paragraph instead.')), 'a paragraph instead.')),
OptionRecommendation(name='markdown', recommended_value=False, OptionRecommendation(name='markdown', recommended_value=False,
help=_('Run the text input though the markdown processor.')), help=_('Run the text input through the markdown pre-processor. To '
'learn more about markdown see')+' http://daringfireball.net/projects/markdown/'),
]) ])
def convert(self, stream, options, file_ext, log, def convert(self, stream, options, file_ext, log,

View File

@ -464,6 +464,11 @@ class ConfigDialog(QDialog, Ui_Dialog):
def create_symlinks(self): def create_symlinks(self):
from calibre.utils.osx_symlinks import create_symlinks from calibre.utils.osx_symlinks import create_symlinks
loc, paths = create_symlinks() loc, paths = create_symlinks()
if loc is None:
error_dialog(self, _('Error'),
_('Failed to install command line tools.'),
det_msg=paths, show=True)
else:
info_dialog(self, _('Command line tools installed'), info_dialog(self, _('Command line tools installed'),
'<p>'+_('Command line tools installed in')+' '+loc+ '<p>'+_('Command line tools installed in')+' '+loc+
'<br>'+ _('If you move calibre.app, you have to re-install ' '<br>'+ _('If you move calibre.app, you have to re-install '

View File

@ -5,8 +5,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: calibre 0.6.10\n" "Project-Id-Version: calibre 0.6.10\n"
"POT-Creation-Date: 2009-09-04 08:37+MDT\n" "POT-Creation-Date: 2009-09-04 11:19+MDT\n"
"PO-Revision-Date: 2009-09-04 08:37+MDT\n" "PO-Revision-Date: 2009-09-04 11:19+MDT\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language-Team: LANGUAGE\n" "Language-Team: LANGUAGE\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -392,8 +392,8 @@ msgstr ""
#: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:76 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:76
#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:76 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:76
#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:78 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:78
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:129 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:130
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:131 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:132
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:99 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:99
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:101 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:101
msgid "Transferring books to device..." msgid "Transferring books to device..."
@ -441,10 +441,10 @@ msgid "Communicate with the Sony PRS-500 eBook reader."
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:150 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:150
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:93
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:95 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:96
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:98 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:99
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:109 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:110
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:49 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:49
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:52 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:52
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:55 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:55
@ -463,14 +463,14 @@ msgstr ""
msgid "Kovid Goyal and John Schember" msgid "Kovid Goyal and John Schember"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:162 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:163
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:169 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:170
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:119
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:134 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:134
msgid "Removing books from device..." msgid "Removing books from device..."
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:197 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:198
#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149 #: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:149
msgid "Sending metadata to device..." msgid "Sending metadata to device..."
msgstr "" msgstr ""
@ -920,7 +920,7 @@ msgstr ""
msgid "Running transforms on ebook..." msgid "Running transforms on ebook..."
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:822 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:821
msgid "Creating" msgid "Creating"
msgstr "" msgstr ""
@ -1810,7 +1810,7 @@ msgid "This RTF file has a feature calibre does not support. Convert it to HTML
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:26 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:26
msgid "Run the text input though the markdown processor." msgid "Run the text input through the markdown pre-processor. To learn more about markdown see"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:24 #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:24
@ -3120,121 +3120,126 @@ msgstr ""
msgid "new email address" msgid "new email address"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:467
msgid "Command line tools installed"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:468 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:468
msgid "Command line tools installed in" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:801
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:469
msgid "If you move calibre.app, you have to re-install the command line tools."
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:520
msgid "No valid plugin path"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:521
msgid "%s is not a valid plugin path"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:524
msgid "Choose plugin"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:536
msgid "Plugin cannot be disabled"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:537
msgid "The plugin: %s cannot be disabled"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:546
msgid "Plugin not customizable"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:547
msgid "Plugin: %s does not need customization"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:571
msgid "Customize %s"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:581
msgid "Cannot remove builtin plugin"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:582
msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:615
msgid "Error log:"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:622
msgid "Access log:"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:647
#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
msgid "Failed to start content server"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:671
#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:471
msgid "Select location for books"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:688
msgid "Invalid size"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:689
msgid "The size %s is invalid. must be of the form widthxheight"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:733
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:738
msgid "Invalid database location"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:734
msgid "Invalid database location "
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:735
msgid "<br>Must be a directory."
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:739
msgid "Invalid database location.<br>Cannot write to "
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:777
msgid "Checking database integrity"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:796
#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
#: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:52 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:52
msgid "Error" msgid "Error"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:797 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:469
msgid "Failed to check database integrity" msgid "Failed to install command line tools."
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:472
msgid "Command line tools installed"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:473
msgid "Command line tools installed in"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:474
msgid "If you move calibre.app, you have to re-install the command line tools."
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:525
msgid "No valid plugin path"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:526
msgid "%s is not a valid plugin path"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:529
msgid "Choose plugin"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:541
msgid "Plugin cannot be disabled"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:542
msgid "The plugin: %s cannot be disabled"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:551
msgid "Plugin not customizable"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:552
msgid "Plugin: %s does not need customization"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:576
msgid "Customize %s"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:586
msgid "Cannot remove builtin plugin"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:587
msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:620
msgid "Error log:"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:627
msgid "Access log:"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:652
#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
msgid "Failed to start content server"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:676
#: /home/kovid/work/calibre/src/calibre/gui2/wizard/__init__.py:471
msgid "Select location for books"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:693
msgid "Invalid size"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:694
msgid "The size %s is invalid. must be of the form widthxheight"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:738
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:743
msgid "Invalid database location"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:739
msgid "Invalid database location "
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:740
msgid "<br>Must be a directory."
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:744
msgid "Invalid database location.<br>Cannot write to "
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:782
msgid "Checking database integrity"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:802 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:802
msgid "Failed to check database integrity"
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:807
msgid "Some inconsistencies found" msgid "Some inconsistencies found"
msgstr "" msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:803 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:808
msgid "The following books had formats listed in the database that are not actually available. The entries for the formats have been removed. You should check them manually. This can happen if you manipulate the files in the library folder directly." msgid "The following books had formats listed in the database that are not actually available. The entries for the formats have been removed. You should check them manually. This can happen if you manipulate the files in the library folder directly."
msgstr "" msgstr ""

View File

@ -14,8 +14,10 @@ scripts = %s
links = %s links = %s
os.setuid(0) os.setuid(0)
for s, l in zip(scripts, links): for s, l in zip(scripts, links):
if os.path.lexists(l): try:
os.remove(l) os.remove(l)
except:
pass
print 'Creating link:', l, '->', s print 'Creating link:', l, '->', s
omask = os.umask(022) omask = os.umask(022)
os.symlink(s, l) os.symlink(s, l)
@ -49,7 +51,7 @@ def create_symlinks_old():
def do_it(scripts, links): def do_it(scripts, links):
import os, tempfile, traceback import os, tempfile, traceback
from Authorization import Authorization, kAuthorizationFlagDestroyRights from Authorization import Authorization, kAuthorizationFlagDestroyRights
r1, r2 = DEST_PATH, links
bad = False bad = False
for s, l in zip(scripts, links): for s, l in zip(scripts, links):
if os.path.exists(l) and os.path.exists(os.path.realpath(l)): if os.path.exists(l) and os.path.exists(os.path.realpath(l)):
@ -72,7 +74,7 @@ def do_it(scripts, links):
sys.stdout.write(pipe.read()) sys.stdout.write(pipe.read())
pipe.close() pipe.close()
except: except:
traceback.print_exc() r1, r2 = None, traceback.format_exc()
finally: finally:
os.unlink(name) os.unlink(name)
if pp: if pp:
@ -80,5 +82,5 @@ def do_it(scripts, links):
if ph: if ph:
os.environ['PYTHONHOME'] = ph os.environ['PYTHONHOME'] = ph
return DEST_PATH, links return r1, r2