From 48645072eefab820cb374b3f75367c788e434cd5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 4 Oct 2015 18:01:32 +0200
Subject: [PATCH] extension simplifications

---
 fdroidserver/common.py   |  3 ++-
 fdroidserver/metadata.py | 15 +++++++--------
 fdroidserver/scanner.py  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 26be3139..547b0562 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -376,7 +376,8 @@ def get_extension(filename):
 
 
 def has_extension(filename, ext):
-    return ext == get_extension(filename)
+    _, f_ext = get_extension(filename)
+    return ext == f_ext
 
 
 apk_regex = None
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 3f05cc73..16daac15 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -599,7 +599,7 @@ def get_default_app_info_list(apps, metadatapath=None):
     if metadatapath is None:
         appid = None
     else:
-        appid = os.path.splitext(os.path.basename(metadatapath))[0]
+        appid, _ = common.get_extension(os.path.basename(metadatapath))
     if appid in apps:
         logging.critical("'%s' is a duplicate! '%s' is already provided by '%s'"
                          % (metadatapath, appid, apps[appid]['metadatapath']))
@@ -751,22 +751,21 @@ def _decode_dict(data):
 
 
 def parse_metadata(apps, metadatapath):
-    root, ext = os.path.splitext(metadatapath)
-    metadataformat = ext[1:]
+    _, ext = common.get_extension(metadatapath)
     accepted = common.config['accepted_formats']
-    if metadataformat not in accepted:
+    if ext not in accepted:
         logging.critical('"' + metadatapath
                          + '" is not in an accepted format, '
                          + 'convert to: ' + ', '.join(accepted))
         sys.exit(1)
 
-    if metadataformat == 'txt':
+    if ext == 'txt':
         return parse_txt_metadata(apps, metadatapath)
-    if metadataformat == 'json':
+    if ext == 'json':
         return parse_json_metadata(apps, metadatapath)
-    if metadataformat == 'xml':
+    if ext == 'xml':
         return parse_xml_metadata(apps, metadatapath)
-    if metadataformat == 'yaml':
+    if ext == 'yaml':
         return parse_yaml_metadata(apps, metadatapath)
 
     logging.critical('Unknown metadata format: ' + metadatapath)
diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index cc42adce..7a7e5d2b 100644
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -147,7 +147,7 @@ def scan_source(build_dir, root_dir, thisbuild):
                 continue
 
             fd = fp[len(build_dir) + 1:]
-            ext = common.get_extension(fd)
+            _, ext = common.get_extension(fd)
 
             if ext == 'so':
                 count += handleproblem('shared library', fd, fp)
-- 
2.30.2