mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-18 01:22:13 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes

Browse source
This commit is contained in:
ed 2021-05-25 06:35:12 +02:00
parent 02a856ecb4
commit 3f4a8b9d6f
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
copyparty/__main__.py
View file

@ -252,7 +252,7 @@ def run_argparse(argv, formatter):
ap2 = ap.add_argument_group('thumbnail options') ap2 = ap.add_argument_group('thumbnail options')
ap.add_argument("--no-thumb", action="store_true", help="disable all thumbnails") ap.add_argument("--no-thumb", action="store_true", help="disable all thumbnails")
ap.add_argument("--no-vthumb", action="store_true", help="disable video thumbnails") ap.add_argument("--no-vthumb", action="store_true", help="disable video thumbnails")
ap.add_argument("--thumbsz", metavar="WxH", default="420x420", help="thumbnail res") ap.add_argument("--thumbsz", metavar="WxH", default="352x352", help="thumbnail res")
ap2 = ap.add_argument_group('database options') ap2 = ap.add_argument_group('database options')
ap2.add_argument("-e2d", action="store_true", help="enable up2k database") ap2.add_argument("-e2d", action="store_true", help="enable up2k database")

4
copyparty/mtag.py
View file

@ -30,7 +30,7 @@ HAVE_FFMPEG = have_ff("ffmpeg")
HAVE_FFPROBE = have_ff("ffprobe") HAVE_FFPROBE = have_ff("ffprobe")
def parse_ffprobe(stdout, logger): def parse_ffprobe(stdout, logger, require_audio=True):
txt = [x.rstrip("\r") for x in stdout.split("\n")] txt = [x.rstrip("\r") for x in stdout.split("\n")]
""" """
@ -117,7 +117,7 @@ def parse_ffprobe(stdout, logger):
if m: if m:
ret[".q"] = m.group(1) ret[".q"] = m.group(1)
if not is_audio: if not is_audio and require_audio:
return {}, {} return {}, {}
ret = {k: [0, v] for k, v in ret.items()} ret = {k: [0, v] for k, v in ret.items()}

12
copyparty/th_srv.py
View file

@ -35,7 +35,7 @@ FMT_PIL, FMT_FF = [
{x: True for x in y.split(" ") if x} {x: True for x in y.split(" ") if x}
for y in [ for y in [
"bmp dib gif icns ico jpg jpeg jp2 jpx pcx png pbm pgm ppm pnm sgi tga tif tiff webp xbm dds xpm", "bmp dib gif icns ico jpg jpeg jp2 jpx pcx png pbm pgm ppm pnm sgi tga tif tiff webp xbm dds xpm",
"av1 asf avi flv m4v mkv mjpeg mjpg mpg mpeg mpg2 mpeg2 mov 3gp mp4 ts mpegts nut ogv ogm rm vob wmv", "av1 asf avi flv m4v mkv mjpeg mjpg mpg mpeg mpg2 mpeg2 mov 3gp mp4 ts mpegts nut ogv ogm rm vob webm wmv",
] ]
] ]
@ -79,7 +79,8 @@ class ThumbSrv(object):
self.args = hub.args self.args = hub.args
self.log_func = hub.log self.log_func = hub.log
self.res = hub.args.thumbsz.split("x") res = hub.args.thumbsz.split("x")
self.res = tuple([int(x) for x in res])
self.mutex = threading.Lock() self.mutex = threading.Lock()
self.busy = {} self.busy = {}
@ -178,8 +179,9 @@ class ThumbSrv(object):
if fun: if fun:
try: try:
fun(abspath, tpath) fun(abspath, tpath)
except: except Exception as ex:
self.log("{} failed on {}".format(fun.__name__, abspath), 3) msg = "{} failed on {}\n {!r}"
self.log(msg.format(fun.__name__, abspath, ex), 3)
with open(tpath, "wb") as _: with open(tpath, "wb") as _:
pass pass
@ -207,7 +209,7 @@ class ThumbSrv(object):
p = sp.Popen(cmd, stdout=sp.PIPE, stderr=sp.PIPE) p = sp.Popen(cmd, stdout=sp.PIPE, stderr=sp.PIPE)
r = p.communicate() r = p.communicate()
txt = r[1].decode("utf-8", "replace") txt = r[1].decode("utf-8", "replace")
ret, _ = parse_ffprobe(txt, self.log) ret, _ = parse_ffprobe(txt, self.log, False)
dur = ret[".dur"][1] dur = ret[".dur"][1]
seek = "{:.0f}".format(dur / 3) seek = "{:.0f}".format(dur / 3)