You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
66 lines
2.0 KiB
66 lines
2.0 KiB
diff --git a/dolphin/mat2.desktop b/dolphin/mat2.desktop
|
|
index 41c8de4..11df258 100644
|
|
--- a/dolphin/mat2.desktop
|
|
+++ b/dolphin/mat2.desktop
|
|
@@ -8,6 +8,6 @@ Type=Service
|
|
Name=Clean metadata
|
|
Name[de]=Metadaten löschen
|
|
Name[es]=Limpiar metadatos
|
|
-Icon=/usr/share/icons/hicolor/scalable/apps/mat2.svg
|
|
-Exec=kdialog --yesno "$( mat2 -s %F )" --title "Clean Metadata?" && mat2 %U
|
|
-Exec[de]=kdialog --yesno "$( mat2 -s %F )" --title "Metadaten löschen?" && mat2 %U
|
|
+Icon=@mat2svg@
|
|
+Exec=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Clean Metadata?" && @mat2@ %U
|
|
+Exec[de]=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Metadaten löschen?" && @mat2@ %U
|
|
diff --git a/libmat2/exiftool.py b/libmat2/exiftool.py
|
|
index eb65b2a..51a0fa1 100644
|
|
--- a/libmat2/exiftool.py
|
|
+++ b/libmat2/exiftool.py
|
|
@@ -1,8 +1,6 @@
|
|
-import functools
|
|
import json
|
|
import logging
|
|
import os
|
|
-import shutil
|
|
import subprocess
|
|
from typing import Dict, Union, Set
|
|
|
|
@@ -70,14 +68,5 @@ class ExiftoolParser(abstract.AbstractParser):
|
|
return False
|
|
return True
|
|
|
|
-@functools.lru_cache()
|
|
def _get_exiftool_path() -> str: # pragma: no cover
|
|
- which_path = shutil.which('exiftool')
|
|
- if which_path:
|
|
- return which_path
|
|
-
|
|
- # Exiftool on Arch Linux has a weird path
|
|
- if os.access('/usr/bin/vendor_perl/exiftool', os.X_OK):
|
|
- return '/usr/bin/vendor_perl/exiftool'
|
|
-
|
|
- raise RuntimeError("Unable to find exiftool")
|
|
+ return '@exiftool@'
|
|
diff --git a/libmat2/video.py b/libmat2/video.py
|
|
index ae9e463..2acc65c 100644
|
|
--- a/libmat2/video.py
|
|
+++ b/libmat2/video.py
|
|
@@ -1,6 +1,4 @@
|
|
import subprocess
|
|
-import functools
|
|
-import shutil
|
|
import logging
|
|
|
|
from typing import Dict, Union
|
|
@@ -135,10 +133,5 @@ class MP4Parser(AbstractFFmpegParser):
|
|
}
|
|
|
|
|
|
-@functools.lru_cache()
|
|
def _get_ffmpeg_path() -> str: # pragma: no cover
|
|
- which_path = shutil.which('ffmpeg')
|
|
- if which_path:
|
|
- return which_path
|
|
-
|
|
- raise RuntimeError("Unable to find ffmpeg")
|
|
+ return '@ffmpeg@'
|
|
|