anonfunc/mumo3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed gamechannel not being added

Browse Source
This commit is contained in:
Giovanni Harting
2019-02-03 04:29:42 +01:00
parent ad9b90c064
commit dbc60d2e30
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/autochannel.py
View File

@@ -4,6 +4,7 @@ import random
from threading import Timer from threading import Timer
import requests import requests
from mumo_module import (commaSeperatedIntegers, MumoModule) from mumo_module import (commaSeperatedIntegers, MumoModule)
from tools.Utils import find_create_channel, get_empty_channels, get_subchannels, get_user_for_channel from tools.Utils import find_create_channel, get_empty_channels, get_subchannels, get_user_for_channel
@@ -64,7 +65,7 @@ class autochannel(MumoModule):
for server in self.manager().getMeta().getBootedServers(): for server in self.manager().getMeta().getBootedServers():
if server.id in self.servertimer: if server.id in self.servertimer:
self.servertimer[server.id].stop() self.servertimer[server.id].cancel()
self.servertimer[server.id] = Timer(self.timer_interval, self.handle_timer, [server]) self.servertimer[server.id] = Timer(self.timer_interval, self.handle_timer, [server])
self.servertimer[server.id].start() self.servertimer[server.id].start()
@@ -78,12 +79,12 @@ class autochannel(MumoModule):
def update_timer(self): def update_timer(self):
r = requests.get("http://steamspy.com/api.php?request=top100in2weeks") r = requests.get("http://steamspy.com/api.php?request=top100in2weeks")
if r.status_code == 200: if r.status_code == 200 and r.json():
self.top_list = r.json() self.top_list = r.json()
self.log().info("Reloaded steam top100") self.log().info("Reloaded steam top100")
Timer(60 * 60, self.update_timer).start() Timer(60 * 60, self.update_timer).start()
else: else:
self.log().warn("Failed to reload top100 - HTTP " + r.status_code) self.log().warn("Failed to reload top100 - HTTP {} (len={})".format(r.status_code, len(r.json())))
Timer(10, self.update_timer).start() Timer(10, self.update_timer).start()
def disconnected(self): def disconnected(self):
@@ -111,6 +112,9 @@ class autochannel(MumoModule):
def check_game_channel(self, server): def check_game_channel(self, server):
self.game_root = find_create_channel(self.game_channel_name, server, 0) self.game_root = find_create_channel(self.game_channel_name, server, 0)
if not self.top_list:
return
games = {} games = {}
for idx, app in enumerate(self.top_list.values()): for idx, app in enumerate(self.top_list.values()):
if idx < self.top_games_limit: if idx < self.top_games_limit:
@@ -119,7 +123,7 @@ class autochannel(MumoModule):
break break
for pgame in self.game_channel_permanent: for pgame in self.game_channel_permanent:
if pgame and str(pgame) in self.top_list: if pgame:
game = self.top_list[str(pgame)] game = self.top_list[str(pgame)]
if game: if game:
@@ -166,4 +170,4 @@ class autochannel(MumoModule):
def stopped(self, server): def stopped(self, server):
self.log().debug("Stopped timer for server") self.log().debug("Stopped timer for server")
if server.id in self.servertimer: if server.id in self.servertimer:
self.servertimer[server.id].stop() self.servertimer[server.id].cancel()