From 3d1adaf31bd7e1986ffcef7c2db3a229b3141a0d Mon Sep 17 00:00:00 2001 From: dave Date: Sat, 24 Jan 2015 00:35:58 -0800 Subject: [PATCH] Sort pisg outputs into user/network dirs --- pisg.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pisg.py b/pisg.py index 3e2807f..38990cc 100755 --- a/pisg.py +++ b/pisg.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 import subprocess -from os import listdir,unlink,chdir +from os import listdir,unlink,chdir,mkdir from os.path import exists from sys import exit from random import randint @@ -28,7 +28,7 @@ class logfile: - + @@ -38,16 +38,19 @@ class logfile: Logfile = "%(logdir)s_*.log" Format = "energymech" Network = "%(network)s" - OutputFile = "/home/znc/pisg/output/%(username)s_%(network)s_%(channel)s.html" + OutputFile = "/home/znc/pisg/output/%(username)s/%(network)s/%(channel)s.html" """ % {"logdir":self.path, "network":self.network, "channel":self.channel, "username":self.username} def run_pisg(self): + if not exists("/home/znc/pisg/output/%s" % self.username): + mkdir("/home/znc/pisg/output/%s" % self.username) + if not exists("/home/znc/pisg/output/%s/%s" % (self.username, self.network)): + mkdir("/home/znc/pisg/output/%s/%s" % (self.username, self.network)) configname = "config.%s" % str(randint(0,10000)) open(configname, "w").write(self.generate_config()) proc = subprocess.Popen(['pisg',"-co", configname], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) print(self.path +": "+str(proc.communicate())) unlink(configname) - if __name__ == "__main__": chdir("/home/znc/pisg") @@ -74,4 +77,3 @@ if __name__ == "__main__": for log in logs: log.run_pisg() -