diff options
Diffstat (limited to 'app/tasks')
| -rw-r--r-- | app/tasks/forumtasks.py | 127 | ||||
| -rw-r--r-- | app/tasks/phpbbparser.py | 70 |
2 files changed, 142 insertions, 55 deletions
diff --git a/app/tasks/forumtasks.py b/app/tasks/forumtasks.py index b2e0ca8..5513fb2 100644 --- a/app/tasks/forumtasks.py +++ b/app/tasks/forumtasks.py @@ -15,12 +15,12 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. -import flask, json +import flask, json, re from flask.ext.sqlalchemy import SQLAlchemy from app import app from app.models import * from app.tasks import celery -from .phpbbparser import getProfile +from .phpbbparser import getProfile, getTopicsFromForum import urllib.request from urllib.parse import urlparse, quote_plus @@ -51,71 +51,88 @@ def checkForumAccount(username, token=None): if needsSaving: db.session.commit() -@celery.task() -def importUsersFromModList(): - contents = urllib.request.urlopen("http://krock-works.16mb.com/MTstuff/modList.php").read().decode("utf-8") - list = json.loads(contents) - found = {} - imported = [] - - for user in User.query.all(): - found[user.username] = True - if user.forums_username is not None: - found[user.forums_username] = True - - for x in list: - author = x.get("author") - if author is not None and not author in found: - user = User(author) - user.forums_username = author - imported.append(author) - found[author] = True - db.session.add(user) - db.session.commit() - for author in found: - checkForumAccount.delay(author, None) +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 \ + not re.match(r"^[a-z]?[0-9]+$", tag): + return tag + return None -BANNED_NAMES = ["mod", "game", "old", "outdated", "wip", "api"] -ALLOWED_TYPES = [1, 2, 6] +regex_title = re.compile(r"^((?:\[[^\]]+\] *)*)([^\[]+) *((?:\[[^\]]+\] *)*)[^\[]*$") +def parseTitle(title): + m = regex_title.match(title) + if m is None: + print("Invalid title format: " + title) + return title, getNameFromTaglist(title) + else: + return m.group(2).strip(), getNameFromTaglist(m.group(3)) + +def getLinksFromModSearch(): + links = {} -@celery.task() -def importKrocksModList(): contents = urllib.request.urlopen("http://krock-works.16mb.com/MTstuff/modList.php").read().decode("utf-8") - list = json.loads(contents) - username_to_user = {} + for x in json.loads(contents): + link = x.get("link") + if link is not None: + links[int(x["topicId"])] = link - KrockForumTopic.query.delete() + return links + +@celery.task() +def importTopicList(): + links_by_id = getLinksFromModSearch() + + info_by_id = {} + getTopicsFromForum(11, out=info_by_id, extra={ 'type': PackageType.MOD }) + getTopicsFromForum(15, out=info_by_id, extra={ 'type': PackageType.GAME }) + + # Caches + username_to_user = {} + topics_by_id = {} + for topic in ForumTopic.query.all(): + topics_by_id[topic.topic_id] = topic - for x in list: - type = int(x["type"]) - if not type in ALLOWED_TYPES: - continue + # Create or update + for info in info_by_id.values(): + id = int(info["id"]) - username = x["author"] + # Get author + username = info["author"] user = username_to_user.get(username) if user is None: user = User.query.filter_by(forums_username=username).first() - assert(user is not None) + if user is None: + print(username + " not found!") + user = User(username) + user.forums_username = username + db.session.add(user) username_to_user[username] = user - import re - tags = re.findall("\[([a-z0-9_]+)\]", x["title"]) - name = None - for tag in reversed(tags): - if len(tag) < 30 and not tag in BANNED_NAMES and \ - not re.match("^([a-z][0-9]+)$", tag): - name = tag - break - - topic = KrockForumTopic() - topic.topic_id = x["topicId"] - topic.author_id = user.id - topic.ttype = type - topic.title = x["title"] - topic.name = name - topic.link = x.get("link") - db.session.add(topic) + # Get / add row + topic = topics_by_id.get(id) + if topic is None: + topic = ForumTopic() + db.session.add(topic) + + # Parse title + title, name = parseTitle(info["title"]) + + # Get link + link = links_by_id.get(id) + + # Fill row + topic.topic_id = id + topic.author = user + topic.type = info["type"] + topic.title = title + topic.name = name + topic.link = link + topic.posts = info["posts"] + topic.views = info["views"] + topic.created_at = info["date"] db.session.commit() diff --git a/app/tasks/phpbbparser.py b/app/tasks/phpbbparser.py index d27ccec..9984ad0 100644 --- a/app/tasks/phpbbparser.py +++ b/app/tasks/phpbbparser.py @@ -5,6 +5,7 @@ import urllib, socket from bs4 import * from urllib.parse import urljoin +from datetime import datetime import urllib.request import os.path import time, re @@ -77,3 +78,72 @@ def getProfile(url, username): __extract_properties(profile, soup) return profile + + +regex_id = re.compile(r"^.*t=([0-9]+).*$") + +def parseForumListPage(id, page, out, extra=None): + num_per_page = 30 + start = page*num_per_page+1 + print(" - Fetching page {} (topics {}-{})".format(page, start, start+num_per_page)) + + url = "https://forum.minetest.net/viewforum.php?f=" + str(id) + "&start=" + str(start) + r = urllib.request.urlopen(url).read().decode("utf-8") + soup = BeautifulSoup(r, "html.parser") + + for row in soup.find_all("li", class_="row"): + classes = row.get("class") + if "sticky" in classes or "announce" in classes or "global-announce" in classes: + continue + + topic = row.find("dl") + + # Link info + link = topic.find(class_="topictitle") + id = regex_id.match(link.get("href")).group(1) + title = link.find(text=True) + + # Date + left = topic.find("dt") + date = left.get_text().split("ยป")[1].strip() + date = datetime.strptime(date, "%a %b %d, %Y %H:%M") + author = left.find_all("a")[-1].get_text().strip() + + # Get counts + posts = topic.find(class_="posts").find(text=True) + views = topic.find(class_="views").find(text=True) + + if id in out: + print(" - got {} again, title: {}".format(id, title)) + assert(title == out[id]['title']) + return False + + row = { + "id" : id, + "title" : title, + "author": author, + "posts" : posts, + "views" : views, + "date" : date + } + + if extra is not None: + for key, value in extra.items(): + row[key] = value + + out[id] = row + + return True + +def getTopicsFromForum(id, out={}, extra=None): + print("Fetching all topics from forum {}".format(id)) + page = 0 + while parseForumListPage(id, page, out, extra): + page = page + 1 + + return out + +def dumpTitlesToFile(topics, path): + with open(path, "w") as out_file: + for topic in topics.values(): + out_file.write(topic["title"] + "\n") |