From e3cf59d536fd525ab06d4b610605b53a2904d2c3 Mon Sep 17 00:00:00 2001 From: Jordan Date: Fri, 31 Dec 2021 05:59:35 -0700 Subject: update-stats.py: curl -> urllib --- tracker.jordan.im/update-stats.py | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/tracker.jordan.im/update-stats.py b/tracker.jordan.im/update-stats.py index bb6a977..bc370b2 100755 --- a/tracker.jordan.im/update-stats.py +++ b/tracker.jordan.im/update-stats.py @@ -1,28 +1,28 @@ #!/usr/bin/env python3 import fileinput -import subprocess import sys +import urllib.request INDEX_PATH = '/var/www/html/tracker.jordan.im/index.html' stats = dict.fromkeys(['torrents', 'connections', 'uptime']) -conn = subprocess.run( - ['curl', - 'http://127.0.0.1:6969/stats?format=txt&mode=conn'], - stdout=subprocess.PIPE, +conn = urllib.request.Request( + 'http://127.0.0.1:6969/stats?format=txt&mode=conn', ) -conn = conn.stdout.decode("utf-8").split('\n') -stats['uptime'] = int(int(conn[2].split()[0]) / 3600) -stats['connections'] = conn[3].split()[2] +r = urllib.request.urlopen(conn).read().decode('utf-8').split('\n') -bare = subprocess.run( - ['curl', 'http://127.0.0.1:6969/stats?format=txt'], - stdout=subprocess.PIPE +stats['uptime'] = int(int(r[2].split()[0]) / 3600) +stats['connections'] = r[3].split()[2] + +conn = urllib.request.Request( + 'http://127.0.0.1:6969/stats?format=txt' ) -bare = bare.stdout.decode("utf-8").split('\n') -stats['torrents'] = bare[2].split()[2] + +r = urllib.request.urlopen(conn).read().decode('utf-8').split('\n') + +stats['torrents'] = r[2].split()[2] s = ( f'The tracker has been online for {stats["uptime"]} hrs, ' @@ -34,3 +34,6 @@ for line in fileinput.input([INDEX_PATH], inplace=True): if line.strip().startswith('The tracker has been'): line = s sys.stdout.write(line) + +#import code +#code.interact(local=locals()) -- cgit v1.2.3-54-g00ecf