diff options
author | rubenwardy <rw@rubenwardy.com> | 2018-12-21 14:02:57 +0000 |
---|---|---|
committer | rubenwardy <rw@rubenwardy.com> | 2018-12-21 14:02:57 +0000 |
commit | dd368d87aa926ef2676b22ccee95934a38be7fac (patch) | |
tree | d449b9e68053084710156c668230d24605cda795 /app/tasks | |
parent | e5b279d0139e4371eb22dbf1341bcf7089afc7ca (diff) | |
download | cheatdb-dd368d87aa926ef2676b22ccee95934a38be7fac.tar.xz |
Fix various issues
Diffstat (limited to 'app/tasks')
-rw-r--r-- | app/tasks/forumtasks.py | 8 | ||||
-rw-r--r-- | app/tasks/importtasks.py | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/app/tasks/forumtasks.py b/app/tasks/forumtasks.py index dc8be7f..8327a17 100644 --- a/app/tasks/forumtasks.py +++ b/app/tasks/forumtasks.py @@ -74,7 +74,7 @@ def parseTitle(title): def getLinksFromModSearch(): links = {} - contents = urllib.request.urlopen("http://krock-works.16mb.com/MTstuff/modList.php").read().decode("utf-8") + contents = urllib.request.urlopen("https://krock-works.uk.to/minetest/modList.php").read().decode("utf-8") for x in json.loads(contents): link = x.get("link") if link is not None: @@ -127,15 +127,15 @@ def importTopicList(): link = links_by_id.get(id) # Fill row - topic.topic_id = id + topic.topic_id = int(id) topic.author = user topic.type = info["type"] topic.title = title topic.name = name topic.link = link topic.wip = info["wip"] - topic.posts = info["posts"] - topic.views = info["views"] + topic.posts = int(info["posts"]) + topic.views = int(info["views"]) topic.created_at = info["date"] for p in Package.query.all(): diff --git a/app/tasks/importtasks.py b/app/tasks/importtasks.py index 9afc8b6..c3f8657 100644 --- a/app/tasks/importtasks.py +++ b/app/tasks/importtasks.py @@ -66,7 +66,7 @@ def getKrockList(): global krock_list_cache_by_name if krock_list_cache is None: - contents = urllib.request.urlopen("http://krock-works.16mb.com/MTstuff/modList.php").read().decode("utf-8") + contents = urllib.request.urlopen("https://krock-works.uk.to/minetest/modList.php").read().decode("utf-8") list = json.loads(contents) def h(x): @@ -149,7 +149,8 @@ class PackageTreeNode: type = PackageType.GAME elif os.path.isfile(baseDir + "/init.lua"): type = PackageType.MOD - elif os.path.isfile(baseDir + "/modpack.txt"): + elif os.path.isfile(baseDir + "/modpack.txt") or \ + os.path.isfile(baseDir + "/modpack.conf"): type = PackageType.MOD is_modpack = True elif os.path.isdir(baseDir + "/mods"): |