Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
jvoisin
mat2
Commits
32355cb2
Commit
32355cb2
authored
Feb 11, 2020
by
tguinot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean leftovers
parent
d02f5921
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
23 deletions
+3
-23
libmat2/bubblewrap.py
libmat2/bubblewrap.py
+1
-6
libmat2/exiftool.py
libmat2/exiftool.py
+1
-11
libmat2/video.py
libmat2/video.py
+1
-6
No files found.
libmat2/bubblewrap.py
View file @
32355cb2
...
...
@@ -23,14 +23,9 @@ CalledProcessError = subprocess.CalledProcessError
def
_get_bwrap_path
()
->
str
:
which_path
=
shutil
.
which
(
'bwrap'
)
if
which_path
is
not
None
and
os
.
access
(
which_path
,
os
.
X_OK
)
:
if
which_path
is
not
None
:
return
which_path
bwrap_path
=
'/usr/bin/bwrap'
if
os
.
path
.
isfile
(
bwrap_path
):
if
os
.
access
(
bwrap_path
,
os
.
X_OK
):
return
bwrap_path
raise
RuntimeError
(
"Unable to find bwrap"
)
# pragma: no cover
...
...
libmat2/exiftool.py
View file @
32355cb2
...
...
@@ -73,17 +73,7 @@ class ExiftoolParser(abstract.AbstractParser):
@
functools
.
lru_cache
()
def
_get_exiftool_path
()
->
str
:
# pragma: no cover
which_path
=
shutil
.
which
(
'exiftool'
)
if
which_path
is
not
None
and
os
.
access
(
which_path
,
os
.
X_OK
)
:
if
which_path
is
not
None
:
return
which_path
possible_pathes
=
{
'/usr/bin/exiftool'
,
# debian/fedora
'/usr/bin/vendor_perl/exiftool'
,
# archlinux
}
for
possible_path
in
possible_pathes
:
if
os
.
path
.
isfile
(
possible_path
):
if
os
.
access
(
possible_path
,
os
.
X_OK
):
return
possible_path
raise
RuntimeError
(
"Unable to find exiftool"
)
libmat2/video.py
View file @
32355cb2
...
...
@@ -139,12 +139,7 @@ class MP4Parser(AbstractFFmpegParser):
@
functools
.
lru_cache
()
def
_get_ffmpeg_path
()
->
str
:
# pragma: no cover
which_path
=
shutil
.
which
(
'ffmpeg'
)
if
which_path
is
not
None
and
os
.
access
(
which_path
,
os
.
X_OK
)
:
if
which_path
is
not
None
:
return
which_path
ffmpeg_path
=
'/usr/bin/ffmpeg'
if
os
.
path
.
isfile
(
ffmpeg_path
):
if
os
.
access
(
ffmpeg_path
,
os
.
X_OK
):
return
ffmpeg_path
raise
RuntimeError
(
"Unable to find ffmpeg"
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment