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

Fix #3028 (Field "Published" below 1900 make catalog empty on iPhone)

Browse Source
This commit is contained in:
Kovid Goyal 2009-08-02 11:02:35 -06:00
parent 444f76fc25
commit 4584eeac71
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/__init__.py
View File

@ -326,7 +326,7 @@ def walk(dir):
yield os.path.join(record[0], f) yield os.path.join(record[0], f)
def strftime(fmt, t=None): def strftime(fmt, t=None):
''' A version of strtime that returns unicode strings and tries to handle dates ''' A version of strftime that returns unicode strings and tries to handle dates
before 1900 ''' before 1900 '''
if t is None: if t is None:
t = time.localtime() t = time.localtime()

25
src/calibre/library/server.py
View File

@ -23,7 +23,8 @@ except ImportError:
from calibre.constants import __version__, __appname__ from calibre.constants import __version__, __appname__
from calibre.utils.genshi.template import MarkupTemplate from calibre.utils.genshi.template import MarkupTemplate
from calibre import fit_image, guess_type, prepare_string_for_xml from calibre import fit_image, guess_type, prepare_string_for_xml, \
strftime as _strftime
from calibre.resources import jquery, server_resources, build_time from calibre.resources import jquery, server_resources, build_time
from calibre.library import server_config as config from calibre.library import server_config as config
from calibre.library.database2 import LibraryDatabase2, FIELD_MAP from calibre.library.database2 import LibraryDatabase2, FIELD_MAP
@ -35,6 +36,15 @@ from calibre.ebooks.metadata import fmt_sidx
build_time = datetime.strptime(build_time, '%d %m %Y %H%M%S') build_time = datetime.strptime(build_time, '%d %m %Y %H%M%S')
server_resources['jquery.js'] = jquery server_resources['jquery.js'] = jquery
def strftime(fmt='%Y/%m/%d %H:%M:%S', dt=None):
if not hasattr(dt, 'timetuple'):
dt = datetime.now()
dt = dt.timetuple()
try:
return _strftime(fmt, dt)
except:
return _strftime(fmt, datetime.now().timetuple())
def expose(func): def expose(func):
def do(self, *args, **kwargs): def do(self, *args, **kwargs):
@ -59,7 +69,8 @@ class LibraryServer(object):
author_sort="${r[12]}" author_sort="${r[12]}"
authors="${authors}" authors="${authors}"
rating="${r[4]}" rating="${r[4]}"
timestamp="${r[5].strftime('%Y/%m/%d %H:%M:%S')}" timestamp="${timestamp}"
pubdate="${pubdate}"
size="${r[6]}" size="${r[6]}"
isbn="${r[14] if r[14] else ''}" isbn="${r[14] if r[14] else ''}"
formats="${r[13] if r[13] else ''}" formats="${r[13] if r[13] else ''}"
@ -84,7 +95,7 @@ class LibraryServer(object):
<title>${record[FM['title']]}</title> <title>${record[FM['title']]}</title>
<id>urn:calibre:${record[FM['id']]}</id> <id>urn:calibre:${record[FM['id']]}</id>
<author><name>${authors}</name></author> <author><name>${authors}</name></author>
<updated>${record[FM['timestamp']].strftime('%Y-%m-%dT%H:%M:%S+00:00')}</updated> <updated>${timestamp}</updated>
<link type="${mimetype}" href="/get/${fmt}/${record[FM['id']]}" /> <link type="${mimetype}" href="/get/${fmt}/${record[FM['id']]}" />
<link rel="x-stanza-cover-image" type="image/jpeg" href="/get/cover/${record[FM['id']]}" /> <link rel="x-stanza-cover-image" type="image/jpeg" href="/get/cover/${record[FM['id']]}" />
<link rel="x-stanza-cover-image-thumbnail" type="image/jpeg" href="/get/thumb/${record[FM['id']]}" /> <link rel="x-stanza-cover-image-thumbnail" type="image/jpeg" href="/get/thumb/${record[FM['id']]}" />
@ -318,9 +329,10 @@ class LibraryServer(object):
authors=authors, authors=authors,
record=record, FM=FIELD_MAP, record=record, FM=FIELD_MAP,
port=self.opts.port, port=self.opts.port,
extra = ''.join(extra), extra=''.join(extra),
mimetype=mimetype, mimetype=mimetype,
fmt=fmt, fmt=fmt,
timestamp=strftime('%Y-%m-%dT%H:%M:%S+00:00', record[5]),
).render('xml').decode('utf8')) ).render('xml').decode('utf8'))
updated = self.db.last_modified() updated = self.db.last_modified()
@ -361,7 +373,10 @@ class LibraryServer(object):
aus = record[2] if record[2] else __builtin__._('Unknown') aus = record[2] if record[2] else __builtin__._('Unknown')
authors = '|'.join([i.replace('|', ',') for i in aus.split(',')]) authors = '|'.join([i.replace('|', ',') for i in aus.split(',')])
record[10] = fmt_sidx(float(record[10])) record[10] = fmt_sidx(float(record[10]))
books.append(book.generate(r=record, authors=authors).render('xml').decode('utf-8')) ts, pd = strftime('%Y/%m/%d %H:%M:%S', record[5]), \
strftime('%Y/%m/%d %H:%M:%S', record[FIELD_MAP['pubdate']])
books.append(book.generate(r=record, authors=authors, timestamp=ts,
pubdate=pd).render('xml').decode('utf-8'))
updated = self.db.last_modified() updated = self.db.last_modified()
cherrypy.response.headers['Content-Type'] = 'text/xml' cherrypy.response.headers['Content-Type'] = 'text/xml'