Frisk/RcGcDw
1
0
Fork 0
mirror of https://gitlab.com/chicken-riders/RcGcDw.git synced 2025-02-23 00:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Attempt in fixing #99

Browse source
This commit is contained in:
Frisk 2020-03-17 17:20:17 +01:00
parent 2f0f264a66
commit 4c8dd58b20
No known key found for this signature in database
GPG key ID: 213F7C15068AF8AC
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
misc.py
View file

@ -45,9 +45,9 @@ def generate_datafile():
sys.exit(1) sys.exit(1)
def load_datafile() -> object: def load_datafile() -> dict:
"""Read a data.json file and return a dictionary with contents """Read a data.json file and return a dictionary with contents
:rtype: object :rtype: dict
""" """
try: try:
with open("data.json") as data: with open("data.json") as data:

9
rcgcdw.py
View file

@ -1241,8 +1241,11 @@ class Recent_Changes_Class(object):
self.unsent_messages = self.unsent_messages[num:] self.unsent_messages = self.unsent_messages[num:]
logger.debug(self.unsent_messages) logger.debug(self.unsent_messages)
last_check = self.fetch_changes(amount=amount) last_check = self.fetch_changes(amount=amount)
self.recent_id = last_check if last_check is not None else self.file_id # If the request succeeds the last_check will be the last rcid from recentchanges query
if settings["limitrefetch"] != -1 and self.recent_id != self.file_id: if last_check is not None:
self.recent_id = last_check
# Assigns self.recent_id the last rcid if request succeeded, otherwise set the id from the file
if settings["limitrefetch"] != -1 and self.recent_id != self.file_id and self.recent_id != 0: # if saving to database is disabled, don't save the recent_id
self.file_id = self.recent_id self.file_id = self.recent_id
storage["rcid"] = self.recent_id storage["rcid"] = self.recent_id
misc.save_datafile(storage) misc.save_datafile(storage)
@ -1250,6 +1253,8 @@ class Recent_Changes_Class(object):
return self.recent_id return self.recent_id
def fetch_changes(self, amount, clean=False): def fetch_changes(self, amount, clean=False):
"""Fetches the :amount: of changes from the wiki.
Returns None on error and int of rcid of latest change if succeeded"""
global logged_in global logged_in
if len(self.ids) == 0: if len(self.ids) == 0:
logger.debug("ids is empty, triggering clean fetch") logger.debug("ids is empty, triggering clean fetch")