mirror of
https://github.com/Oibaf66/frodo-wii.git
synced 2024-11-29 06:54:22 +01:00
Correct HTML generation (not finished)
This commit is contained in:
parent
2c69ce49cf
commit
d5eec1ef2f
@ -261,8 +261,10 @@ class Peer:
|
|||||||
|
|
||||||
self.srv.log_connection(self.name, self.country)
|
self.srv.log_connection(self.name, self.country)
|
||||||
try:
|
try:
|
||||||
which = random.randrange(0,10)
|
# Save as one of the last few screenshots
|
||||||
|
which = random.randrange(0,12)
|
||||||
img = image.image_from_data(self.screenshot)
|
img = image.image_from_data(self.screenshot)
|
||||||
|
print "Saving", which
|
||||||
img.save("%s%d.png" % (self.srv.image_dir, which))
|
img.save("%s%d.png" % (self.srv.image_dir, which))
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
log_info("Could not convert image data" + str(e))
|
log_info("Could not convert image data" + str(e))
|
||||||
@ -459,6 +461,7 @@ if __name__ == "__main__":
|
|||||||
|
|
||||||
if len(sys.argv) != 4:
|
if len(sys.argv) != 4:
|
||||||
usage()
|
usage()
|
||||||
|
random.seed(time.time())
|
||||||
|
|
||||||
ip2c = ip2country.IP2Country(verbose=0)
|
ip2c = ip2country.IP2Country(verbose=0)
|
||||||
syslog.openlog("frodo")
|
syslog.openlog("frodo")
|
||||||
|
@ -41,11 +41,22 @@ class HtmlGenerator:
|
|||||||
outf.write("<html><body>\n")
|
outf.write("<html><body>\n")
|
||||||
outf.write("<H2>Frodo-Wii network statistics</H2>\n")
|
outf.write("<H2>Frodo-Wii network statistics</H2>\n")
|
||||||
outf.write("The total number of connections is <b>%d</b><br>\n" % (self.container.total_connections))
|
outf.write("The total number of connections is <b>%d</b><br>\n" % (self.container.total_connections))
|
||||||
outf.write("<H3>Last %d connections</H3>\n" % (len(self.container.last_10)) )
|
outf.write("<TABLE border=\"0\" cellpadding=\"0\">\n")
|
||||||
for item in self.container.last_10:
|
outf.write("<TR><TD><H3>Last %d connections</H3></TD><TD colspan=4><H3>Random screenshots</TD></TR>\n" %
|
||||||
outf.write("%s<br>\n" % (item) )
|
(len(self.container.last_10)) )
|
||||||
|
|
||||||
outf.write("<H3>Country list</H3>\n")
|
cnt = 0
|
||||||
|
for item in self.container.last_10:
|
||||||
|
images = ""
|
||||||
|
if cnt % 4 == 0:
|
||||||
|
cur = cnt
|
||||||
|
images = "<TH ROWSPAN=4><IMG SRC=\"/tmp/images/%d.png\"></TH><TH ROWSPAN=4><IMG SRC=\"/tmp/images/%d.png\"></TH><TH ROWSPAN=4><IMG SRC=\"/tmp/images/%d.png\"></TH><TH ROWSPAN=4><IMG SRC=\"/tmp/images/%d.png\"></TH>" % (cur, cur + 1, cur + 2, cur + 3)
|
||||||
|
outf.write("<TR><TD>%s<br></TD>%s</TR>\n" % (item, images) )
|
||||||
|
cnt = cnt + 1
|
||||||
|
outf.write("</TABLE>\n")
|
||||||
|
|
||||||
|
outf.write("<TABLE border=\"0\" cellpadding=\"0\">\n")
|
||||||
|
outf.write("<TR><TD colspan=4><H3>Country list</H3></TD></TR>\n")
|
||||||
count = 1
|
count = 1
|
||||||
for country, num in sorted_countries:
|
for country, num in sorted_countries:
|
||||||
outf.write("<b>%3d</b>. %s (%d)<br>\n" % (count, country, num) )
|
outf.write("<b>%3d</b>. %s (%d)<br>\n" % (count, country, num) )
|
||||||
|
Loading…
Reference in New Issue
Block a user