diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..2bbe47247fec2de15fe046c190e159464bf5b1c0 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,5 @@ +test: + script: + - apt-get update -qy + - apt-get install -qy --no-install-recommends python3-mutagen python3-gi-cairo gir1.2-poppler-0.18 gir1.2-gdkpixbuf-2.0 libimage-exiftool-perl + - python3 -m unittest discover -v diff --git a/src/parsers/jpg.py b/src/parsers/jpg.py index d1a44399e88d369cec8336f28f1f62da54dbee23..34fc04c3135c59756a0d13366ac881d56f9b40f4 100644 --- a/src/parsers/jpg.py +++ b/src/parsers/jpg.py @@ -19,7 +19,7 @@ class JPGParser(abstract.AbstractParser): def get_meta(self): out = subprocess.check_output(['exiftool', '-json', self.filename]) - meta = json.loads(out)[0] + meta = json.loads(out.decode('utf-8'))[0] for key in self.meta_whitelist: meta.pop(key, None) return meta diff --git a/src/parsers/png.py b/src/parsers/png.py index 20cd234a8e08b40f12df554c1d5df10c160934f3..377682eb706ba03fb75bf9d75a0c09e7a5fe75bb 100644 --- a/src/parsers/png.py +++ b/src/parsers/png.py @@ -16,7 +16,7 @@ class PNGParser(abstract.AbstractParser): def get_meta(self): out = subprocess.check_output(['exiftool', '-json', self.filename]) - meta = json.loads(out)[0] + meta = json.loads(out.decode('utf-8'))[0] for key in self.meta_whitelist: meta.pop(key, None) return meta