mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
...
This commit is contained in:
parent
ef959a72f4
commit
ebbeeeaf56
@ -1,6 +1,4 @@
|
|||||||
from calibre.web.feeds.news import BasicNewsRecipe
|
from calibre.web.feeds.news import BasicNewsRecipe
|
||||||
from calibre.ebooks.BeautifulSoup import Tag
|
|
||||||
import re
|
|
||||||
|
|
||||||
class NatureNews(BasicNewsRecipe):
|
class NatureNews(BasicNewsRecipe):
|
||||||
title = u'Nature News'
|
title = u'Nature News'
|
||||||
|
@ -15,6 +15,7 @@ from calibre.utils.terminfo import TerminalController
|
|||||||
from calibre.devices.errors import ArgumentError, DeviceError, DeviceLocked
|
from calibre.devices.errors import ArgumentError, DeviceError, DeviceLocked
|
||||||
from calibre.customize.ui import device_plugins
|
from calibre.customize.ui import device_plugins
|
||||||
from calibre.devices.scanner import DeviceScanner
|
from calibre.devices.scanner import DeviceScanner
|
||||||
|
from calibre.utils.config import device_prefs
|
||||||
|
|
||||||
MINIMUM_COL_WIDTH = 12 #: Minimum width of columns in ls output
|
MINIMUM_COL_WIDTH = 12 #: Minimum width of columns in ls output
|
||||||
|
|
||||||
@ -228,6 +229,7 @@ def main():
|
|||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
dev = d
|
dev = d
|
||||||
|
d.specialize_global_preferences(device_prefs)
|
||||||
break
|
break
|
||||||
|
|
||||||
|
|
||||||
|
@ -5,11 +5,10 @@ from __future__ import (unicode_literals, division, absolute_import,
|
|||||||
__license__ = 'GPL v3'
|
__license__ = 'GPL v3'
|
||||||
__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
|
__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
|
||||||
|
|
||||||
from PyQt4.Qt import (QDialog, QLineEdit, Qt, QPushButton, QDialogButtonBox)
|
from PyQt4.Qt import (QDialog, QLineEdit, Qt)
|
||||||
|
|
||||||
from calibre.gui2 import error_dialog
|
from calibre.gui2 import error_dialog
|
||||||
from calibre.gui2.dialogs.smartdevice_ui import Ui_Dialog
|
from calibre.gui2.dialogs.smartdevice_ui import Ui_Dialog
|
||||||
from calibre.utils.config import prefs
|
|
||||||
from calibre.utils.mdns import get_all_ips
|
from calibre.utils.mdns import get_all_ips
|
||||||
|
|
||||||
def _cmp_ipaddr(l, r):
|
def _cmp_ipaddr(l, r):
|
||||||
|
@ -16,7 +16,7 @@ from calibre.utils.pyparsing import ParseException
|
|||||||
from calibre.ebooks.metadata import fmt_sidx, authors_to_string, string_to_authors
|
from calibre.ebooks.metadata import fmt_sidx, authors_to_string, string_to_authors
|
||||||
from calibre.ebooks.metadata.book.base import SafeFormat
|
from calibre.ebooks.metadata.book.base import SafeFormat
|
||||||
from calibre.ptempfile import PersistentTemporaryFile
|
from calibre.ptempfile import PersistentTemporaryFile
|
||||||
from calibre.utils.config import tweaks, prefs, device_prefs
|
from calibre.utils.config import tweaks, device_prefs
|
||||||
from calibre.utils.date import dt_factory, qt_to_dt, as_local_time
|
from calibre.utils.date import dt_factory, qt_to_dt, as_local_time
|
||||||
from calibre.utils.icu import sort_key
|
from calibre.utils.icu import sort_key
|
||||||
from calibre.utils.search_query_parser import SearchQueryParser
|
from calibre.utils.search_query_parser import SearchQueryParser
|
||||||
|
@ -648,6 +648,7 @@ class CatalogBuilder(object):
|
|||||||
# Hackhackhackhackhack
|
# Hackhackhackhackhack
|
||||||
# icu returns bogus results with curly apostrophes, maybe others under OS X 10.6.x
|
# icu returns bogus results with curly apostrophes, maybe others under OS X 10.6.x
|
||||||
# When we see the magic combo of 0/-1 for ordnum/ordlen, special case the logic
|
# When we see the magic combo of 0/-1 for ordnum/ordlen, special case the logic
|
||||||
|
last_c = u''
|
||||||
if ordnum == 0 and ordlen == -1:
|
if ordnum == 0 and ordlen == -1:
|
||||||
if icu_upper(c[0]) != last_c:
|
if icu_upper(c[0]) != last_c:
|
||||||
last_c = icu_upper(c[0])
|
last_c = icu_upper(c[0])
|
||||||
|
Loading…
x
Reference in New Issue
Block a user