From 4954c1d855767e28e61c5b1763679f51964f12ea Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Tue, 2 Aug 2022 15:01:05 +0200 Subject: [PATCH] Use audio/flac as MIME type for flac files as this seems now to be the norm --- src/filters/rclaudio.py | 2 +- src/sampleconf/mimeconf | 4 +++- src/sampleconf/mimemap | 2 +- src/sampleconf/mimeview | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/filters/rclaudio.py b/src/filters/rclaudio.py index 294e6079..b5afbb4a 100755 --- a/src/filters/rclaudio.py +++ b/src/filters/rclaudio.py @@ -238,7 +238,7 @@ class AudioTagExtractor(RclBaseHandler): if tagname.startswith('APIC:'): #self.em.rclog("mp3 img: %s" % mutf[tagname].mime) return 'jpg' if mutf[tagname].mime == 'image/jpeg' else 'png' - elif 'audio/x-flac' in mime: + elif 'flac' in mime: if mutf.pictures: return 'jpg' if mutf.pictures[0].mime == 'image/jpeg' else 'png' elif 'audio/mp4' in mime: diff --git a/src/sampleconf/mimeconf b/src/sampleconf/mimeconf index cfeaf955..cf19ea26 100644 --- a/src/sampleconf/mimeconf +++ b/src/sampleconf/mimeconf @@ -164,7 +164,7 @@ application/x-awk = internal text/plain application/x-chm = execm rclchm.py application/x-dia-diagram = execm rcldia.py;mimetype=text/plain application/x-dvi = exec rcldvi -application/x-flac = execm rclaudio.py +audio/flac = execm rclaudio.py application/x-gnote = execm rclxml.py application/x-gnuinfo = execm rclinfo.py application/x-gnumeric = internal xsltproc gnumeric.xsl @@ -297,6 +297,8 @@ application/x-chm = book application/x-dia-diagram = drawing application/x-dvi = document application/x-flac = sownd +audio/x-flac = sownd +audio/flac = sownd application/x-fsdirectory = folder application/x-gnote = document application/x-gnuinfo = book diff --git a/src/sampleconf/mimemap b/src/sampleconf/mimemap index d528e50c..ba2c91e8 100644 --- a/src/sampleconf/mimemap +++ b/src/sampleconf/mimemap @@ -197,7 +197,7 @@ # Note: file -i says audio/x-midi, but soft karaoke files are special. .aac = audio/aac .ape = audio/ape -.flac = application/x-flac +.flac = audio/flac .kar = audio/x-karaoke .m4a = audio/mp4 .mid = audio/x-karaoke diff --git a/src/sampleconf/mimeview b/src/sampleconf/mimeview index 78dc3912..c9568566 100644 --- a/src/sampleconf/mimeview +++ b/src/sampleconf/mimeview @@ -121,6 +121,7 @@ application/x-gnuinfo = xterm -e "info -f %f" application/x-gnumeric = gnumeric %f application/x-flac = rhythmbox %f +audio/flac = rhythmbox %f audio/mpeg = rhythmbox %f audio/aac = rhythmbox %f audio/ape = rhythmbox %f