This commit is contained in:
ed
2021-05-29 15:03:32 +02:00
parent d8fd82bcb5
commit eb5aaddba4
8 changed files with 36 additions and 64 deletions

View File

@@ -1,8 +1,8 @@
# coding: utf-8
VERSION = (0, 10, 22)
CODENAME = "zip it"
BUILD_DT = (2021, 5, 18)
VERSION = (0, 11, 0)
CODENAME = "the grid"
BUILD_DT = (2021, 5, 29)
S_VERSION = ".".join(map(str, VERSION))
S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT)

View File

@@ -243,8 +243,10 @@ class MTag(object):
self.log(msg, c=1)
if not self.usable:
msg = "need mutagen{} to read media tags so please run this:\n {} -m pip install --user mutagen"
self.log(msg.format(or_ffprobe, os.path.basename(sys.executable)), c=1)
msg = "need mutagen{} to read media tags so please run this:\n{}{} -m pip install --user mutagen\n"
self.log(
msg.format(or_ffprobe, " " * 37, os.path.basename(sys.executable)), c=1
)
return
# https://picard-docs.musicbrainz.org/downloads/MusicBrainz_Picard_Tag_Map.html

View File

@@ -54,8 +54,10 @@ class SvcHub(object):
self.thumbsrv = ThumbSrv(self, auth.vfs.all_vols)
else:
msg = "need Pillow to create thumbnails; for example:\n {} -m pip install --user Pillow"
self.log("thumb", msg.format(os.path.basename(sys.executable)), c=3)
msg = "need Pillow to create thumbnails; for example:\n{}{} -m pip install --user Pillow\n"
self.log(
"thumb", msg.format(" " * 37, os.path.basename(sys.executable)), c=3
)
# decide which worker impl to use
if self.check_mp_enable():

View File

@@ -119,10 +119,6 @@ class ThumbSrv(object):
t.daemon = True
t.start()
if not HAVE_PIL:
msg = "need Pillow to create thumbnails so please run this:\n {} -m pip install --user Pillow"
self.log(msg.format(os.path.basename(sys.executable)), c=1)
if not self.args.no_vthumb and (not HAVE_FFMPEG or not HAVE_FFPROBE):
missing = []
if not HAVE_FFMPEG:
@@ -131,7 +127,7 @@ class ThumbSrv(object):
if not HAVE_FFPROBE:
missing.append("ffprobe")
msg = "cannot create video thumbnails since some of the required programs are not available: "
msg = "cannot create video thumbnails because some of the required programs are not available: "
msg += ", ".join(missing)
self.log(msg, c=1)
@@ -299,7 +295,7 @@ class ThumbSrv(object):
cmd += [fsenc(tpath)]
mchkcmd(*cmd)
mchkcmd(cmd)
def poke(self, tdir):
if not self.poke_cd.poke(tdir):

View File

@@ -985,7 +985,7 @@ def chkcmd(*argv):
return sout, serr
def mchkcmd(*argv, timeout=10):
def mchkcmd(argv, timeout=10):
if PY2:
with open(os.devnull, "wb") as f:
rv = sp.call(argv, stdout=f, stderr=f)

View File

@@ -199,14 +199,21 @@ html.light #ggrid a.sel {
#ggrid a.sel:hover,
html.light #ggrid a.sel:hover {
color: #fff;
background: #a36;
background: #d39;
border-color: #d48;
text-shadow: 1px 1px 0 #804;
}
#ggrid a.sel {
box-shadow: 0 .1em .7em #b36;
#ggrid a.sel,
html.light #ggrid a.sel {
border-top: 1px solid #d48;
box-shadow: 0 .1em 1.2em #b36;
transition: all 0.2s cubic-bezier(.2, 2.2, .5, 1); /* https://cubic-bezier.com/#.4,2,.7,1 */
}
#ggrid a.sel img {
opacity: .7;
box-shadow: 0 0 1em #b36;
filter: contrast(130%) brightness(107%);
}
#files tr.sel a {
color: #fff;
}
@@ -772,7 +779,7 @@ html.light #ghead {
#ggrid a img {
border-radius: .2em;
max-width: var(--grid-sz);
max-height: var(--grid-sz);
max-height: calc(var(--grid-sz)/1.25);
margin: 0 auto;
display: block;
}