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

Fix #1569 (browser /calibre-server conflict?)

Browse Source
This commit is contained in:
Kovid Goyal 2009-01-08 10:28:37 -08:00
parent cfb275598b
commit 03a704403d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ __docformat__ = 'restructuredtext en'
HTTP server for remote access to the calibre database. HTTP server for remote access to the calibre database.
''' '''
import sys, textwrap, cStringIO, mimetypes, operator, os, re, logging import sys, textwrap, mimetypes, operator, os, re, logging
from itertools import repeat from itertools import repeat
from logging.handlers import RotatingFileHandler from logging.handlers import RotatingFileHandler
from datetime import datetime from datetime import datetime
@ -285,7 +285,8 @@ class LibraryServer(object):
updated=updated, id='urn:calibre:main').render('xml') updated=updated, id='urn:calibre:main').render('xml')
@expose @expose
def library(self, start='0', num='50', sort=None, search=None, _=None, order='ascending'): def library(self, start='0', num='50', sort=None, search=None,
_=None, order='ascending'):
''' '''
Serves metadata from the calibre database as XML. Serves metadata from the calibre database as XML.
@ -321,7 +322,7 @@ class LibraryServer(object):
total=len(ids)).render('xml') total=len(ids)).render('xml')
@expose @expose
def index(self): def index(self, **kwargs):
'The / URL' 'The / URL'
return self.static('index.html') return self.static('index.html')
@ -357,7 +358,8 @@ class LibraryServer(object):
'' : 'application/octet-stream', '' : 'application/octet-stream',
}[name.rpartition('.')[-1].lower()] }[name.rpartition('.')[-1].lower()]
cherrypy.response.headers['Last-Modified'] = self.last_modified(build_time) cherrypy.response.headers['Last-Modified'] = self.last_modified(build_time)
if self.opts.develop and name in ('gui.js', 'gui.css', 'index.html'): if self.opts.develop and not getattr(sys, 'frozen', False) and \
name in ('gui.js', 'gui.css', 'index.html'):
path = os.path.join(os.path.dirname(__file__), 'static', name) path = os.path.join(os.path.dirname(__file__), 'static', name)
lm = datetime.fromtimestamp(os.stat(path).st_mtime) lm = datetime.fromtimestamp(os.stat(path).st_mtime)
cherrypy.response.headers['Last-Modified'] = self.last_modified(lm) cherrypy.response.headers['Last-Modified'] = self.last_modified(lm)