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:...

Browse Source
This commit is contained in:
Kovid Goyal 2008-06-14 12:22:43 -07:00
parent 3ad9cc9ef2
commit ad3581aaaf
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/calibre/library/database2.py
View File

@ -25,7 +25,7 @@ def sanitize_file_name(name, substitute='_'):
''' '''
Sanitize the filename `name`. All invalid characters are replaced by `substitute`. Sanitize the filename `name`. All invalid characters are replaced by `substitute`.
The set of invalid characters is the union of the invalid characters in Windows, The set of invalid characters is the union of the invalid characters in Windows,
OS X and Linux. OS X and Linux. Also removes leading an trailing whitespace.
**WARNING:** This function also replaces path separators, so only pass file names **WARNING:** This function also replaces path separators, so only pass file names
and not full paths to it. and not full paths to it.
*NOTE:* This function always returns byte strings, not unicode objects. The byte strings *NOTE:* This function always returns byte strings, not unicode objects. The byte strings
@ -33,7 +33,8 @@ def sanitize_file_name(name, substitute='_'):
''' '''
if isinstance(name, unicode): if isinstance(name, unicode):
name = name.encode(filesystem_encoding, 'ignore') name = name.encode(filesystem_encoding, 'ignore')
return _filename_sanitize.sub(substitute, name) one = _filename_sanitize.sub(substitute, name)
return re.sub(r'\s', ' ', one).strip()
class CoverCache(QThread): class CoverCache(QThread):
@ -305,7 +306,7 @@ class LibraryDatabase2(LibraryDatabase):
name = self.conn.execute('SELECT name FROM data WHERE book=? AND format=?', (id, format)).fetchone() name = self.conn.execute('SELECT name FROM data WHERE book=? AND format=?', (id, format)).fetchone()
if name: if name:
self.conn.execute('DELETE FROM data WHERE book=? AND format=?', (id, format)) self.conn.execute('DELETE FROM data WHERE book=? AND format=?', (id, format))
name = title + ' - ' + author name = title + ' - ' + author
ext = ('.' + format.lower()) if format else '' ext = ('.' + format.lower()) if format else ''
shutil.copyfileobj(stream, open(os.path.join(path, name+ext), 'wb')) shutil.copyfileobj(stream, open(os.path.join(path, name+ext), 'wb'))
stream.seek(0, 2) stream.seek(0, 2)
@ -479,11 +480,13 @@ class LibraryDatabase2(LibraryDatabase):
def migrate_old(self, db, progress): def migrate_old(self, db, progress):
header = _(u'<p>Migrating old database to ebook library in %s<br><center>')%self.library_path header = _(u'<p>Migrating old database to ebook library in %s<br><center>')%self.library_path
progress.setValue(0)
progress.setLabelText(header)
QCoreApplication.processEvents()
db.conn.row_factory = lambda cursor, row : tuple(row) db.conn.row_factory = lambda cursor, row : tuple(row)
books = db.conn.execute('SELECT id, title, sort, timestamp, uri, series_index, author_sort, isbn FROM books ORDER BY id ASC').fetchall() books = db.conn.execute('SELECT id, title, sort, timestamp, uri, series_index, author_sort, isbn FROM books ORDER BY id ASC').fetchall()
progress.setRange(0, len(books)) progress.setRange(0, len(books))
progress.setValue(0)
progress.setLabelText(header)
for book in books: for book in books:
self.conn.execute('INSERT INTO books(id, title, sort, timestamp, uri, series_index, author_sort, isbn) VALUES(?, ?, ?, ?, ?, ?, ?, ?);', book) self.conn.execute('INSERT INTO books(id, title, sort, timestamp, uri, series_index, author_sort, isbn) VALUES(?, ?, ?, ?, ?, ?, ?, ?);', book)
@ -520,4 +523,4 @@ books_series_link feeds
self.conn.commit() self.conn.commit()
progress.setLabelText(_('Compacting database')) progress.setLabelText(_('Compacting database'))
self.vacuum() self.vacuum()

1
windows_installer.py
View File

@ -621,6 +621,7 @@ def main():
sys.argv[1:2] = ['py2exe'] sys.argv[1:2] = ['py2exe']
if '--verbose' not in sys.argv: if '--verbose' not in sys.argv:
sys.argv.append('--quiet') #py2exe produces too much output by default sys.argv.append('--quiet') #py2exe produces too much output by default
subprocess.check_call('python setup.py develop', shell=True)
if auto and not os.path.exists('dist\\auto'): if auto and not os.path.exists('dist\\auto'):
print os.path.abspath('dist\\auto'), 'does not exist' print os.path.abspath('dist\\auto'), 'does not exist'
return 1 return 1