diff --git a/bin/mtag/vidchk.py b/bin/mtag/vidchk.py index f7ba3a67..f2f618c7 100755 --- a/bin/mtag/vidchk.py +++ b/bin/mtag/vidchk.py @@ -36,7 +36,10 @@ FAST = True # parse entire file at container level # warnings to ignore -harmless = re.compile("^Unsupported codec with id ") +harmless = re.compile( + r"Unsupported codec with id |Could not find codec parameters.*Attachment:|analyzeduration" + + r"|timescale not set" +) def wfilter(lines): @@ -91,7 +94,7 @@ def main(): if err: return err - if min(w, h) < 1080: + if min(w, h) < 720: return "resolution too small" zs = ( diff --git a/contrib/plugins/up2k-hook-ytid.js b/contrib/plugins/up2k-hook-ytid.js index 7c57d59f..1e3e5dc4 100644 --- a/contrib/plugins/up2k-hook-ytid.js +++ b/contrib/plugins/up2k-hook-ytid.js @@ -177,6 +177,7 @@ async function a_up2k_namefilter(good_files, nil_files, bad_files, hooks) { function process_id_list(txt) { var wanted_ids = new Set(txt.trim().split('\n')), name_id = {}, + now = Date.now(), wanted_names = new Set(), // basenames with a wanted ID wanted_files = new Set(); // filedrops @@ -206,7 +207,7 @@ async function a_up2k_namefilter(good_files, nil_files, bad_files, hooks) { if (wanted_names.has(name)) { wanted_files.add(good_files[a]); - var subdir = `${name_id[name]}-${Date.now()}-${a}`; + var subdir = `${name_id[name]}-${now}`; good_files[a][1] = subdir + '/' + good_files[a][1].split(/\//g).pop(); break; } diff --git a/copyparty/web/up2k.js b/copyparty/web/up2k.js index f34127af..92c4c5ed 100644 --- a/copyparty/web/up2k.js +++ b/copyparty/web/up2k.js @@ -1043,9 +1043,7 @@ function up2k_init(subtle) { } dst.push([fobj, fobj.name]); } - if (dirs) { - return read_dirs(null, [], dirs, good_files, nil_files, bad_files); - } + return read_dirs(null, [], dirs, good_files, nil_files, bad_files); } function rd_flatten(pf, dirs) {