Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2009-06-03 22:54:55 -07:00
parent ae475bddb0
commit 857cc5f4bb
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installer/osx/freeze.py
View File

@ -19,7 +19,7 @@ from modulegraph.find_modules import find_modules
PYTHON = '/Library/Frameworks/Python.framework/Versions/Current/bin/python' PYTHON = '/Library/Frameworks/Python.framework/Versions/Current/bin/python'
class BuildAPP(py2app): class BuildAPP(py2app):
QT_PREFIX = '/Users/kovid/qt' QT_PREFIX = '/Volumes/sw/qt'
LOADER_TEMPLATE = \ LOADER_TEMPLATE = \
r'''#!/usr/bin/env python r'''#!/usr/bin/env python
import os, sys, glob import os, sys, glob

3
src/calibre/devices/kindle/driver.py
View File

@ -53,8 +53,7 @@ class KINDLE(USBMS):
@classmethod @classmethod
def metadata_from_path(cls, path): def metadata_from_path(cls, path):
from calibre.ebooks.metadata.meta import metadata_from_formats mi = cls.metadata_from_formats([path])
mi = metadata_from_formats([path])
if mi.title == _('Unknown') or ('-asin' in mi.title and '-type' in mi.title): if mi.title == _('Unknown') or ('-asin' in mi.title and '-type' in mi.title):
match = cls.WIRELESS_FILE_NAME_PATTERN.match(os.path.basename(path)) match = cls.WIRELESS_FILE_NAME_PATTERN.match(os.path.basename(path))
if match is not None: if match is not None:

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

@ -211,8 +211,15 @@ class USBMS(CLI, Device):
@classmethod @classmethod
def metadata_from_path(cls, path): def metadata_from_path(cls, path):
return cls.metadata_from_formats([path])
@classmethod
def metadata_from_formats(cls, fmts):
from calibre.ebooks.metadata.meta import metadata_from_formats from calibre.ebooks.metadata.meta import metadata_from_formats
return metadata_from_formats([path]) from calibre.customize.ui import quick_metadata
with quick_metadata:
return metadata_from_formats(fmts)
@classmethod @classmethod
def book_from_path(cls, path): def book_from_path(cls, path):