From d1c417260fef0181ca482bb9244e41ac036af726 Mon Sep 17 00:00:00 2001 From: polaris Date: Tue, 20 May 2014 11:22:31 -0400 Subject: [PATCH] Return correct file count A listing file with no entries may contain just "\r\n", so strip that before counting --- nintendo_nas_server.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/nintendo_nas_server.py b/nintendo_nas_server.py index 48edbdb..fbf9686 100644 --- a/nintendo_nas_server.py +++ b/nintendo_nas_server.py @@ -37,10 +37,10 @@ class NintendoNasHTTPServer(BaseHTTPServer.HTTPServer): class NintendoNasHTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler): def do_POST(self): - if self.path == "/ac": - length = int(self.headers['content-length']) - post = self.str_to_dict(self.rfile.read(length)) + length = int(self.headers['content-length']) + post = self.str_to_dict(self.rfile.read(length)) + if self.path == "/ac": logger.log(logging.DEBUG, "Request to %s from %s", self.path, self.client_address) logger.log(logging.DEBUG, post) ret = {} @@ -105,9 +105,6 @@ class NintendoNasHTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler): elif self.path == "/pr": - length = int(self.headers['content-length']) - post = self.str_to_dict(self.rfile.read(length)) - logger.log(logging.DEBUG, "Request to %s from %s", self.path, self.client_address) logger.log(logging.DEBUG, post) ret = {} @@ -136,9 +133,6 @@ class NintendoNasHTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler): self.wfile.write(self.dict_to_str(ret)) elif self.path == "/download": - length = int(self.headers['content-length']) - post = self.str_to_dict(self.rfile.read(length)) - logger.log(logging.DEBUG, "Request to %s from %s", self.path, self.client_address) logger.log(logging.DEBUG, post) @@ -169,7 +163,8 @@ class NintendoNasHTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler): attr3 = post["attr3"] list = open(dlcpath + "/_list.txt", "rb").read() list = self.filter_list(list, attr1, attr2, attr3) - count = list.count("\r\n") + + count = list.strip().count("\r\n") ret = "%d" % count