diff --git a/config.json b/config.json index a74884f..443af48 100644 --- a/config.json +++ b/config.json @@ -110,8 +110,7 @@ "title": "Extension", "type": "string", "columnWidth": 80, - "sort": true, - "find": true + "sort": true }, { "id": "size", diff --git a/oml/api.py b/oml/api.py index e4c9f09..1e0d190 100644 --- a/oml/api.py +++ b/oml/api.py @@ -70,7 +70,7 @@ def autocompleteFolder(request): folder, name = os.path.split(path) if os.path.exists(folder): prefix, folders, files = os.walk(folder).next() - folders = [os.path.join(prefix, f) for f in folders if not name or f.startswith(name)] + folders = [os.path.join(prefix, f) for f in folders if (not name or f.startswith(name)) and not f.startswith('.')] if prefix == path: folders = [path] + folders else: diff --git a/oml/downloads.py b/oml/downloads.py index 22633e6..faedf27 100644 --- a/oml/downloads.py +++ b/oml/downloads.py @@ -24,10 +24,10 @@ class Downloads(Thread): for i in item.models.Item.query.filter( item.models.Item.transferadded!=None).filter( item.models.Item.transferprogress<1).order_by(item.models.Item.transferadded): - logger.debug('DOWNLOAD %s %s', i, i.users) - for p in i.users: - if state.nodes.check_online(p.id): - r = state.nodes.download(p.id, i) + for u in i.users: + if state.nodes.check_online(u.id): + logger.debug('DOWNLOAD %s %s', i, u) + r = state.nodes.download(u.id, i) logger.debug('download ok? %s', r) return True return False diff --git a/oml/item/models.py b/oml/item/models.py index cc1c34d..a0f7419 100644 --- a/oml/item/models.py +++ b/oml/item/models.py @@ -318,7 +318,7 @@ class Item(db.Model): if cover: img = Image.open(StringIO(cover)) self.meta['coverRatio'] = img.size[0]/img.size[1] - for p in (':128', ':256'): + for p in (':128', ':256', ':512'): del covers['%s%s' % (self.id, p)] return cover @@ -381,6 +381,8 @@ class Item(db.Model): user = state.user() if user in self.users: self.users.remove(user) + for l in self.lists.filter_by(user_id=user.id): + l.items.remove(self) db.session.commit() if not self.users: db.session.delete(self) diff --git a/oml/media/epub.py b/oml/media/epub.py index c7ddd61..ba9defe 100644 --- a/oml/media/epub.py +++ b/oml/media/epub.py @@ -2,22 +2,51 @@ # vi:si:et:sw=4:sts=4:ts=4 from __future__ import division -import sys +import os import xml.etree.ElementTree as ET import zipfile from StringIO import StringIO +import re import Image import stdnum.isbn from utils import normalize_isbn, find_isbns +import logging +logger = logging.getLogger('oml.media.epub') + def cover(path): - img = Image.new('RGB', (80, 128)) - o = StringIO() - img.save(o, format='jpeg') - data = o.getvalue() - o.close() + logger.debug('cover %s', path) + z = zipfile.ZipFile(path) + data = None + for f in z.filelist: + if 'cover' in f.filename and f.filename.split('.')[-1] in ('jpg', 'jpeg', 'png'): + logger.debug('using %s', f.filename) + data = z.read(f.filename) + break + if not data: + opf = [f.filename for f in z.filelist if f.filename.endswith('opf')] + if opf: + info = ET.fromstring(z.read(opf[0])) + manifest = info.findall('{http://www.idpf.org/2007/opf}manifest')[0] + for e in manifest.getchildren(): + if 'html' in e.attrib['media-type']: + filename = e.attrib['href'] + filename = os.path.normpath(os.path.join(os.path.dirname(opf[0]), filename)) + html = z.read(filename) + img = re.compile('