Leahnaya/dwc_network_server_emulator
1
0
Fork 0
mirror of https://github.com/barronwaffles/dwc_network_server_emulator.git synced 2026-09-12 05:05:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #26 from msoucy/ref/python/context-managers

Browse Source 
Make use of context managers to safely close files
This commit is contained in:
polaris-
2014-05-27 08:03:08 -04:00
parent 7879245484 3eaf22b1a6
commit 72dd556447
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gamespy/gs_utility.py
View File

@@ -5,15 +5,14 @@ import time
import other.utils as utils
def generate_secret_keys(filename="gslist.cfg"):
key_file = open(filename)
secret_key_list = {}
for line in key_file.readlines():
#name = line[:54].strip() # Probably won't do anything with the name for now.
id = line[54:54+19].strip()
key = line[54+19:].strip()
with open(filename) as key_file:
for line in key_file.readlines():
#name = line[:54].strip() # Probably won't do anything with the name for now.
id = line[54:54+19].strip()
key = line[54+19:].strip()
secret_key_list[id] = key
secret_key_list[id] = key
return secret_key_list

24
nas_server.py
View File

@@ -152,6 +152,15 @@ class NasHTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler):
dlcpath = "dlc/" + post["gamecd"]
dlc_contenttype = False
def safeloadfi(fn, mode='rb'):
'''
safeloadfi : string -> string
Safely load contents of a file, given a filename, and closing the file afterward
'''
with open(os.path.join(dlcpath, fn), mode) as fi:
return fi.read()
if action == "count":
if post["gamecd"] in gamecodes_return_random_file:
ret = "1"
@@ -171,10 +180,10 @@ class NasHTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler):
attr3 = None
if "attr3" in post:
attr3 = post["attr3"]
list = open(dlcpath + "/_list.txt", "rb").read()
list = self.filter_list(list, attr1, attr2, attr3)
count = self.get_file_count(list)
lst = safeloadfi("_list.txt")
lst = self.filter_list(dlcfi.read(), attr1, attr2, attr3)
count = self.get_file_count(lst)
ret = "%d" % count
@@ -195,9 +204,8 @@ class NasHTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler):
if os.path.exists(dlcpath):
# Look for a list file first.
# If the list file exists, send the entire thing back to the client.
if os.path.isfile(dlcpath + "/_list.txt"):
ret = open(dlcpath + "/_list.txt", "rb").read()
ret = self.filter_list(ret, attr1, attr2, attr3)
if os.path.isfile(os.path.join(dlcpath, "_list.txt")):
ret = self.filter_list(safeloadfi("_list.txt"), attr1, attr2, attr3)
if post["gamecd"] in gamecodes_return_random_file:
ret = self.filter_list_random_files(ret, 1)
@@ -206,9 +214,7 @@ class NasHTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler):
# Get only the base filename just in case there is a path involved somewhere in the filename string.
dlc_contenttype = True
contents = os.path.basename(post["contents"])
if os.path.isfile(dlcpath + "/" + contents):
ret = open(dlcpath + "/" + contents, "rb").read()
ret = safeloadfi(contents)
self.send_response(200)

10
storage_server.py
View File

@@ -360,9 +360,8 @@ class StorageHTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler):
path = userdir + '/' + str(fileid)
cursor.execute('UPDATE filepaths SET path = ? WHERE fileid = ?', (path, fileid))
file = open(path, 'wb')
file.write(filedata['data'][0])
file.close()
with open(path, 'wb') as fi:
fi.write(filedata['data'][0])
else:
logger.log(logging.WARNING, "Tried to upload big file, rejected. (%s bytes)", len(filedata['data'][0]))
fileid = 0
@@ -405,9 +404,8 @@ class StorageHTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler):
filename = cursor.fetchone()[0]
if os.path.exists(filename):
file = open(filename, 'rb')
ret = file.read()
file.close()
with open(filename, 'rb') as fi:
ret = fi.read()
else:
logger.log(logging.ERROR, "User is trying to access file that should exist according to DB, but doesn't! (%s)", filename)
except: