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

Gwr revisions

Browse Source
This commit is contained in:
GRiker 2010-06-23 07:41:25 -06:00
parent 7d86373781
commit db406fab2d
3 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/customize/profiles.py
View File

@ -292,7 +292,7 @@ class iPadOutput(OutputProfile):
.touchscreen_navbar td { .touchscreen_navbar td {
background:#fff; background:#fff;
font-family:Helvetica; font-family:Helvetica;
font-size:80%; font-size:90%;
padding: 5px; padding: 5px;
text-align:center; text-align:center;
} }
@ -309,6 +309,14 @@ class iPadOutput(OutputProfile):
font-style: italic; font-style: italic;
} }
/* Index formatting */
.publish_date {
text-align:center;
}
.divider {
border-bottom:1em solid white;
border-top:1px solid gray;
}
/* Feed summary formatting */ /* Feed summary formatting */
.feed_title { .feed_title {

34
src/calibre/devices/apple/driver.py
View File

@ -18,6 +18,7 @@ from calibre.ebooks.metadata.epub import set_metadata
from calibre.library.server.utils import strftime from calibre.library.server.utils import strftime
from calibre.utils.config import config_dir from calibre.utils.config import config_dir
from calibre.utils.date import isoformat, now, parse_date from calibre.utils.date import isoformat, now, parse_date
from calibre.utils.localization import get_lang
from calibre.utils.logging import Log from calibre.utils.logging import Log
from calibre.utils.zipfile import ZipFile from calibre.utils.zipfile import ZipFile
@ -93,10 +94,13 @@ class ITUNES(DriverBase):
# Product IDs: # Product IDs:
# 0x1292:iPhone 3G # 0x1291 iPod Touch
# 0x129a:iPad # 0x1292 iPhone 3G
# 0x???? iPhone 3GS
# 0x129a iPad
# 0x???? iPhone 4
VENDOR_ID = [0x05ac] VENDOR_ID = [0x05ac]
PRODUCT_ID = [0x129a] PRODUCT_ID = [0x1291,0x1292,0x129a]
BCD = [0x01] BCD = [0x01]
# iTunes enumerations # iTunes enumerations
@ -528,7 +532,7 @@ class ITUNES(DriverBase):
cw.opt_save_template.setVisible(False) cw.opt_save_template.setVisible(False)
cw.label.setVisible(False) cw.label.setVisible(False)
# Repurpose the checkbox # Repurpose the checkbox
cw.opt_read_metadata.setText(_("Use Series as Genre in iTunes/iBooks")) cw.opt_read_metadata.setText(_("Use Series as Category in iTunes/iBooks"))
return cw return cw
def delete_books(self, paths, end_session=True): def delete_books(self, paths, end_session=True):
@ -837,6 +841,7 @@ class ITUNES(DriverBase):
self.log.info("ITUNES.upload_books()") self.log.info("ITUNES.upload_books()")
self._dump_files(files, header='upload_books()',indent=2) self._dump_files(files, header='upload_books()',indent=2)
self._dump_update_list(header='upload_books()',indent=2) self._dump_update_list(header='upload_books()',indent=2)
#self.log.info(" self.settings().format_map: %s" % self.settings().format_map)
if isosx: if isosx:
for (i,file) in enumerate(files): for (i,file) in enumerate(files):
@ -1201,13 +1206,13 @@ class ITUNES(DriverBase):
try: try:
this_book.datetime = parse_date(str(lb_added.date_added())).timetuple() this_book.datetime = parse_date(str(lb_added.date_added())).timetuple()
except: except:
pass this_book.datetime = time.gmtime()
elif db_added: elif db_added:
this_book.size = self._get_device_book_size(fpath, db_added.size()) this_book.size = self._get_device_book_size(fpath, db_added.size())
try: try:
this_book.datetime = parse_date(str(db_added.date_added())).timetuple() this_book.datetime = parse_date(str(db_added.date_added())).timetuple()
except: except:
pass this_book.datetime = time.gmtime()
elif iswindows: elif iswindows:
if lb_added: if lb_added:
@ -1215,13 +1220,13 @@ class ITUNES(DriverBase):
try: try:
this_book.datetime = parse_date(str(lb_added.DateAdded)).timetuple() this_book.datetime = parse_date(str(lb_added.DateAdded)).timetuple()
except: except:
pass this_book.datetime = time.gmtime()
elif db_added: elif db_added:
this_book.size = self._get_device_book_size(fpath, db_added.Size) this_book.size = self._get_device_book_size(fpath, db_added.Size)
try: try:
this_book.datetime = parse_date(str(db_added.DateAdded)).timetuple() this_book.datetime = parse_date(str(db_added.DateAdded)).timetuple()
except: except:
pass this_book.datetime = time.gmtime()
return this_book return this_book
@ -2062,6 +2067,7 @@ class ITUNES(DriverBase):
(self.iTunes.name(), self.iTunes.version(), self.initial_status, (self.iTunes.name(), self.iTunes.version(), self.initial_status,
self.version[0],self.version[1],self.version[2])) self.version[0],self.version[1],self.version[2]))
self.log.info(" iTunes_media: %s" % self.iTunes_media) self.log.info(" iTunes_media: %s" % self.iTunes_media)
if iswindows: if iswindows:
''' '''
Launch iTunes if not already running Launch iTunes if not already running
@ -2305,12 +2311,11 @@ class ITUNES(DriverBase):
self.log.info(" add timestamp: %s" % metadata.timestamp) self.log.info(" add timestamp: %s" % metadata.timestamp)
# Fix the language declaration for iBooks 1.1 # Fix the language declaration for iBooks 1.1
patched_language = 'en-US' patched_language = get_lang()
language = md.find('dc:language') language = md.find('dc:language')
if language:
self.log.info(" changing <dc:language> from '%s' to '%s'" %
(language.renderContents(),patched_language))
metadata.language = patched_language metadata.language = patched_language
if DEBUG:
self.log.info(" updating <dc:language>%s</dc:language> from localization settings" % patched_language)
zf_opf.close() zf_opf.close()
@ -2447,7 +2452,8 @@ class ITUNES(DriverBase):
elif metadata.tags: elif metadata.tags:
if DEBUG: if DEBUG:
self.log.info(" using Tag as Genre") self.log.info(" %susing Tag as Genre" %
"no Series name available, " if self.settings().read_metadata else '')
for tag in metadata.tags: for tag in metadata.tags:
if self._is_alpha(tag[0]): if self._is_alpha(tag[0]):
if lb_added: if lb_added:
@ -2589,8 +2595,6 @@ class BookList(list):
class Book(MetaInformation): class Book(MetaInformation):
''' '''
A simple class describing a book in the iTunes Books Library. A simple class describing a book in the iTunes Books Library.
Q's:
- Should thumbnail come from calibre if available?
- See ebooks.metadata.__init__ for all fields - See ebooks.metadata.__init__ for all fields
''' '''
def __init__(self,title,author): def __init__(self,title,author):

6
src/calibre/web/feeds/templates.py
View File

@ -8,7 +8,7 @@ import copy
from lxml import html, etree from lxml import html, etree
from lxml.html.builder import HTML, HEAD, TITLE, STYLE, DIV, BODY, \ from lxml.html.builder import HTML, HEAD, TITLE, STYLE, DIV, BODY, \
STRONG, EM, BR, SPAN, A, HR, UL, LI, H2, IMG, P as PT, \ STRONG, EM, BR, SPAN, A, HR, UL, LI, H2, H3, IMG, P as PT, \
TABLE, TD, TR TABLE, TD, TR
from calibre import preferred_encoding, strftime, isbytestring from calibre import preferred_encoding, strftime, isbytestring
@ -230,8 +230,8 @@ class TouchscreenIndexTemplate(Template):
toc.append(tr) toc.append(tr)
div = DIV( div = DIV(
masthead_p, masthead_p,
PT(date, style='text-align:center'), H3(CLASS('publish_date'),date),
DIV(style="border-top:1px solid gray;border-bottom:1em solid white"), DIV(CLASS('divider')),
toc) toc)
self.root = HTML(head, BODY(div)) self.root = HTML(head, BODY(div))