at master 2.0 kB view raw
1diff --git a/dolphin/mat2.desktop b/dolphin/mat2.desktop 2index 41c8de4..11df258 100644 3--- a/dolphin/mat2.desktop 4+++ b/dolphin/mat2.desktop 5@@ -8,6 +8,6 @@ Type=Service 6 Name=Clean metadata 7 Name[de]=Metadaten löschen 8 Name[es]=Limpiar metadatos 9-Icon=/usr/share/icons/hicolor/scalable/apps/mat2.svg 10-Exec=kdialog --yesno "$( mat2 -s %F )" --title "Clean Metadata?" && mat2 %U 11-Exec[de]=kdialog --yesno "$( mat2 -s %F )" --title "Metadaten löschen?" && mat2 %U 12+Icon=@mat2svg@ 13+Exec=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Clean Metadata?" && @mat2@ %U 14+Exec[de]=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Metadaten löschen?" && @mat2@ %U 15diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py 16index 2b91ac2..5fcf6e5 100644 17--- a/libmat2/exiftool.py 18+++ b/libmat2/exiftool.py 19@@ -1,8 +1,6 @@ 20-import functools 21 import json 22 import logging 23 import os 24-import shutil 25 import subprocess 26 from typing import Union, Set, Dict 27 28@@ -67,14 +65,5 @@ class ExiftoolParser(abstract.AbstractParser): 29 return False 30 return True 31 32-@functools.lru_cache(maxsize=None) 33 def _get_exiftool_path() -> str: # pragma: no cover 34- which_path = shutil.which('exiftool') 35- if which_path: 36- return which_path 37- 38- # Exiftool on Arch Linux has a weird path 39- if os.access('/usr/bin/vendor_perl/exiftool', os.X_OK): 40- return '/usr/bin/vendor_perl/exiftool' 41- 42- raise RuntimeError("Unable to find exiftool") 43+ return '@exiftool@' 44diff --git a/libmat2/video.py b/libmat2/video.py 45index 39059c5..82fe1e7 100644 46--- a/libmat2/video.py 47+++ b/libmat2/video.py 48@@ -1,6 +1,4 @@ 49 import subprocess 50-import functools 51-import shutil 52 import logging 53 54 from typing import Union, Dict 55@@ -135,10 +133,5 @@ class MP4Parser(AbstractFFmpegParser): 56 } 57 58 59-@functools.lru_cache(maxsize=None) 60 def _get_ffmpeg_path() -> str: # pragma: no cover 61- which_path = shutil.which('ffmpeg') 62- if which_path: 63- return which_path 64- 65- raise RuntimeError("Unable to find ffmpeg") 66+ return '@ffmpeg@'