This commit is contained in:
deathbybandaid 2019-07-16 12:55:47 -04:00
parent 3643719954
commit b4b806c77c

View File

@ -7,7 +7,7 @@ This is the SpiceBot Update system.
import sopel import sopel
import requests import requests
import json import feedparser
import pkg_resources import pkg_resources
from .Config import config as botconfig from .Config import config as botconfig
@ -25,7 +25,7 @@ class BotVersion():
} }
self.spicebot = { self.spicebot = {
"version_local": None, "version_local": None,
"version_local_num": None, "version_local_num": pkg_resources.get_distribution("sopel-modules.SpiceBot").version,
"version_url": "https://api.github.com/repos/SpiceBot/SpiceBot/commits/master", "version_url": "https://api.github.com/repos/SpiceBot/SpiceBot/commits/master",
"version_online": None, "version_online": None,
"version_online_num": None, "version_online_num": None,
@ -48,20 +48,8 @@ class BotVersion():
self.sopel["version_online"] = sopel._version_info(self.sopel["version_online_num"]) self.sopel["version_online"] = sopel._version_info(self.sopel["version_online_num"])
def check_spicebot(self): def check_spicebot(self):
self.spicebot["version_local_num"] = pkg_resources.get_distribution("sopel-modules.SpiceBot").version feedjson = feedparser.parse("https://github.com/SpiceBot/SpiceBot/commits/master.atom")
self.sopel["version_online_num"] = self.count_repo_commits() self.sopel["version_online_num"] = len(feedjson)
# get actual version number, and commit count, and assemble a version
def count_repo_commits(self):
commitcount = 0
try:
page = requests.get(self.spicebot["version_url"])
result = page.content
jsoncommits = json.loads(result.decode('utf-8'))
commitcount = len(jsoncommits)
except Exception as e:
commitcount = str(e)
return commitcount
version = BotVersion() version = BotVersion()