Allow logo.64.png for logos

Author: nickygerritsen

misc-tools/import-contest.in

@@ -67,7 +67,7 @@ def import_images(entity: str, property: str, filename_regexes: List[str]):
     files matching the regexes will be considered and if multiple files match the regexes the file
     with the first matched regex will be used"""
 
-    if not os.path.isdir(entity):
+    if not os.path.isdir(entity) and not os.path.islink(entity):
         return
     images_per_entity = {}
     with open(f'{entity}.json') as entityFile:
@@ -151,7 +151,7 @@ if import_file('organizations', ['organizations.json']):
     # Also import logos if we have any
     # We prefer the 64x64 logo. If it doesn't exist, accept a generic logo (which might be a SVG)
     # We also prefer PNG/SVG before JPG
-    import_images('organizations', 'logo', ['^logo\\.64x\\d+\\.png$', '^logo\\.(png|svg)$', '^logo\\.64x\\d+\\.jpg$', '^logo\\.jpg$'])
+    import_images('organizations', 'logo', ['^logo\\.64(x\\d+)?\\.png$', '^logo\\.(png|svg)$', '^logo\\.64(x\\d+)?\\.jpg$', '^logo\\.jpg$'])
 if import_file('teams', ['teams.json', 'teams2.tsv']):
     # Also import photos if we have any, but prefer JPG over SVG and PNG
     import_images('teams', 'photo', ['^photo\\.jpg$', '^photo\\.(png|svg)$'])