import/lists/autocompleteFolder
This commit is contained in:
parent
94443ee667
commit
d6f350e5a1
42 changed files with 955 additions and 436 deletions
115
oml/item/api.py
115
oml/item/api.py
|
|
@ -2,11 +2,12 @@
|
|||
# vi:si:et:sw=4:sts=4:ts=4
|
||||
from __future__ import division
|
||||
|
||||
import logging
|
||||
|
||||
import os
|
||||
import json
|
||||
|
||||
from oxflask.api import actions
|
||||
from oxflask.shortcuts import returns_json
|
||||
from sqlalchemy.orm import load_only
|
||||
|
||||
import query
|
||||
|
||||
|
|
@ -18,12 +19,22 @@ import meta
|
|||
|
||||
import utils
|
||||
|
||||
import logging
|
||||
logger = logging.getLogger('oml.item.api')
|
||||
|
||||
@returns_json
|
||||
def find(request):
|
||||
'''
|
||||
find items
|
||||
takes {
|
||||
query {
|
||||
conditions [{}]
|
||||
operator string
|
||||
}
|
||||
group string
|
||||
keys [string]
|
||||
sort [{}]
|
||||
range [int, int]
|
||||
}
|
||||
'''
|
||||
response = {}
|
||||
data = json.loads(request.form['data']) if 'data' in request.form else {}
|
||||
|
|
@ -31,7 +42,7 @@ def find(request):
|
|||
if 'group' in q:
|
||||
names = {}
|
||||
groups = {}
|
||||
items = [i.id for i in q['qs']]
|
||||
items = [i.id for i in q['qs'].options(load_only('id'))]
|
||||
qs = models.Find.query.filter_by(key=q['group'])
|
||||
if items:
|
||||
qs = qs.filter(models.Find.item_id.in_(items))
|
||||
|
|
@ -58,16 +69,12 @@ def find(request):
|
|||
else:
|
||||
response['items'] = len(g)
|
||||
elif 'position' in data:
|
||||
ids = [i.id for i in q['qs']]
|
||||
ids = [i.id for i in q['qs'].options(load_only('id'))]
|
||||
response['position'] = utils.get_positions(ids, [data['qs'][0].id])[0]
|
||||
elif 'positions' in data:
|
||||
ids = [i.id for i in q['qs']]
|
||||
ids = [i.id for i in q['qs'].options(load_only('id'))]
|
||||
response['positions'] = utils.get_positions(ids, data['positions'])
|
||||
elif 'keys' in data:
|
||||
'''
|
||||
qs = qs[q['range'][0]:q['range'][1]]
|
||||
response['items'] = [p.json(data['keys']) for p in qs]
|
||||
'''
|
||||
response['items'] = []
|
||||
for i in q['qs'][q['range'][0]:q['range'][1]]:
|
||||
j = i.json()
|
||||
|
|
@ -77,12 +84,18 @@ def find(request):
|
|||
#from sqlalchemy.sql import func
|
||||
#models.db.session.query(func.sum(models.Item.sort_size).label("size"))
|
||||
#response['size'] = x.scalar()
|
||||
response['size'] = sum([i.sort_size or 0 for i in q['qs']])
|
||||
response['size'] = sum([i.sort_size or 0 for i in q['qs'].options(load_only('id', 'sort_size'))])
|
||||
return response
|
||||
actions.register(find)
|
||||
|
||||
@returns_json
|
||||
def get(request):
|
||||
'''
|
||||
takes {
|
||||
id
|
||||
keys
|
||||
}
|
||||
'''
|
||||
response = {}
|
||||
data = json.loads(request.form['data']) if 'data' in request.form else {}
|
||||
item = models.Item.get(data['id'])
|
||||
|
|
@ -93,29 +106,48 @@ actions.register(get)
|
|||
|
||||
@returns_json
|
||||
def edit(request):
|
||||
'''
|
||||
takes {
|
||||
id
|
||||
...
|
||||
}
|
||||
setting identifier or base metadata is possible not both at the same time
|
||||
'''
|
||||
response = {}
|
||||
data = json.loads(request.form['data']) if 'data' in request.form else {}
|
||||
logger.debug('edit', data)
|
||||
logger.debug('edit %s', data)
|
||||
item = models.Item.get(data['id'])
|
||||
keys = filter(lambda k: k in models.Item.id_keys, data.keys())
|
||||
logger.debug(item, keys)
|
||||
if item and keys and item.json()['mediastate'] == 'available':
|
||||
key = keys[0]
|
||||
logger.debug('update mainid %s %s', key, data[key])
|
||||
if key in ('isbn10', 'isbn13'):
|
||||
data[key] = utils.normalize_isbn(data[key])
|
||||
item.update_mainid(key, data[key])
|
||||
response = item.json()
|
||||
logger.debug('edit of %s id keys: %s', item, keys)
|
||||
if item and item.json()['mediastate'] == 'available':
|
||||
if keys:
|
||||
key = keys[0]
|
||||
logger.debug('update mainid %s %s', key, data[key])
|
||||
if key in ('isbn10', 'isbn13'):
|
||||
data[key] = utils.normalize_isbn(data[key])
|
||||
item.update_mainid(key, data[key])
|
||||
response = item.json()
|
||||
elif not item.meta.get('mainid'):
|
||||
logger.debug('chustom data %s', data)
|
||||
for key in ('title', 'author', 'date', 'publisher', 'edition'):
|
||||
if key in data:
|
||||
item.meta[key] = data[key]
|
||||
item.update()
|
||||
logger.debug('FIXME: custom metadata not published to changelog!!!')
|
||||
else:
|
||||
logger.info('can only edit available items')
|
||||
response = item.json()
|
||||
return response
|
||||
actions.register(edit, cache=False)
|
||||
|
||||
@returns_json
|
||||
def remove(request):
|
||||
'''
|
||||
takes {
|
||||
id
|
||||
}
|
||||
'''
|
||||
data = json.loads(request.form['data']) if 'data' in request.form else {}
|
||||
logger.debug('remove files', data)
|
||||
logger.debug('remove files %s', data)
|
||||
if 'ids' in data and data['ids']:
|
||||
for i in models.Item.query.filter(models.Item.id.in_(data['ids'])):
|
||||
i.remove_file()
|
||||
|
|
@ -132,10 +164,11 @@ def findMetadata(request):
|
|||
date: string
|
||||
}
|
||||
returns {
|
||||
title: string,
|
||||
autor: [string],
|
||||
date: string,
|
||||
items: [{
|
||||
key: value
|
||||
}]
|
||||
}
|
||||
key is one of the supported identifiers: isbn10, isbn13...
|
||||
'''
|
||||
response = {}
|
||||
data = json.loads(request.form['data']) if 'data' in request.form else {}
|
||||
|
|
@ -146,18 +179,30 @@ actions.register(findMetadata)
|
|||
|
||||
@returns_json
|
||||
def getMetadata(request):
|
||||
'''
|
||||
takes {
|
||||
key: value
|
||||
}
|
||||
key can be one of the supported identifiers: isbn10, isbn13, oclc, olid,...
|
||||
'''
|
||||
data = json.loads(request.form['data']) if 'data' in request.form else {}
|
||||
logger.debug('getMetadata %s', data)
|
||||
key, value = data.iteritems().next()
|
||||
if key in ('isbn10', 'isbn13'):
|
||||
value = utils.normalize_isbn(value)
|
||||
response = meta.lookup(key, value)
|
||||
response['mainid'] = key
|
||||
if response:
|
||||
response['mainid'] = key
|
||||
return response
|
||||
actions.register(getMetadata)
|
||||
|
||||
@returns_json
|
||||
def download(request):
|
||||
'''
|
||||
takes {
|
||||
id
|
||||
}
|
||||
'''
|
||||
response = {}
|
||||
data = json.loads(request.form['data']) if 'data' in request.form else {}
|
||||
item = models.Item.get(data['id'])
|
||||
|
|
@ -170,6 +215,11 @@ actions.register(download, cache=False)
|
|||
|
||||
@returns_json
|
||||
def cancelDownloads(request):
|
||||
'''
|
||||
takes {
|
||||
ids
|
||||
}
|
||||
'''
|
||||
response = {}
|
||||
data = json.loads(request.form['data']) if 'data' in request.form else {}
|
||||
ids = data['ids']
|
||||
|
|
@ -195,8 +245,21 @@ actions.register(scan, cache=False)
|
|||
|
||||
@returns_json
|
||||
def _import(request):
|
||||
'''
|
||||
takes {
|
||||
path absolute path to import
|
||||
list listename (add new items to this list)
|
||||
mode copy|move
|
||||
}
|
||||
'''
|
||||
data = json.loads(request.form['data']) if 'data' in request.form else {}
|
||||
logger.debug('api.import %s', data)
|
||||
state.main.add_callback(state.websockets[0].put, json.dumps(['import', data]))
|
||||
return {}
|
||||
actions.register(_import, 'import', cache=False)
|
||||
|
||||
@returns_json
|
||||
def cancelImport(request):
|
||||
state.activity['cancel'] = True
|
||||
return {}
|
||||
actions.register(cancelImport, cache=False)
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ from oxflask.db import MutableDict
|
|||
from covers import covers
|
||||
from changelog import Changelog
|
||||
from websocket import trigger_event
|
||||
from utils import remove_empty_folders
|
||||
|
||||
logger = logging.getLogger('oml.item.model')
|
||||
|
||||
|
|
@ -296,8 +297,8 @@ class Item(db.Model):
|
|||
|
||||
def extract_cover(self):
|
||||
path = self.get_path()
|
||||
if not path:
|
||||
return getattr(media, self.meta['extensions']).cover(path)
|
||||
if path:
|
||||
return getattr(media, self.info['extension']).cover(path)
|
||||
|
||||
def update_cover(self):
|
||||
cover = None
|
||||
|
|
@ -327,8 +328,6 @@ class Item(db.Model):
|
|||
if mainid:
|
||||
m = meta.lookup(mainid, self.meta[mainid])
|
||||
self.meta.update(m)
|
||||
else:
|
||||
logger.debug('FIX UPDATE %s', mainid)
|
||||
self.update()
|
||||
|
||||
def queue_download(self):
|
||||
|
|
@ -360,6 +359,7 @@ class Item(db.Model):
|
|||
Changelog.record(u, 'additem', self.id, self.info)
|
||||
self.update()
|
||||
f.move()
|
||||
self.update_cover()
|
||||
trigger_event('transfer', {
|
||||
'id': self.id, 'progress': 1
|
||||
})
|
||||
|
|
@ -376,6 +376,7 @@ class Item(db.Model):
|
|||
logger.debug('remove file %s', path)
|
||||
if os.path.exists(path):
|
||||
os.unlink(path)
|
||||
remove_empty_folders(os.path.dirname(path))
|
||||
db.session.delete(f)
|
||||
user = state.user()
|
||||
self.users.remove(user)
|
||||
|
|
@ -399,7 +400,7 @@ for key in config['itemKeys']:
|
|||
col = db.Column(db.String(1000), index=True)
|
||||
setattr(Item, 'sort_%s' % key['id'], col)
|
||||
|
||||
Item.id_keys = ['isbn10', 'isbn13', 'lccn', 'olid', 'oclc']
|
||||
Item.id_keys = ['isbn10', 'isbn13', 'lccn', 'olid', 'oclc', 'asin']
|
||||
Item.item_keys = config['itemKeys']
|
||||
Item.filter_keys = [k['id'] for k in config['itemKeys'] if k.get('filter')]
|
||||
|
||||
|
|
|
|||
112
oml/item/scan.py
112
oml/item/scan.py
|
|
@ -19,6 +19,10 @@ from changelog import Changelog
|
|||
import media
|
||||
from websocket import trigger_event
|
||||
import state
|
||||
from utils import remove_empty_folders
|
||||
|
||||
import logging
|
||||
logger = logging.getLogger('oml.item.scan')
|
||||
|
||||
extensions = ['epub', 'pdf', 'txt']
|
||||
|
||||
|
|
@ -35,6 +39,29 @@ def remove_missing():
|
|||
if dirty:
|
||||
db.session.commit()
|
||||
|
||||
def add_file(id, f, prefix):
|
||||
user = state.user()
|
||||
path = f[len(prefix):]
|
||||
data = media.metadata(f)
|
||||
file = File.get_or_create(id, data, path)
|
||||
item = file.item
|
||||
if 'mainid' in file.info:
|
||||
del file.info['mainid']
|
||||
db.session.add(file)
|
||||
if 'mainid' in item.info:
|
||||
item.meta['mainid'] = item.info.pop('mainid')
|
||||
item.meta[item.meta['mainid']] = item.info[item.meta['mainid']]
|
||||
db.session.add(item)
|
||||
item.users.append(user)
|
||||
Changelog.record(user, 'additem', item.id, item.info)
|
||||
if item.meta.get('mainid'):
|
||||
Changelog.record(user, 'edititem', item.id, {
|
||||
item.meta['mainid']: item.meta[item.meta['mainid']]
|
||||
})
|
||||
item.added = datetime.now()
|
||||
item.scrape()
|
||||
return file
|
||||
|
||||
def run_scan():
|
||||
remove_missing()
|
||||
with app.app_context():
|
||||
|
|
@ -42,7 +69,6 @@ def run_scan():
|
|||
prefix = os.path.join(os.path.expanduser(prefs['libraryPath']), 'Books/')
|
||||
if not prefix[-1] == '/':
|
||||
prefix += '/'
|
||||
user = User.get_or_create(settings.USER_ID)
|
||||
assert isinstance(prefix, unicode)
|
||||
books = []
|
||||
for root, folders, files in os.walk(prefix):
|
||||
|
|
@ -61,29 +87,8 @@ def run_scan():
|
|||
position += 1
|
||||
id = media.get_id(f)
|
||||
file = File.get(id)
|
||||
path = f[len(prefix):]
|
||||
if not file:
|
||||
data = media.metadata(f)
|
||||
ext = f.split('.')[-1]
|
||||
data['extension'] = ext
|
||||
data['size'] = os.stat(f).st_size
|
||||
file = File.get_or_create(id, data, path)
|
||||
item = file.item
|
||||
if 'mainid' in file.info:
|
||||
del file.info['mainid']
|
||||
db.session.add(file)
|
||||
if 'mainid' in item.info:
|
||||
item.meta['mainid'] = item.info.pop('mainid')
|
||||
item.meta[item.meta['mainid']] = item.info[item.meta['mainid']]
|
||||
db.session.add(item)
|
||||
item.users.append(user)
|
||||
Changelog.record(user, 'additem', item.id, item.info)
|
||||
if item.meta.get('mainid'):
|
||||
Changelog.record(user, 'edititem', item.id, {
|
||||
item.meta['mainid']: item.meta[item.meta['mainid']]
|
||||
})
|
||||
item.added = datetime.now()
|
||||
item.scrape()
|
||||
file = add_file(id, f, prefix)
|
||||
added += 1
|
||||
trigger_event('change', {})
|
||||
|
||||
|
|
@ -93,18 +98,28 @@ def run_import(options=None):
|
|||
with app.app_context():
|
||||
prefs = settings.preferences
|
||||
prefix = os.path.expanduser(options.get('path', prefs['importPath']))
|
||||
if os.path.islink(prefix):
|
||||
prefix = os.path.realpath(prefix)
|
||||
if not prefix[-1] == '/':
|
||||
prefix += '/'
|
||||
prefix_books = os.path.join(os.path.expanduser(prefs['libraryPath']), 'Books/')
|
||||
prefix_imported = os.path.join(prefix_books, 'Imported/')
|
||||
if not os.path.exists(prefix):
|
||||
if prefix_books.startswith(prefix) or prefix.startswith(prefix_books):
|
||||
error = 'invalid path'
|
||||
elif not os.path.exists(prefix):
|
||||
error = 'path not found'
|
||||
elif not os.path.isdir(prefix):
|
||||
error = 'path must be a folder'
|
||||
else:
|
||||
error = None
|
||||
if error:
|
||||
trigger_event('activity', {
|
||||
'activity': 'import',
|
||||
'progress': [0, 0],
|
||||
'status': {'code': 404, 'text': 'path not found'}
|
||||
'status': {'code': 404, 'text': error}
|
||||
})
|
||||
state.activity = {}
|
||||
user = User.get_or_create(settings.USER_ID)
|
||||
return
|
||||
listname = options.get('list')
|
||||
if listname:
|
||||
listitems = []
|
||||
|
|
@ -122,6 +137,7 @@ def run_import(options=None):
|
|||
|
||||
state.activity = {
|
||||
'activity': 'import',
|
||||
'path': prefix,
|
||||
'progress': [0, len(books)],
|
||||
}
|
||||
trigger_event('activity', state.activity)
|
||||
|
|
@ -133,7 +149,6 @@ def run_import(options=None):
|
|||
continue
|
||||
id = media.get_id(f)
|
||||
file = File.get(id)
|
||||
path = f[len(prefix):]
|
||||
if not file:
|
||||
f_import = f
|
||||
f = f.replace(prefix, prefix_imported)
|
||||
|
|
@ -142,45 +157,38 @@ def run_import(options=None):
|
|||
shutil.move(f_import, f)
|
||||
else:
|
||||
shutil.copy(f_import, f)
|
||||
path = f[len(prefix_books):]
|
||||
data = media.metadata(f)
|
||||
ext = f.split('.')[-1]
|
||||
data['extension'] = ext
|
||||
data['size'] = os.stat(f).st_size
|
||||
file = File.get_or_create(id, data, path)
|
||||
item = file.item
|
||||
if 'mainid' in file.info:
|
||||
del file.info['mainid']
|
||||
db.session.add(file)
|
||||
if 'mainid' in item.info:
|
||||
item.meta['mainid'] = item.info.pop('mainid')
|
||||
item.meta[item.meta['mainid']] = item.info[item.meta['mainid']]
|
||||
db.session.add(item)
|
||||
item.users.append(user)
|
||||
Changelog.record(user, 'additem', item.id, item.info)
|
||||
if item.meta.get('mainid'):
|
||||
Changelog.record(user, 'edititem', item.id, {
|
||||
item.meta['mainid']: item.meta[item.meta['mainid']]
|
||||
})
|
||||
item.scrape()
|
||||
file = add_file(id, f, prefix_books)
|
||||
file.move()
|
||||
item = file.item
|
||||
if listname:
|
||||
listitems.append(item.id)
|
||||
added += 1
|
||||
if state.activity.get('cancel'):
|
||||
state.activity = {}
|
||||
trigger_event('activity', {
|
||||
'activity': 'import',
|
||||
'status': {'code': 200, 'text': 'canceled'}
|
||||
})
|
||||
return
|
||||
state.activity = {
|
||||
'activity': 'import',
|
||||
'progress': [position, len(books)],
|
||||
'path': path,
|
||||
'path': prefix,
|
||||
'added': added,
|
||||
}
|
||||
trigger_event('activity', state.activity)
|
||||
if listname:
|
||||
l = List.get_or_create(settings.USER_ID, listname)
|
||||
l.add_items(listitems)
|
||||
if listname and listitems:
|
||||
l = List.get(settings.USER_ID, listname)
|
||||
if l:
|
||||
l.add_items(listitems)
|
||||
trigger_event('activity', {
|
||||
'activity': 'import',
|
||||
'progress': [position, len(books)],
|
||||
'path': prefix,
|
||||
'status': {'code': 200, 'text': ''},
|
||||
'added': added,
|
||||
})
|
||||
state.activity = {}
|
||||
remove_empty_folders(prefix_books)
|
||||
if options.get('mode') == 'move':
|
||||
remove_empty_folders(prefix)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue