github/supysonic
1
0
Fork 0
mirror of https://github.com/spl0k/supysonic.git synced 2024-11-12 21:22:17 +00:00
Code Issues Releases Wiki Activity

CLI: display scanning progress every 5 seconds

Browse Source
This commit is contained in:
spl0k 2014-01-14 14:39:37 +01:00
parent 6f506243d7
commit c5aff8f4e3
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cli.py
View File

@ -1,6 +1,6 @@
# coding: utf-8 # coding: utf-8
import sys, cmd, argparse, getpass import sys, cmd, argparse, getpass, time
import config import config
class CLIParser(argparse.ArgumentParser): class CLIParser(argparse.ArgumentParser):
@ -103,16 +103,28 @@ class CLI(cmd.Cmd):
print "Deleted folder '{}'".format(name) print "Deleted folder '{}'".format(name)
def folder_scan(self, folders): def folder_scan(self, folders):
class TimedProgressDisplay:
def __init__(self, name, interval = 5):
self.__name = name
self.__interval = interval
self.__last_display = 0
def __call__(self, scanned, total):
if time.time() - self.__last_display > self.__interval or scanned == total:
print "Scanning '{0}': {1}% ({2}/{3})".format(self.__name, (scanned * 100) / total, scanned, total)
self.__last_display = time.time()
s = Scanner(db.session) s = Scanner(db.session)
if folders: if folders:
folders = map(lambda n: db.Folder.query.filter(db.Folder.name == n and db.Folder.root == True).first() or n, folders) folders = map(lambda n: db.Folder.query.filter(db.Folder.name == n and db.Folder.root == True).first() or n, folders)
if any(map(lambda f: isinstance(f, basestring), folders)): if any(map(lambda f: isinstance(f, basestring), folders)):
print "No such folder(s): " + ' '.join(f for f in folders if isinstance(f, basestring)) print "No such folder(s): " + ' '.join(f for f in folders if isinstance(f, basestring))
for folder in filter(lambda f: isinstance(f, db.Folder), folders): for folder in filter(lambda f: isinstance(f, db.Folder), folders):
FolderManager.scan(folder.id, s) FolderManager.scan(folder.id, s, TimedProgressDisplay(folder.name))
else: else:
for folder in db.Folder.query.filter(db.Folder.root == True): for folder in db.Folder.query.filter(db.Folder.root == True):
FolderManager.scan(folder.id, s) FolderManager.scan(folder.id, s, TimedProgressDisplay(folder.name))
added, deleted = s.stats() added, deleted = s.stats()
db.session.commit() db.session.commit()