mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 09:02:15 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

add mtp eta

Browse source
This commit is contained in:
ed 2021-03-19 01:20:01 +01:00
parent 1a5c66edd3
commit 5d6c61a861
3 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.vscode/tasks.json vendored
View file

@ -8,8 +8,10 @@
},
{
"label": "no_dbg",
"command": "${config:python.pythonPath} -m copyparty -ed -emp -e2dsa -e2ts -a ed:wark -v srv::r:aed:cnodupe -v dist:dist:r ;exit 1",
"type": "shell"
"type": "shell",
"command": "${config:python.pythonPath} -m copyparty -ed -emp -e2dsa -e2ts -a ed:wark -v srv::r:aed:cnodupe -v dist:dist:r ;exit 1"
// -v ~/Music/mt:mt:r:cmtp=.bpm=~/dev/copyparty/bin/mtag/audio-bpm.py:cmtp=key=~/dev/copyparty/bin/mtag/audio-key.py:ce2tsr
// -v ~/Music/mt:mt:r:cmtp=.bpm=~/dev/copyparty/bin/mtag/audio-bpm.py:ce2tsr
}
]
}

1
copyparty/mtag.py
View file

@ -323,6 +323,7 @@ class MTag(object):
ret = {}
for tagname, binpath in parsers.items():
try:
binpath = os.path.expanduser(binpath)
cmd = [sys.executable, binpath, abspath]
cmd = [fsenc(x) for x in cmd]
v = sp.check_output(cmd, env=env).strip()

36
copyparty/up2k.py
View file

@ -223,7 +223,7 @@ class Up2k(object):
_, flags = self._expr_idx_filter(flags)
a = ["\033[36m{}:\033[0m{}".format(k, v) for k, v in flags.items()]
a = ["\033[36m{}:\033[0m{}".format(k, v) for k, v in sorted(flags.items())]
self.log(" ".join(a))
reg = {}
@ -495,6 +495,9 @@ class Up2k(object):
self._run_one_mtp(ptop)
def _run_one_mtp(self, ptop):
db_path = os.path.join(ptop, ".hist", "up2k.db")
sz0 = os.path.getsize(db_path)
force = {}
parsers = {}
for parser in self.flags[ptop]["mtp"]:
@ -513,15 +516,14 @@ class Up2k(object):
n_left = cur.execute(q).fetchone()[0]
mpool = self._start_mpool()
batch_sz = mpool.maxsize * 4
seen = []
batch_sz = mpool.maxsize * 3
t_prev = time.time()
n_prev = n_left
while True:
with self.mutex:
q = "select w from mt where k = 't:mtp' limit ?"
warks = cur.execute(q, (batch_sz,)).fetchall()
warks = [x[0] for x in warks]
warks = [x for x in warks if x not in seen]
seen = warks
jobs = []
for w in warks:
q = "delete from mt where w = ? and k = 't:mtp'"
@ -546,12 +548,27 @@ class Up2k(object):
}
jobs.append([task_parsers, wcur, None, w, abspath])
if not jobs:
if not warks:
break
if not jobs:
continue
try:
now = time.time()
s = ((now - t_prev) / (n_prev - n_left)) * n_left
h, s = divmod(s, 3600)
m, s = divmod(s, 60)
n_prev = n_left
t_prev = now
except:
h = 1
m = 1
msg = "mtp: {} done, {} left, eta {}h {:02d}m"
with self.mutex:
msg = "mtp: {} done, {} left"
self.log(msg.format(self.n_mtag_tags_added, n_left))
msg = msg.format(self.n_mtag_tags_added, n_left, int(h), int(m))
self.log(msg, c=6)
for j in jobs:
n_left -= 1
@ -563,6 +580,9 @@ class Up2k(object):
self._stop_mpool(mpool)
with self.mutex:
cur.connection.commit()
if self.n_mtag_tags_added:
self.vac(cur, db_path, self.n_mtag_tags_added, 0, sz0)
wcur.close()
cur.close()