well that was dumb

This commit is contained in:
ed 2022-08-23 00:03:04 +02:00
parent ee0a060b79
commit 49470c05fa
3 changed files with 8 additions and 6 deletions

View file

@ -36,7 +36,10 @@ FAST = True # parse entire file at container level
# warnings to ignore # 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): def wfilter(lines):
@ -91,7 +94,7 @@ def main():
if err: if err:
return err return err
if min(w, h) < 1080: if min(w, h) < 720:
return "resolution too small" return "resolution too small"
zs = ( zs = (

View file

@ -177,6 +177,7 @@ async function a_up2k_namefilter(good_files, nil_files, bad_files, hooks) {
function process_id_list(txt) { function process_id_list(txt) {
var wanted_ids = new Set(txt.trim().split('\n')), var wanted_ids = new Set(txt.trim().split('\n')),
name_id = {}, name_id = {},
now = Date.now(),
wanted_names = new Set(), // basenames with a wanted ID wanted_names = new Set(), // basenames with a wanted ID
wanted_files = new Set(); // filedrops 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)) { if (wanted_names.has(name)) {
wanted_files.add(good_files[a]); 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(); good_files[a][1] = subdir + '/' + good_files[a][1].split(/\//g).pop();
break; break;
} }

View file

@ -1043,10 +1043,8 @@ function up2k_init(subtle) {
} }
dst.push([fobj, fobj.name]); 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) { function rd_flatten(pf, dirs) {
var ret = jcp(pf); var ret = jcp(pf);