Optimise imports and fix linter issues

app/tasks/__init__.py

@@ -25,6 +25,7 @@ from app import app
 class TaskError(Exception):
 	def __init__(self, value):
 		self.value = value
+
 	def __str__(self):
 		return repr("TaskError: " + self.value)
 

app/tasks/forumtasks.py

@@ -14,14 +14,16 @@
 # 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 json
+import re
+import sys
+import urllib.request
+from urllib.parse import urljoin
 
-import json, re, sys
-from app.models import *
+from app.models import User, db, PackageType, ForumTopic
 from app.tasks import celery
 from app.utils import is_username_valid
 from app.utils.phpbbparser import getProfile, getTopicsFromForum
-import urllib.request
-from urllib.parse import urljoin
 from .usertasks import set_profile_picture_from_url
 
 
@@ -84,6 +86,8 @@ def checkAllForumAccounts():
 
 regex_tag    = re.compile(r"\[([a-z0-9_]+)\]")
 BANNED_NAMES = ["mod", "game", "old", "outdated", "wip", "api", "beta", "alpha", "git"]
+
+
 def getNameFromTaglist(taglist):
 	for tag in reversed(regex_tag.findall(taglist)):
 		if len(tag) < 30 and not tag in BANNED_NAMES and \
@@ -92,7 +96,10 @@ def getNameFromTaglist(taglist):
 
 	return None
 
+
 regex_title = re.compile(r"^((?:\[[^\]]+\] *)*)([^\[]+) *((?:\[[^\]]+\] *)*)[^\[]*$")
+
+
 def parseTitle(title):
 	m = regex_title.match(title)
 	if m is None:

app/tasks/importtasks.py

@@ -13,27 +13,31 @@
 #
 # 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 json import JSONDecodeError
 
-import gitdb
+import datetime
 import json
 import os
 import shutil
+from json import JSONDecodeError
 from zipfile import ZipFile
 
+import gitdb
+from flask import url_for
 from git import GitCommandError
 from git_archive_all import GitArchiver
 from kombu import uuid
 
-from app.models import *
+from app.models import AuditSeverity, db, NotificationType, PackageRelease, MetaPackage, Dependency, PackageType, \
+	MinetestRelease, Package, PackageState, PackageScreenshot, PackageUpdateTrigger, PackageUpdateConfig
 from app.tasks import celery, TaskError
 from app.utils import randomString, post_bot_message, addSystemNotification, addSystemAuditLog, get_games_from_csv
 from app.utils.git import clone_repo, get_latest_tag, get_latest_commit, get_temp_dir
 from .minetestcheck import build_tree, MinetestCheckError, ContentType
-from ..logic.LogicError import LogicError
-from ..logic.game_support import GameSupportResolver
-from ..logic.packages import do_edit_package, ALIASES
-from ..utils.image import get_image_size
+from app import app
+from app.logic.LogicError import LogicError
+from app.logic.game_support import GameSupportResolver
+from app.logic.packages import do_edit_package, ALIASES
+from app.utils.image import get_image_size
 
 
 @celery.task()
@@ -51,7 +55,7 @@ def getMeta(urlstr, author):
 
 		result["forums"] = result.get("forumId")
 
-		readme_path = tree.getReadMePath()
+		readme_path = tree.get_readme_path()
 		if readme_path:
 			with open(readme_path, "r") as f:
 				result["long_description"] = f.read()
@@ -96,11 +100,11 @@ def postReleaseCheckUpdate(self, release: PackageRelease, path):
 		def getMetaPackages(names):
 			return [ MetaPackage.GetOrCreate(x, cache) for x in names ]
 
-		provides = tree.getModNames()
+		provides = tree.get_mod_names()
 
 		package = release.package
 		package.provides.clear()
-		package.provides.extend(getMetaPackages(tree.getModNames()))
+		package.provides.extend(getMetaPackages(tree.get_mod_names()))
 
 		# Delete all mod name dependencies
 		package.dependencies.filter(Dependency.meta_package != None).delete()

app/tasks/minetestcheck/__init__.py

@@ -1,11 +1,30 @@
+# ContentDB
+# Copyright (C) 2018-23 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 enum import Enum
 
+
 class MinetestCheckError(Exception):
 	def __init__(self, value):
 		self.value = value
+
 	def __str__(self):
 		return repr("Error validating package: " + self.value)
 
+
 class ContentType(Enum):
 	UNKNOWN = "unknown"
 	MOD = "mod"
@@ -13,7 +32,7 @@ class ContentType(Enum):
 	GAME = "game"
 	TXP = "texture pack"
 
-	def isModLike(self):
+	def is_mod_like(self):
 		return self == ContentType.MOD or self == ContentType.MODPACK
 
 	def validate_same(self, other):
@@ -23,7 +42,7 @@ class ContentType(Enum):
 		assert other
 
 		if self == ContentType.MOD:
-			if not other.isModLike():
+			if not other.is_mod_like():
 				raise MinetestCheckError("Expected a mod or modpack, found " + other.value)
 
 		elif self == ContentType.TXP:
@@ -36,6 +55,7 @@ class ContentType(Enum):
 
 from .tree import PackageTreeNode, get_base_dir
 
+
 def build_tree(path, expected_type=None, author=None, repo=None, name=None):
 	path = get_base_dir(path)
 

app/tasks/minetestcheck/config.py

@@ -1,3 +1,20 @@
+# ContentDB
+# Copyright (C) Lars Mueller
+#
+# 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/>.
+
+
 def parse_conf(string):
 	retval = {}
 	lines = string.splitlines()

app/tasks/minetestcheck/tree.py

@@ -1,9 +1,29 @@
-import os, re
+# ContentDB
+# Copyright (C) 2018-21 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 os
+import re
+
 from . import MinetestCheckError, ContentType
 from .config import parse_conf
 
 basenamePattern = re.compile("^([a-z0-9_]+)$")
 
+
 def get_base_dir(path):
 	if not os.path.isdir(path):
 		raise IOError("Expected dir")
@@ -39,8 +59,8 @@ def get_csv_line(line):
 
 
 class PackageTreeNode:
-	def __init__(self, baseDir, relative, author=None, repo=None, name=None):
-		self.baseDir  = baseDir
+	def __init__(self, base_dir, relative, author=None, repo=None, name=None):
+		self.baseDir  = base_dir
 		self.relative = relative
 		self.author   = author
 		self.name	 = name
@@ -49,11 +69,11 @@ class PackageTreeNode:
 		self.children = []
 
 		# Detect type
-		self.type = detect_type(baseDir)
+		self.type = detect_type(base_dir)
 		self.read_meta()
 
 		if self.type == ContentType.GAME:
-			if not os.path.isdir(baseDir + "/mods"):
+			if not os.path.isdir(base_dir + "/mods"):
 				raise MinetestCheckError("Game at {} does not have a mods/ folder".format(self.relative))
 			self.add_children_from_mod_dir("mods")
 		elif self.type == ContentType.MOD:
@@ -69,13 +89,13 @@ class PackageTreeNode:
 			if lowercase != dir and lowercase in dirs:
 				raise MinetestCheckError(f"Incorrect case, {dir} should be {lowercase} at {self.relative}{dir}")
 
-	def getReadMePath(self):
+	def get_readme_path(self):
 		for filename in os.listdir(self.baseDir):
 			path = os.path.join(self.baseDir, filename)
 			if os.path.isfile(path) and filename.lower().startswith("readme."):
 				return path
 
-	def getMetaFileName(self):
+	def get_meta_file_name(self):
 		if self.type == ContentType.GAME:
 			return "game.conf"
 		elif self.type == ContentType.MOD:
@@ -91,13 +111,13 @@ class PackageTreeNode:
 		result = {}
 
 		# Read .conf file
-		meta_file_name = self.getMetaFileName()
+		meta_file_name = self.get_meta_file_name()
 		if meta_file_name is not None:
 			meta_file_rel = self.relative + meta_file_name
 			meta_file_path = self.baseDir + "/" + meta_file_name
 			try:
-				with open(meta_file_path or "", "r") as myfile:
-					conf = parse_conf(myfile.read())
+				with open(meta_file_path or "", "r") as f:
+					conf = parse_conf(f.read())
 					for key, value in conf.items():
 						result[key] = value
 			except SyntaxError as e:
@@ -108,12 +128,11 @@ class PackageTreeNode:
 			if "release" in result:
 				raise MinetestCheckError("{} should not contain 'release' key, as this is for use by ContentDB only.".format(meta_file_rel))
 
-
 		# description.txt
-		if not "description" in result:
+		if "description" not in result:
 			try:
-				with open(self.baseDir + "/description.txt", "r") as myfile:
-					result["description"] = myfile.read()
+				with open(self.baseDir + "/description.txt", "r") as f:
+					result["description"] = f.read()
 			except IOError:
 				pass
 
@@ -123,10 +142,10 @@ class PackageTreeNode:
 			result["optional_depends"] = get_csv_line(result.get("optional_depends"))
 
 		elif os.path.isfile(self.baseDir + "/depends.txt"):
-			pattern = re.compile("^([a-z0-9_]+)\??$")
+			pattern = re.compile(r"^([a-z0-9_]+)\??$")
 
-			with open(self.baseDir + "/depends.txt", "r") as myfile:
-				contents = myfile.read()
+			with open(self.baseDir + "/depends.txt", "r") as f:
+				contents = f.read()
 				soft = []
 				hard = []
 				for line in contents.split("\n"):
@@ -144,8 +163,7 @@ class PackageTreeNode:
 			result["depends"] = []
 			result["optional_depends"] = []
 
-
-		def checkDependencies(deps):
+		def check_dependencies(deps):
 			for dep in deps:
 				if not basenamePattern.match(dep):
 					if " " in dep:
@@ -157,8 +175,8 @@ class PackageTreeNode:
 									.format(dep, self.relative))
 
 		# Check dependencies
-		checkDependencies(result["depends"])
-		checkDependencies(result["optional_depends"])
+		check_dependencies(result["depends"])
+		check_dependencies(result["optional_depends"])
 
 		# Fix games using "name" as "title"
 		if self.type == ContentType.GAME and "name" in result:
@@ -193,7 +211,7 @@ class PackageTreeNode:
 			path = os.path.join(dir, entry)
 			if not entry.startswith('.') and os.path.isdir(path):
 				child = PackageTreeNode(path, relative + entry + "/", name=entry)
-				if not child.type.isModLike():
+				if not child.type.is_mod_like():
 					raise MinetestCheckError("Expecting mod or modpack, found {} at {} inside {}" \
 						.format(child.type.value, child.relative, self.type.value))
 
@@ -202,7 +220,7 @@ class PackageTreeNode:
 
 				self.children.append(child)
 
-	def getModNames(self):
+	def get_mod_names(self):
 		return self.fold("name", type_=ContentType.MOD)
 
 	# attr: Attribute name

app/tasks/webhooktasks.py

@@ -13,7 +13,7 @@
 #
 # 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 sys
+
 from typing import Optional
 
 import requests
@@ -22,6 +22,7 @@ from app import app
 from app.models import User
 from app.tasks import celery
 
+
 @celery.task()
 def post_discord_webhook(username: Optional[str], content: str, is_queue: bool, title: Optional[str] = None, description: Optional[str] = None, thumbnail: Optional[str] = None):
 	discord_url = app.config.get("DISCORD_WEBHOOK_QUEUE" if is_queue else "DISCORD_WEBHOOK_FEED")

app/tasks/zipgrep.py

@@ -14,7 +14,6 @@
 # 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 subprocess
 from subprocess import Popen, PIPE
 from typing import Optional