diff --git a/src/utils/sendromdata.py b/src/utils/sendromdata.py index 1677334..1f20e1f 100644 --- a/src/utils/sendromdata.py +++ b/src/utils/sendromdata.py @@ -1,3 +1,4 @@ +#!/usr/bin/python """ Simple peTI-NESulator game database importer @@ -5,36 +6,34 @@ This python application will generate a XML file on the output with all informat game database. """ -import sys, md5, sha, urllib, urlparse +import urllib3 as urllib +import io +import sys +import hashlib.md5 as md5 +import hashlib.sha as sha +def get_page(theurl, post_data=None): + """ + Helper method that gets the given URL + """ + http = urllib.PoolManager() + + req = http.request('POST', theurl, fields=post_data) + + if req.status == 302 or req.status == 200: + return req.data + + return "Failure" -def get_page(url, post_data=None, headers=()): - """ - Helper method that gets the given URL, handling headers - """ - opener = urllib.URLopener() - for k, v in headers: - opener.addheader(k, v) - try: - f = opener.open(url, post_data) - except IOError, e: - if e[1] == 302: - return '' - else: - raise - return f.read() if __name__ == '__main__': - #print "" for filename in sys.argv[1:]: - f = open(filename) - - + f = io.open(filename) + try: - fs = f.read() if fs[0:4] == "NES%c" % 0x1A: - Flags = ord(fs[6]) & 0x0F; + Flags = ord(fs[6]) & 0x0F DiskDude = 0 if fs[7:16] == "DiskDude!": DiskDude = 1 @@ -57,22 +56,22 @@ if __name__ == '__main__': if Flags & 0x04: Trainer = 1 - print " " - print " %s" % filename - print " %s" % sha.new(fs).hexdigest() - print " %s" % md5.new(fs).hexdigest() - print " %d" % mapperID - print " %d" % prgsize - print " %d" % chrsize - print " %d" % mirror - print " %d" % sram - print " %d" % Trainer - print " %d" % DiskDude - print " " + print(" ") + print(" {filename}".format(filename=filename)) + print(" {sha}".format(sha=sha.new(fs).hexdigest())) + print(" {md5}".format(md5=md5.new(fs).hexdigest())) + print(" {id}".format(id=mapperID)) + print(" {size}".format(size=prgsize)) + print(" {size}".format(size=chrsize)) + print(" {mirror}".format(mirror=mirror)) + print(" {sram}".format(sram=sram)) + print(" {trainer}".format(trainer=Trainer)) + print(" {diskdude}".format(diskdude=DiskDude)) + print(" ") #will fill the DB : - url = "http://127.0.0.1/~mtrapier/nesstat/add.php" + url = "http://127.0.0.1/nesstat/add.php" html = get_page(url, urllib.urlencode({ 'n': filename, @@ -91,4 +90,4 @@ if __name__ == '__main__': finally: f.close() - #print "" + #print("")