Merge pull request #55 from aveao/cleanups

Clean up minor issues in entire codebase

Author: hellcp

appstore/__init__.py

@@ -8,7 +8,7 @@
 except ImportError:
     print("Couldn't import google exceptions")
 
-from flask import Flask, jsonify, request
+from flask import Flask, jsonify
 from werkzeug.middleware.proxy_fix import ProxyFix
 from rws_common import honeycomb
 
@@ -20,7 +20,6 @@
 from .developer_portal_api import init_app as init_developer_portal_api
 from .commands import init_app as init_commands
 from .utils import init_app as init_utils
-from .locker import locker
 
 app = Flask(__name__)
 app.config.update(**config)

appstore/api.py

@@ -211,7 +211,7 @@ def home(home_type):
                 'apps': url_for('api.apps_by_collection', slug=collection.slug, app_type=home_type)
             },
         } for collection in collections), {
-            'name': f'Most Loved',
+            'name': 'Most Loved',
             'slug': 'most-loved',
             'application_ids': [
                 x.id for x in App.query
@@ -235,7 +235,7 @@ def home(home_type):
                 'apps': url_for('api.apps_by_collection', slug='all', app_type=home_type),
             }
         }, *([{
-            'name': f'Generated Watchfaces',
+            'name': 'Generated Watchfaces',
             'slug': 'all-generated',
             'application_ids': [
                 x.id for x in App.query

appstore/commands.py

@@ -6,7 +6,6 @@
 import flask.json
 import shutil
 import subprocess
-import uuid
 import zipfile
 
 import click
@@ -16,7 +15,6 @@
 import requests
 from sqlalchemy.orm import load_only
 from sqlalchemy.orm.exc import NoResultFound
-from sqlalchemy.exc import IntegrityError
 
 from algoliasearch import algoliasearch
 
@@ -248,7 +246,7 @@ def import_app_from_locker(locker_app):
         if not os.path.exists(filename):
             with requests.get(release['file'], stream=True) as r:
                 if r.status_code != 200:
-                    print(f"FAILED to download pbw.")
+                    print("FAILED to download pbw.")
                     return False
                 with open(filename, 'wb') as f:
                     shutil.copyfileobj(r.raw, f)

appstore/dev_portal_api.py

@@ -6,7 +6,7 @@
 from sqlalchemy.orm.exc import NoResultFound
 from datetime import datetime
 
-from .utils import authed_request, demand_authed_request, get_uid
+from .utils import demand_authed_request, get_uid
 from .models import LockerEntry, UserLike, db, App, Developer, UserFlag
 from .discord import report_app_flag
 from .settings import config
@@ -98,11 +98,11 @@ def update_my_developer():
         return jsonify(error="Invalid POST body. Expected JSON and 'Content-Type: application/json'", e="request.invalid"), 400
 
     for f in req:
-        if not f in permitted_fields:
+        if f not in permitted_fields:
             return jsonify(error=f"Illegal field: {f}", e="illegal.field"), 400
 
-    if not "name" in req:
-        return jsonify(error=f"Missing required field: name", e="missing.field.name"), 400
+    if "name" not in req:
+        return jsonify(error="Missing required field: name", e="missing.field.name"), 400
 
     # Resolve our auth token to our developer ID
     result = demand_authed_request('GET', f"{config['REBBLE_AUTH_URL']}/api/v1/me/pebble/appstore")

appstore/developer_portal_api.py

@@ -1,5 +1,4 @@
 import json
-import traceback
 import datetime
 import secrets
 
@@ -13,8 +12,8 @@
 from sqlalchemy.exc import DataError
 from zipfile import BadZipFile
 
-from .utils import authed_request, demand_authed_request, get_uid, id_generator, validate_new_app_fields, is_valid_category, is_valid_appinfo, is_valid_platform, clone_asset_collection_without_images, is_valid_image_file, is_valid_image_size, get_max_image_dimensions, generate_image_url, is_users_developer_id, user_is_wizard, newAppValidationException, algolia_app, first_version_is_newer
-from .models import Category, db, App, Developer, Release, CompanionApp, Binary, AssetCollection, LockerEntry, UserLike
+from .utils import demand_authed_request, id_generator, validate_new_app_fields, is_valid_category, is_valid_appinfo, is_valid_platform, clone_asset_collection_without_images, is_valid_image_file, is_valid_image_size, get_max_image_dimensions, is_users_developer_id, user_is_wizard, newAppValidationException, algolia_app, first_version_is_newer
+from .models import db, App, Developer, Release, AssetCollection
 from .pbw import PBW, release_from_pbw
 from .s3 import upload_pbw, upload_asset
 from .settings import config
@@ -44,13 +43,13 @@
     if config['ALGOLIA_DISABLE']:
         algolia_index = None
     else:
-        raise KeyError(f"ALGOLIA_ADMIN_API_KEY not set. Either set key or disable algolia integration with ALGOLIA_DISABLE=True")
+        raise KeyError("ALGOLIA_ADMIN_API_KEY not set. Either set key or disable algolia integration with ALGOLIA_DISABLE=True")
 
 @devportal_api.route('/onboard', methods=['POST'])
 def create_developer():
         try:
            req = request.json
-        except BadRequest as e:
+        except BadRequest:
             return jsonify(error="Invalid POST body. Expected JSON", e="body.invalid"), 400
 
         if req is None:
@@ -98,19 +97,19 @@ def submit_new_app():
             with pbw.zip.open('appinfo.json') as f:
                 appinfo = json.load(f)
         except BadZipFile as e:
-            return jsonify(error=f"Your pbw file is corrupt or invalid", e="invalid.pbw"), 400
+            return jsonify(error="Your pbw file is corrupt or invalid", e="invalid.pbw"), 400
         except KeyError as e:
-            return jsonify(error=f"Your pbw file is invalid or corrupt", e="invalid.pbw"), 400
+            return jsonify(error="Your pbw file is invalid or corrupt", e="invalid.pbw"), 400
 
 
         appinfo_valid, appinfo_validation_error = is_valid_appinfo(appinfo)
         if not appinfo_valid:
             return jsonify(error=f"The appinfo.json in your pbw file has the following error: {appinfo_validation_error}", e="invalid.appinfocontent"), 400
 
         if params["type"] == "watchface" and not appinfo["watchapp"]["watchface"]:
-            return jsonify(error=f"You selected the app type 'Watchface'. This does not match the configuration in your appinfo.json", e="invalid.appinfocontent"), 400
+            return jsonify(error="You selected the app type 'Watchface'. This does not match the configuration in your appinfo.json", e="invalid.appinfocontent"), 400
         elif params["type"] == "watchapp" and appinfo["watchapp"]["watchface"]:
-            return jsonify(error=f"You selected the app type 'Watch App'. This does not match the configuration in your appinfo.json", e="invalid.appinfocontent"), 400
+            return jsonify(error="You selected the app type 'Watch App'. This does not match the configuration in your appinfo.json", e="invalid.appinfocontent"), 400
 
         # Check app doesn't already exist
         try:
@@ -229,7 +228,7 @@ def update_app_fields(app_id):
 
         # Check all valid passed fields are correct type
         for x in req:
-            if (x in allowed_fields_type_map) and (not type(req[x]) == allowed_fields_type_map[x]):
+            if (x in allowed_fields_type_map) and (type(req[x]) is not allowed_fields_type_map[x]):
                 return jsonify(error=f"Invalid value for field '{x}'", e=f"invalid.field.{x}"), 400
 
 
@@ -259,7 +258,7 @@ def update_app_fields(app_id):
         if "timeline_enabled" in req:
             if not req["timeline_enabled"]:
                 req["timeline_token"] = None
-            elif app.timeline_token == None:
+            elif app.timeline_token is None:
                 req["timeline_token"] = secrets.token_urlsafe(32)
 
         # Update the app
@@ -303,10 +302,10 @@ def submit_new_release(app_id):
         pbw = PBW(pbw_file, 'aplite')
         with pbw.zip.open('appinfo.json') as f:
             appinfo = json.load(f)
-    except BadZipFile as e:
-        return jsonify(error=f"Your pbw file is invalid or corrupted", e="invalid.pbw"), 400
-    except KeyError as e:
-        return jsonify(error=f"Your pbw file is invalid or corrupted", e="invalid.pbw"), 400
+    except BadZipFile:
+        return jsonify(error="Your pbw file is invalid or corrupted", e="invalid.pbw"), 400
+    except KeyError:
+        return jsonify(error="Your pbw file is invalid or corrupted", e="invalid.pbw"), 400
 
     appinfo_valid, appinfo_valid_reason = is_valid_appinfo(appinfo)
     if not appinfo_valid:
@@ -376,7 +375,7 @@ def get_app_screenshots(app_id, platform):
 
     try:
         app = App.query.filter(App.id == app_id).one()
-    except NoResultFound as e:
+    except NoResultFound:
         return jsonify(error="Unknown app", e="app.notfound"), 400    
 
     asset_collection = AssetCollection.query.filter(AssetCollection.app_id == app.id, AssetCollection.platform == platform).one_or_none()
@@ -390,7 +389,7 @@ def get_app_screenshots(app_id, platform):
 def new_app_screenshots(app_id, platform):
     try:
         app = App.query.filter(App.id == app_id).one()
-    except NoResultFound as e:
+    except NoResultFound:
         return jsonify(error="Unknown app", e="app.notfound"), 400
 
     # Check we own the app
@@ -437,7 +436,7 @@ def new_app_screenshots(app_id, platform):
 def delete_screenshot(app_id, platform, screenshot_id):
     try:
         app = App.query.filter(App.id == app_id).one()
-    except NoResultFound as e:
+    except NoResultFound:
         return jsonify(error="Unknown app", e="app.notfound"), 400
 
     # Check we own the app
@@ -476,7 +475,7 @@ def get_app_banners(app_id, platform):
 
     try:
         app = App.query.filter(App.id == app_id).one()
-    except NoResultFound as e:
+    except NoResultFound:
         return jsonify(error="Unknown app", e="app.notfound"), 404    
 
     asset_collection = AssetCollection.query.filter(AssetCollection.app_id == app.id, AssetCollection.platform == platform).one_or_none()
@@ -490,7 +489,7 @@ def get_app_banners(app_id, platform):
 def new_app_banner(app_id, platform):
     try:
         app = App.query.filter(App.id == app_id).one()
-    except NoResultFound as e:
+    except NoResultFound:
         return jsonify(error="Unknown app", e="app.notfound"), 404
 
     # Check we own the app
@@ -538,7 +537,7 @@ def new_app_banner(app_id, platform):
 def delete_banner(app_id, platform, banner_id):
     try:
         app = App.query.filter(App.id == app_id).one()
-    except NoResultFound as e:
+    except NoResultFound:
         return jsonify(error="Unknown app", e="app.notfound"), 404
 
     # Check we own the app
@@ -572,7 +571,7 @@ def delete_banner(app_id, platform, banner_id):
 def get_app_icons(app_id):
     try:
         app = App.query.filter(App.id == app_id).one()
-    except NoResultFound as e:
+    except NoResultFound:
         return jsonify(error="Unknown app", e="app.notfound"), 404    
 
 
@@ -585,7 +584,7 @@ def get_app_icon(app_id, size):
 
     try:
         app = App.query.filter(App.id == app_id).one()
-    except NoResultFound as e:
+    except NoResultFound:
         return jsonify(error="Unknown app", e="app.notfound"), 404    
 
     out = app.icon_small if size == "small" else app.icon_large
@@ -598,7 +597,7 @@ def new_app_icon(app_id, size):
 
     try:
         app = App.query.filter(App.id == app_id).one()
-    except NoResultFound as e:
+    except NoResultFound:
         return jsonify(error="Unknown app", e="app.notfound"), 404
 
     # Check we own the app
@@ -640,7 +639,7 @@ def wizard_rename_developer(developer_id):
 
     try:
         req = request.json
-    except BadRequest as e:
+    except BadRequest:
         return jsonify(error="Invalid POST body. Expected JSON", e="body.invalid"), 400
 
     if req is None:
@@ -651,7 +650,7 @@ def wizard_rename_developer(developer_id):
             return jsonify(error=f"Illegal field: {f}", e="illegal.field"), 400
 
     if "name" not in req:
-        return jsonify(error=f"Missing required field: name", e="missing.field.name"), 400
+        return jsonify(error="Missing required field: name", e="missing.field.name"), 400
 
 
     developer = Developer.query.filter_by(id=developer_id).one_or_none()
@@ -675,7 +674,7 @@ def wizard_update_app(app_id):
 
     try:
         req = request.json
-    except BadRequest as e:
+    except BadRequest:
         return jsonify(error="Invalid POST body. Expected JSON", e="body.invalid"), 400
 
     if req is None:
@@ -702,7 +701,7 @@ def wizard_update_app(app_id):
         try:
             db.session.commit()
             return jsonify(success=True, id=app.id, developer_id=app.developer_id)
-        except IntegrityError as e:
+        except IntegrityError:
             return jsonify(error="Failed to update developer ID. Does new ID exist?", e="body.invalid"), 400
     else:
         return jsonify(error="Invalid POST body. Provide one or more fields to update", e="body.invalid"), 400

appstore/discord.py

@@ -4,7 +4,6 @@
 
 from .settings import config
 from .utils import get_app_description, generate_image_url, who_am_i
-from appstore.models import App
 
 party_time_emoji = ["🎉","🥳","👏","❤️","🥰","🎊"]
 
@@ -113,9 +112,9 @@ def audit_log(operation, affected_app_uuid = None):
 
     request_data = {
         "embeds": [{
-            "title": f"Wizard Audit Log 🪄",
+            "title": "Wizard Audit Log 🪄",
             "color": int("0xffaa00", 0),
-            "description": f"Someone has executed a wizard operation on the developer portal",
+            "description": "Someone has executed a wizard operation on the developer portal",
             "thumbnail": {
                 "url": "https://dev-portal.rebble.io/res/img/large_icon_launchpad.svg",
                 "height": 80,
@@ -149,9 +148,9 @@ def report_app_flag(reported_by, app_name, developer_name, app_id, affected_app_
 
     request_data = {
         "embeds": [{
-            "title": f"New Flagged App Report 🚩",
+            "title": "New Flagged App Report 🚩",
             "color": int("0xFF4745", 0),
-            "description": f"An end user has reported an app on the appstore from within a mobile app.",
+            "description": "An end user has reported an app on the appstore from within a mobile app.",
             "thumbnail": {
                 "url": "https://i.imgur.com/5f6rGQ9.png",
                 "height": 80,

appstore/locker.py

@@ -6,7 +6,7 @@
 from sqlalchemy.orm.exc import NoResultFound
 
 from .settings import config
-from .models import App, LockerEntry, Release, db
+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
 

appstore/pbw.py

@@ -9,7 +9,7 @@
 import zipfile
 import datetime
 import hashlib
-from .models import Binary, App, Release, db
+from .models import Binary, Release, db
 from .utils import id_generator
 
 PLATFORMS = ['aplite', 'basalt', 'chalk', 'diorite', 'emery', 'flint']
@@ -49,9 +49,9 @@ def __init__(self, pbw, platform):
         self.platform = platform
         # pbw can be file path or bytes bundle. Determine which
         if isinstance(pbw, str):
-            bundle = os.path.abspath(bundle_path)
-            if not os.path.exists(bundle):
-                raise Exception("Bundle does not exist: " + bundle_path)
+            bundle_abs_path = os.path.abspath(pbw)
+            if not os.path.exists(bundle_abs_path):
+                raise Exception("Bundle does not exist: " + pbw)
 
             self.path = bundle_abs_path
         else:
@@ -185,7 +185,7 @@ def get_capabilities(self):
     def create_binary(self, release):
         if not self.has_platform:
             return
-        metadata = self.get_app_metadata();
+        metadata = self.get_app_metadata()
         binary = Binary(release=release, platform=self.platform,
                         sdk_major=metadata['sdk_version_major'], sdk_minor=metadata['sdk_version_minor'],
                         process_info_flags=metadata['flags'], icon_resource_id=metadata['icon_resource_id'])

appstore/s3.py

@@ -1,7 +1,5 @@
 import json
 import boto3
-from botocore.exceptions import ClientError
-from .models import Binary
 from .settings import config
 from .utils import id_generator
 
@@ -17,7 +15,7 @@
             aws_secret_access_key=config['AWS_SECRET_KEY'],
         )
         s3_endpoint = config['S3_ENDPOINT']
-except:
+except Exception:
     pass
 
 
@@ -41,7 +39,7 @@
             aws_session_token=creds['Credentials'].get('SessionToken'),
         )
         s3_endpoint = creds.get('S3Endpoint')
-except:
+except Exception:
     pass
 
 if not session:
@@ -74,7 +72,7 @@ def upload_asset(file, mime_type = None):
             elif file.endswith(".png"):
                 mime_type = "image/png"
             else:
-                raise Exception(f"Unknown or unsupported mime_type for file provided to update_asset")
+                raise Exception("Unknown or unsupported mime_type for file provided to update_asset")
 
         s3 = session.client('s3', endpoint_url=s3_endpoint)
         s3.upload_file(file, config['S3_ASSET_BUCKET'], filename, ExtraArgs = {'ContentType': mime_type})