Allow flint to populate the appstore

Author: hellcp

appstore/commands.py

@@ -170,7 +170,7 @@ def import_apps(app_type):
         done = set()
         for platform in (app_obj.releases[0].compatibility
                          if len(app_obj.releases) > 0
-                         else ['aplite', 'basalt', 'chalk', 'diorite', 'emery']):
+                         else ['aplite', 'basalt', 'chalk', 'diorite', 'emery', 'flint']):
             r = requests.get(f"https://api2.getpebble.com/v2/apps/id/{app_obj.id}?hardware={platform}")
             r.raise_for_status()
             data = r.json()['data'][0]
@@ -186,7 +186,7 @@ def import_apps(app_type):
             db.session.add(collection)
 
         if filename:
-            for platform in ['aplite', 'basalt', 'chalk', 'diorite', 'emery']:
+            for platform in ['aplite', 'basalt', 'chalk', 'diorite', 'emery', 'flint']:
                 pbw = PBW(filename, platform)
                 if not pbw.has_platform:
                     continue
@@ -324,7 +324,7 @@ def import_app_from_locker(locker_app):
             is_published=True,
         )
         db.session.add(release_obj)
-        for platform in ['aplite', 'basalt', 'chalk', 'diorite', 'emery']:
+        for platform in ['aplite', 'basalt', 'chalk', 'diorite', 'emery', 'flint']:
             pbw = PBW(filename, platform)
             if not pbw.has_platform:
                 continue
@@ -510,7 +510,7 @@ def path(base):
                                release_notes = params['release_notes'],
                                published_date = datetime.datetime.utcnow(),
                                version = appinfo['versionLabel'],
-                               compatibility = appinfo.get('targetPlatforms', [ 'aplite', 'basalt', 'diorite', 'emery' ]))
+                               compatibility = appinfo.get('targetPlatforms', [ 'aplite', 'basalt', 'diorite', 'emery', 'flint' ]))
     print(f"Created release {release.id}")
     upload_pbw(release, path(pbw_file))
     db.session.commit()

appstore/developer_portal_api.py

@@ -88,6 +88,7 @@ def submit_new_app():
             "chalk": [],
             "diorite": [],
             "emery": [],
+            "flint": [],
         }
 
         try:
@@ -187,7 +188,7 @@ def submit_new_app():
                                    release_notes=params['release_notes'],
                                    published_date=datetime.datetime.utcnow(),
                                    version=appinfo['versionLabel'],
-                                   compatibility=appinfo.get('targetPlatforms', ['aplite', 'basalt', 'diorite', 'emery']))
+                                   compatibility=appinfo.get('targetPlatforms', ['aplite', 'basalt', 'diorite', 'emery', 'flint']))
         print(f"Created release {release.id}")
         upload_pbw(release, request.files['pbw'])
         db.session.commit()
@@ -319,7 +320,7 @@ def submit_new_release(app_id):
                                    release_notes=data["release_notes"],
                                    published_date=datetime.datetime.utcnow(),
                                    version=version,
-                                   compatibility=appinfo.get('targetPlatforms', ['aplite', 'basalt', 'diorite', 'emery']))
+                                   compatibility=appinfo.get('targetPlatforms', ['aplite', 'basalt', 'diorite', 'emery', 'flint']))
 
     upload_pbw(release_new, request.files['pbw'])
     db.session.commit()

appstore/locker.py

@@ -60,9 +60,9 @@ def jsonify_locker_app(entry):
             },
             **{
                 x: {
-                    'supported': x in (release.compatibility if release and release.compatibility else ['aplite', 'basalt', 'diorite', 'emery']),
+                    'supported': x in (release.compatibility if release and release.compatibility else ['aplite', 'basalt', 'diorite', 'emery', 'flint']),
                     'firmware': {'major': 3}
-                } for x in ['aplite', 'basalt', 'chalk', 'diorite', 'emery']
+                } for x in ['aplite', 'basalt', 'chalk', 'diorite', 'emery', 'flint']
             },
         },
         'companions': {

appstore/pbw.py

@@ -12,7 +12,7 @@
 from .models import Binary, App, Release, db
 from .utils import id_generator
 
-PLATFORMS = ['aplite', 'basalt', 'chalk', 'diorite', 'emery']
+PLATFORMS = ['aplite', 'basalt', 'chalk', 'diorite', 'emery', 'flint']
 GENERATED_ID_PREFIX = "13371337"
 
 class PBW(object):
@@ -42,6 +42,7 @@ class PBW(object):
         'chalk': ('chalk/',),
         'diorite': ('diorite/',),
         'emery': ('emery/',),
+        'flint': ('flint/',),
     }
 
     def __init__(self, pbw, platform):

appstore/utils.py

@@ -44,14 +44,16 @@ def __init__(self, message="Failed to validate new app", e_code="generic.error")
     'chalk': (180, 180),
     'diorite': (144, 168),
     'emery': (200, 228),
+    'flint': (144, 168),
 }
 
 valid_platforms = [
     "aplite",
     "basalt",
     "chalk",
     "diorite",
-    "emery"
+    "emery",
+    "flint"
 ]
 
 permitted_image_types = [
@@ -85,9 +87,9 @@ def _jsonify_common(app: App, target_hw: str) -> dict:
             },
             **{
                 x: {
-                    'supported': x in (release.compatibility if release and release.compatibility else ['aplite', 'basalt', 'diorite', 'emery']),
+                    'supported': x in (release.compatibility if release and release.compatibility else ['aplite', 'basalt', 'diorite', 'emery', 'flint']),
                     'firmware': {'major': 3}
-                } for x in ['aplite', 'basalt', 'chalk', 'diorite', 'emery']
+                } for x in ['aplite', 'basalt', 'chalk', 'diorite', 'emery', 'flint']
             },
         },
         'description': assets.description,
@@ -171,7 +173,7 @@ def algolia_app(app: App) -> dict:
     if release:
         tags.extend(release.compatibility or [])
     else:
-        tags.extend(['aplite', 'basalt', 'chalk', 'diorite', 'emery'])
+        tags.extend(['aplite', 'basalt', 'chalk', 'diorite', 'emery', 'flint'])
         tags.append('companion-app')
     if len(app.companions) == 0:
         tags.extend(['android', 'ios'])
@@ -212,11 +214,12 @@ def asset_fallback(collections: Dict[str, AssetCollection], target_hw='basalt')
     # 13 Aug 25 - WM - Apparently we are getting a lot of requests with 'unknown' as the target_hw.
     # Anyone failing to identify will be presumed to be diorite.
     fallbacks = {
-        'aplite': ['aplite', 'diorite', 'basalt'],
+        'aplite': ['aplite', 'diorite', 'flint', 'basalt'],
         'basalt': ['basalt', 'aplite'],
         'chalk': ['chalk', 'basalt'],
-        'diorite': ['diorite', 'aplite', 'basalt'],
-        'emery': ['emery', 'basalt', 'diorite', 'aplite']
+        'diorite': ['diorite', 'flint', 'aplite', 'basalt'],
+        'emery': ['emery', 'basalt', 'diorite', 'aplite'],
+        'flint': ['flint', 'diorite', 'aplite', 'basalt']
     }
     fallback = fallbacks[target_hw] if target_hw in fallbacks else fallbacks['diorite']
     for hw in fallback: