Optimise imports and fix linter issues

app/logic/graphs.py

@@ -1,3 +1,19 @@
+# ContentDB
+# Copyright (C) rubenwardy
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 import datetime
 from datetime import timedelta
 from typing import Optional
@@ -15,7 +31,7 @@ keys = ["platform_minetest", "platform_other", "reason_new",
 		"reason_dependency", "reason_update"]
 
 
-def _flatten_data(stats):
+def flatten_data(stats):
 	start_date = stats[0].date
 	end_date = stats[-1].date
 	result = {
@@ -52,7 +68,7 @@ def get_package_stats(package: Package, start_date: Optional[datetime.date], end
 	if len(stats) == 0:
 		return None
 
-	return _flatten_data(stats)
+	return flatten_data(stats)
 
 
 def get_package_stats_for_user(user: User, start_date: Optional[datetime.date], end_date: Optional[datetime.date]):
@@ -76,7 +92,7 @@ def get_package_stats_for_user(user: User, start_date: Optional[datetime.date],
 	if len(stats) == 0:
 		return None
 
-	results = _flatten_data(stats)
+	results = flatten_data(stats)
 	results["package_downloads"] = get_package_overview_for_user(user, stats[0].date, stats[-1].date)
 
 	return results

app/logic/package_validator.py

@@ -1,3 +1,19 @@
+# ContentDB
+# Copyright (C) rubenwardy
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 from collections import namedtuple
 from typing import List
 
@@ -15,11 +31,11 @@ def validate_package_for_approval(package: Package) -> List[ValidationError]:
 	normalised_name = package.getNormalisedName()
 	if package.type != PackageType.MOD and Package.query.filter(
 			and_(Package.state == PackageState.APPROVED,
-				 or_(Package.name == normalised_name,
-					 Package.name == normalised_name + "_game"))).count() > 0:
+				or_(Package.name == normalised_name,
+					Package.name == normalised_name + "_game"))).count() > 0:
 		retval.append(("danger", lazy_gettext("A package already exists with this name. Please see Policy and Guidance 3")))
 
-	if package.releases.filter(PackageRelease.task_id==None).count() == 0:
+	if package.releases.filter(PackageRelease.task_id == None).count() == 0:
 		retval.append(("danger", lazy_gettext("A release is required before this package can be approved.")))
 		# Don't bother validating any more until we have a release
 		return retval

app/logic/releases.py

@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-
-import datetime, re
+import datetime
+import re
 
 from celery import uuid
 from flask_babel import lazy_gettext

app/logic/screenshots.py

@@ -1,3 +1,19 @@
+# ContentDB
+# Copyright (C) rubenwardy
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
 import datetime, json
 
 from flask_babel import lazy_gettext

app/logic/uploads.py

@@ -14,44 +14,47 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-
 import imghdr
 import os
 
 from flask_babel import lazy_gettext
 
+from app import app
 from app.logic.LogicError import LogicError
-from app.models import *
 from app.utils import randomString
 
 
 def get_extension(filename):
 	return filename.rsplit(".", 1)[1].lower() if "." in filename else None
 
+
 ALLOWED_IMAGES = {"jpeg", "png"}
-def isAllowedImage(data):
+
+
+def is_allowed_image(data):
 	return imghdr.what(None, data) in ALLOWED_IMAGES
 
-def upload_file(file, fileType, fileTypeDesc):
+
+def upload_file(file, file_type, file_type_desc):
 	if not file or file is None or file.filename == "":
 		raise LogicError(400, "Expected file")
 
 	assert os.path.isdir(app.config["UPLOAD_DIR"]), "UPLOAD_DIR must exist"
 
-	isImage = False
-	if fileType == "image":
-		allowedExtensions = ["jpg", "jpeg", "png"]
-		isImage = True
-	elif fileType == "zip":
-		allowedExtensions = ["zip"]
+	is_image = False
+	if file_type == "image":
+		allowed_extensions = ["jpg", "jpeg", "png"]
+		is_image = True
+	elif file_type == "zip":
+		allowed_extensions = ["zip"]
 	else:
 		raise Exception("Invalid fileType")
 
 	ext = get_extension(file.filename)
-	if ext is None or not ext in allowedExtensions:
-		raise LogicError(400, lazy_gettext("Please upload %(file_desc)s", file_desc=fileTypeDesc))
+	if ext is None or ext not in allowed_extensions:
+		raise LogicError(400, lazy_gettext("Please upload %(file_desc)s", file_desc=file_type_desc))
 
-	if isImage and not isAllowedImage(file.stream.read()):
+	if is_image and not is_allowed_image(file.stream.read()):
 		raise LogicError(400, lazy_gettext("Uploaded image isn't actually an image"))
 
 	file.stream.seek(0)