import/lists/autocompleteFolder
This commit is contained in:
parent
94443ee667
commit
d6f350e5a1
42 changed files with 955 additions and 436 deletions
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