From 034a17d535c390f3c8d458ea36e078e171fb8470 Mon Sep 17 00:00:00 2001 From: polaris Date: Tue, 27 May 2014 13:53:09 -0400 Subject: [PATCH] Fix some exceptions --- gamespy_gamestats_server.py | 8 ++++++-- nas_server.py | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gamespy_gamestats_server.py b/gamespy_gamestats_server.py index 7b5db67..048a323 100644 --- a/gamespy_gamestats_server.py +++ b/gamespy_gamestats_server.py @@ -276,8 +276,12 @@ class Gamestats(LineReceiver): # The length entire packet SHOULD always be greater than the data field, so this check should be fine. return - idx = data.index(data_str) + len(data_str) - data = data[idx:idx+length] + if data_str in data: + idx = data.index(data_str) + len(data_str) + data = data[idx:idx+length] + else: + logger.log(logging.ERROR, "ERROR: Could not find \data\ in setpd command: %s", data) + data = "" self.db.pd_insert(self.profileid, data_parsed['dindex'], data_parsed['ptype'], data) diff --git a/nas_server.py b/nas_server.py index 4b1022c..cc9f3c9 100644 --- a/nas_server.py +++ b/nas_server.py @@ -187,8 +187,8 @@ class NasHTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler): if "attr3" in post: attr3 = post["attr3"] - lst = safeloadfi("_list.txt") - lst = self.filter_list(dlcfi.read(), attr1, attr2, attr3) + dlcfi = safeloadfi("_list.txt") + lst = self.filter_list(dlcfi, attr1, attr2, attr3) count = self.get_file_count(lst) ret = "%d" % count