Make sure that the supported platforms are reflected in the api responses

Author: hellcp

appstore/api.py

@@ -6,23 +6,14 @@
 
 from sqlalchemy.orm.exc import NoResultFound
 
-from appstore.utils import jsonify_app, asset_fallback, generate_image_url, get_access_token
+from appstore.utils import jsonify_app, asset_fallback, generate_image_url, get_access_token, HARDWARE_SUPPORT
 from .models import App, Collection, HomeBanners, Category, db, Release
 from .settings import config
 
 parent_app = None
 api = Blueprint('api', __name__)
 CORS(api)
 
-HARDWARE_SUPPORT = {
-    'aplite': ['aplite'],
-    'basalt': ['basalt', 'aplite'],
-    'chalk': ['chalk'],
-    'diorite': ['diorite', 'aplite'],
-    'emery': ['emery', 'diorite', 'basalt', 'aplite'],
-    'flint': ['flint', 'diorite', 'aplite']
-}
-
 
 def generate_app_response(results, sort_override=None):
     target_hw = request.args.get('hardware', 'basalt')

appstore/locker.py

@@ -8,7 +8,7 @@
 from .settings import config
 from .models import App, LockerEntry, db
 from .api import api
-from .utils import get_uid, generate_pbw_url, asset_fallback, generate_image_url, plat_dimensions, jsonify_companion, get_access_token
+from .utils import get_uid, generate_pbw_url, asset_fallback, generate_image_url, plat_dimensions, jsonify_companion, get_access_token, HARDWARE_SUPPORT
 
 
 def jsonify_locker_app(entry):
@@ -60,7 +60,7 @@ def jsonify_locker_app(entry):
             },
             **{
                 x: {
-                    'supported': x in (release.compatibility if release and release.compatibility else ['aplite', 'basalt', 'diorite', 'emery', 'flint']),
+                    'supported': bool(set(HARDWARE_SUPPORT[x]) & set(release.compatibility if release and release.compatibility else ['aplite', 'basalt', 'diorite', 'emery', 'flint'])),
                     'firmware': {'major': 3}
                 } for x in ['aplite', 'basalt', 'chalk', 'diorite', 'emery', 'flint']
             },

appstore/utils.py

@@ -16,6 +16,14 @@
 from .settings import config
 from appstore.models import App, AssetCollection, CompanionApp
 
+HARDWARE_SUPPORT = {
+    'aplite': ['aplite'],
+    'basalt': ['basalt', 'aplite'],
+    'chalk': ['chalk'],
+    'diorite': ['diorite', 'aplite'],
+    'emery': ['emery', 'diorite', 'basalt', 'aplite'],
+    'flint': ['flint', 'diorite', 'aplite']
+}
 
 parent_app = None
 
@@ -86,7 +94,7 @@ 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', 'flint']),
+                    'supported': bool(set(HARDWARE_SUPPORT[x]) & set(release.compatibility if release and release.compatibility else ['aplite', 'basalt', 'diorite', 'emery', 'flint'])),
                     'firmware': {'major': 3}
                 } for x in ['aplite', 'basalt', 'chalk', 'diorite', 'emery', 'flint']
             },
@@ -170,7 +178,7 @@ def algolia_app(app: App) -> dict:
 
     tags = [app.type]
     if release:
-        tags.extend(release.compatibility or [])
+        tags.extend(set(item for platform in (release.compatibility or []) for item in HARDWARE_SUPPORT[platform]))
     else:
         tags.extend(['aplite', 'basalt', 'chalk', 'diorite', 'emery', 'flint'])
         tags.append('companion-app')