Merge branch 'master' of github.com:/krebscode/painload

Conflicts:
	.gitmodules
	oncology/dpfhack_display

2 files changed, 37 insertions, 0 deletions

diff --git a/gold/scoreboard/modules/available/btcguild/btcguild_stats b/gold/scoreboard/modules/available/btcguild/btcguild_stats
new file mode 100755
index 00000000..58d72f75
--- /dev/null
+++ b/gold/scoreboard/modules/available/btcguild/btcguild_stats
@@ -0,0 +1,22 @@
+#!/usr/bin/python2
+import simplejson,urllib,datetime
+url="http://www.btcguild.com/pool_stats.php"
+f = open('/home/makefu/log/btcguild_stats',mode='a')
+today = datetime.datetime.now()
+
+result = simplejson.load(urllib.urlopen(url))
+try:
+    print >>f, today.strftime("%Y-%m-%dT%H:%M:%S"),
+    # uk_speed round_time round_shares active_workers useast_speed uscentral_speed uswest_speed hash_rate nl_speed
+    print >>f , ("%s" % '0' ).replace('.',''),
+    print >>f , ("%s" % result['round_time'] ).replace('.',''),
+    print >>f , ("%s" % result['round_shares'] ).replace('.',''),
+    print >>f , ("%s" % result['active_workers'] ).replace('.',''),
+    print >>f , ("%s" % result['useast_speed'] ).replace('.',''),
+    print >>f , ("%s" % result['uscentral_speed'] ).replace('.',''),
+    print >>f , ("%s" % result['uswest_speed'] ).replace('.',''),
+    print >>f , ("%s" % result['hash_rate'] ).replace('.',''),
+    print >>f , ("%s" % 0 ).replace('.',''),
+    print >>f
+except:
+    pass
diff --git a/gold/scoreboard/modules/available/btcguild/btcguild_stats_self b/gold/scoreboard/modules/available/btcguild/btcguild_stats_self
new file mode 100755
index 00000000..9cb65590
--- /dev/null
+++ b/gold/scoreboard/modules/available/btcguild/btcguild_stats_self
@@ -0,0 +1,15 @@
+#!/usr/bin/python2
+import simplejson,urllib,datetime,sys
+url="http://www.btcguild.com/api.php?api_key="+sys.env['BTCGUILD_APIKEY']
+f = open('/home/makefu/log/btcguild_stats_self',mode='a')
+today = datetime.datetime.now()
+
+#result = simplejson.load(urllib.urlopen(url))
+#print >>f, today.strftime("%Y-%m-%dT%H:%M:%S"),
+
+# TODO do the right thing with the data (aka this loop is wrong, fixme
+#for k,v in result.iteritems():
+#    data = '%s' % v
+#    data = data.replace('.','')
+#    print >>f ,data,
+#print >>f