Partial fix for #556

This commit is contained in:
Rhet Turnbull
2021-12-21 09:36:42 -08:00
parent e1f1772080
commit a08a653f20

View File

@@ -528,35 +528,38 @@ def _get_uti_from_mdls(extension):
# mdls -name kMDItemContentType foo.3fr # mdls -name kMDItemContentType foo.3fr
# kMDItemContentType = "com.hasselblad.3fr-raw-image" # kMDItemContentType = "com.hasselblad.3fr-raw-image"
with tempfile.NamedTemporaryFile(suffix="." + extension) as temp: try:
output = subprocess.check_output( with tempfile.NamedTemporaryFile(suffix="." + extension) as temp:
[ output = subprocess.check_output(
"/usr/bin/mdls", [
"-name", "/usr/bin/mdls",
"kMDItemContentType", "-name",
temp.name, "kMDItemContentType",
] temp.name,
).splitlines() ]
output = output[0].decode("UTF-8") if output else None ).splitlines()
if not output: output = output[0].decode("UTF-8") if output else None
return None if not output:
return None
match = re.match(r'kMDItemContentType\s+\=\s+"(.*)"', output) match = re.match(r'kMDItemContentType\s+\=\s+"(.*)"', output)
if match: if match:
return match.group(1) return match.group(1)
return None
except Exception:
return None return None
def _get_uti_from_ext_dict(ext): def _get_uti_from_ext_dict(ext):
try: try:
return EXT_UTI_DICT[ext] return EXT_UTI_DICT[ext.lower()]
except KeyError: except KeyError:
return None return None
def _get_ext_from_uti_dict(uti): def _get_ext_from_uti_dict(uti):
try: try:
return UTI_EXT_DICT[uti] return UTI_EXT_DICT[uti.lower()]
except KeyError: except KeyError:
return None return None