mirror of
https://github.com/9001/copyparty.git
synced 2025-12-27 10:15:16 -05:00
mtag: replace keyfinder-py with keyfinder-cli;
died in alpine 3.23 due to ffmpeg8
This commit is contained in:
@@ -4,13 +4,19 @@ import os
|
||||
import sys
|
||||
import tempfile
|
||||
import subprocess as sp
|
||||
import keyfinder
|
||||
|
||||
try:
|
||||
import keyfinder
|
||||
|
||||
PKF = True
|
||||
except:
|
||||
PKF = False
|
||||
|
||||
from copyparty.util import fsenc
|
||||
|
||||
"""
|
||||
dep: github/mixxxdj/libkeyfinder
|
||||
dep: pypi/keyfinder
|
||||
dep: pypi/keyfinder -OR- EvanPurkhiser/keyfinder-cli
|
||||
dep: ffmpeg
|
||||
"""
|
||||
|
||||
@@ -35,7 +41,17 @@ def det(tf):
|
||||
])
|
||||
# fmt: on
|
||||
|
||||
print(keyfinder.key(tf).camelot())
|
||||
if PKF:
|
||||
print(keyfinder.key(tf).camelot())
|
||||
else:
|
||||
# fmt: off
|
||||
sp.check_call([
|
||||
b"keyfinder-cli",
|
||||
b"-n",
|
||||
b"camelot",
|
||||
fsenc(tf)
|
||||
])
|
||||
# fmt: on
|
||||
|
||||
|
||||
def main():
|
||||
|
||||
@@ -155,6 +155,11 @@ install_keyfinder() {
|
||||
return
|
||||
}
|
||||
|
||||
(cat /etc/alpine-release || echo a) 2>&1 | grep -E '3\.2[3-9]' && {
|
||||
echo "alpine too new; ffmpeg8 is keyfinder-py incompat; giving up"
|
||||
return
|
||||
}
|
||||
|
||||
cd "$td"
|
||||
github_tarball https://api.github.com/repos/mixxxdj/libkeyfinder/releases/latest
|
||||
ls -al
|
||||
@@ -189,7 +194,7 @@ install_keyfinder() {
|
||||
exit 1
|
||||
}
|
||||
|
||||
x=${-//[^x]/}; set -x; cat /etc/alpine-release
|
||||
x=${-//[^x]/}; set -x; cat /etc/alpine-release || true
|
||||
# rm -rf /Users/ed/Library/Python/3.9/lib/python/site-packages/*keyfinder*
|
||||
CFLAGS="-I$h/pe/keyfinder/include -I/opt/local/include -I/usr/include/ffmpeg" \
|
||||
CXXFLAGS="-I$h/pe/keyfinder/include -I/opt/local/include -I/usr/include/ffmpeg" \
|
||||
|
||||
Reference in New Issue
Block a user