Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
e06ba5cecd | |||
23a3f27b57 |
3
.vscode/settings.json
vendored
Normal file
3
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
{
|
||||
"python.pythonPath": "/usr/bin/python3"
|
||||
}
|
@ -1,8 +1,8 @@
|
||||
core:
|
||||
autostart: false
|
||||
autostart: true
|
||||
clockspeed: 20
|
||||
interval: 10
|
||||
level: 3
|
||||
level: 0
|
||||
localadmin: true
|
||||
sftp:
|
||||
filepath:
|
||||
|
37
ippigeon.py
37
ippigeon.py
@ -48,7 +48,7 @@ if win32:
|
||||
_, username = res.strip().rsplit("\n", 1)
|
||||
userid, sysdom = username.rsplit("\\", 1)
|
||||
|
||||
if linux:
|
||||
if linux or macos:
|
||||
sysid = hex(uuid.getnode())
|
||||
#fprint(sysid)
|
||||
datafile += sysid
|
||||
@ -59,13 +59,14 @@ if linux:
|
||||
#fprint(hostname)
|
||||
|
||||
def netstat_done(res):
|
||||
fprint("netstat done, processing", settings)
|
||||
fprint("netstat done, processing")
|
||||
procdata_res = pool.apply_async(netstat.process, (res,), callback=process_done)
|
||||
#netstat.process(res)
|
||||
|
||||
def process_done(res):
|
||||
if settings["running"] == True:
|
||||
fprint("uploading to sftp...", settings)
|
||||
#settings["newdata"] = True
|
||||
fprint("uploading to sftp...")
|
||||
#ssh.sftp_send_data(res, config, datafile)
|
||||
procdata_res = pool.apply_async(ssh.sftp_send_data, (config, datafile, 'send'), callback=upload_done)
|
||||
|
||||
@ -74,16 +75,16 @@ def upload_done(res):
|
||||
|
||||
def login_done(res):
|
||||
if not res:
|
||||
fprint("Login failure", settings)
|
||||
fprint("Login failure")
|
||||
settings["message"] = "Login failure"
|
||||
else:
|
||||
fprint("Login result in main: " + str(res), settings)
|
||||
fprint("Login result in main: " + str(res))
|
||||
settings["loggedin"] = res
|
||||
settings["continueui"] = True
|
||||
|
||||
def blockdata_done(res):
|
||||
global settings
|
||||
fprint("FINISHED downloading block data", settings)
|
||||
fprint("FINISHED downloading block data")
|
||||
tmpkill = settings["kill"]
|
||||
settings["kill"] = False
|
||||
#block_res = pool.apply_async(block.block_conn, (config, datafile, res, settings))
|
||||
@ -91,29 +92,29 @@ def blockdata_done(res):
|
||||
tmplist = settings["badapps"]
|
||||
|
||||
for x in block_pids:
|
||||
fprint(x, settings)
|
||||
fprint(x)
|
||||
if not x in tmplist:
|
||||
tmplist.append(x)
|
||||
settings["badapps"] = tmplist
|
||||
fprint(settings["badapps"], settings)
|
||||
fprint(settings["badapps"])
|
||||
|
||||
tmplist = settings["badips"]
|
||||
for x in block_ips:
|
||||
fprint(x, settings)
|
||||
fprint(x)
|
||||
if not x in tmplist:
|
||||
tmplist.append(x)
|
||||
settings["badips"] = tmplist
|
||||
fprint(settings["badips"], settings)
|
||||
fprint(settings["badips"])
|
||||
|
||||
settings["kill"] = tmpkill
|
||||
|
||||
tmplist = settings["badlines"]
|
||||
for x in block_data:
|
||||
fprint(x, settings)
|
||||
fprint(x)
|
||||
if not x in tmplist:
|
||||
tmplist.append(x)
|
||||
settings["badlines"] = tmplist
|
||||
fprint(settings["badlines"], settings)
|
||||
fprint(settings["badlines"])
|
||||
|
||||
settings["newdata"] = True
|
||||
|
||||
@ -121,7 +122,7 @@ def killall():
|
||||
kids = active_children()
|
||||
for kid in kids:
|
||||
kid.kill()
|
||||
fprint("Every child has been killed", settings)
|
||||
fprint("Every child has been killed")
|
||||
os.kill(os.getpid(), 9) # dirty kill of self
|
||||
|
||||
|
||||
@ -145,7 +146,7 @@ def mainloop(pool):
|
||||
if netdata_res is None or netdata_res.ready():
|
||||
#rawdata = netdata_res.get()
|
||||
#procdata_res = pool.apply_async(process_netstat, (rawdata))
|
||||
fprint("netstat starting", settings)
|
||||
fprint("netstat starting")
|
||||
netdata_res = pool.apply_async(netstat.start, callback=netstat_done)
|
||||
#fprint(netdata_res.successful())
|
||||
|
||||
@ -204,7 +205,7 @@ def mainloop(pool):
|
||||
badproto = line[1]
|
||||
badip = line[4]
|
||||
badport = line[5]
|
||||
fprint("Firewalling " + badip + ":" + str(badport), settings)
|
||||
fprint("Firewalling " + badip + ":" + str(badport))
|
||||
cmd = 'New-NetFirewallRule -DisplayName "IPPigeon Security Rule ' + badip + ':' + str(badport) + '" -Group "IPPigeon" -Direction Outbound -LocalPort Any -Protocol ' + badproto + ' -Action Block -RemoteAddress ' + badip + ' -RemotePort ' + str(badport)
|
||||
run_cmd(cmd)
|
||||
|
||||
@ -216,9 +217,8 @@ def mainloop(pool):
|
||||
with open(find_data_file('config.yml'), 'w') as filewrite:
|
||||
#global config
|
||||
yaml.dump(config, filewrite)
|
||||
fprint("Config saved!", settings)
|
||||
|
||||
|
||||
fprint("Config saved!")
|
||||
|
||||
sleep(interval / (interval * config["core"]["clockspeed"]))
|
||||
counter += 1
|
||||
if counter == interval * config["core"]["clockspeed"]:
|
||||
@ -274,7 +274,6 @@ if __name__ == '__main__':
|
||||
settings["fwll"] = 0
|
||||
settings["running"] = config["core"]["autostart"]
|
||||
settings["newdata"] = False
|
||||
settings["logMsg"] = list()
|
||||
killme = manager.Value('d', 0)
|
||||
#killme = False
|
||||
# launch background UI app as process
|
||||
|
45
netstat.py
45
netstat.py
@ -4,7 +4,7 @@ from util import fprint
|
||||
from util import run_cmd
|
||||
from util import win32
|
||||
from util import linux
|
||||
from ippigeon import settings
|
||||
from util import macos
|
||||
import util
|
||||
import time
|
||||
import csv
|
||||
@ -13,12 +13,12 @@ import csv
|
||||
|
||||
def process(data):
|
||||
setup_child()
|
||||
fprint("netstat processing", settings)
|
||||
fprint("netstat processing")
|
||||
if win32:
|
||||
#output = data.stdout
|
||||
#print(output)
|
||||
output = data.stdout.decode().split('\r\n') # split stdout into lines
|
||||
print("data", data)
|
||||
#print(output)
|
||||
if output[0].find("The requested operation requires elevation.") >= 0:
|
||||
#print("test3")
|
||||
raise PermissionError("Unable to acquire netstat data without admin!")
|
||||
@ -69,13 +69,15 @@ def process(data):
|
||||
with open(find_data_file(util.datafile), "w", newline="") as f:
|
||||
writer = csv.writer(f)
|
||||
writer.writerows(output2)
|
||||
fprint("done creating csv", settings)
|
||||
fprint("done creating csv")
|
||||
|
||||
if linux:
|
||||
if linux or macos:
|
||||
output = data.stdout.decode().split('\n') # split stdout into lines
|
||||
#output = data.stdout.decode().split(',')
|
||||
#fprint("output data: " + str(output))
|
||||
output = [i for i in output if i]
|
||||
if output[0].find("Not all processes could be identified") >= 0:
|
||||
fprint("Not enough permissions", settings)
|
||||
fprint("Not enough permissions")
|
||||
raise PermissionError("Unable to acquire netstat data without admin!")
|
||||
output2 = list()
|
||||
output2.append([util.sysid, util.userid, util.sysdom, util.time()]) # add metadata
|
||||
@ -84,43 +86,44 @@ def process(data):
|
||||
string_split = [i for i in string_split if i]
|
||||
#fprint("Input: " + str(string_split))
|
||||
|
||||
if string_split[1].find("Multipath") >= 0:
|
||||
break
|
||||
if string_split[0].find("Active") >= 0 or string_split[0].find("Proto") >= 0:
|
||||
continue
|
||||
|
||||
if len(string_split) == 6: # no connection status
|
||||
if len(string_split) == 10: # no connection status
|
||||
#fprint(string_split)
|
||||
string_split.append(string_split[-1])
|
||||
string_split[-2] = "UNKNOWN"
|
||||
string_split[-7] = "UNKNOWN"
|
||||
string_split[-4] = string_split[-5]
|
||||
#fprint(string_split)
|
||||
|
||||
procname = string_split[6]
|
||||
if procname != "-":
|
||||
string_split2 = procname.split("/")
|
||||
procname = string_split2[1]
|
||||
pid = string_split2[0]
|
||||
else:
|
||||
pid = "Unknown"
|
||||
|
||||
|
||||
output2.append([procname, string_split[0], string_split[3], string_split[4], string_split[5], pid])
|
||||
#fprint(output2)
|
||||
output2.append(["Unknown", string_split[0], string_split[3], string_split[4], string_split[5], string_split[8]])
|
||||
#fprint("FINAL CSV: " + str(output2))
|
||||
|
||||
with open(find_data_file(util.datafile), "w", newline="") as f:
|
||||
writer = csv.writer(f)
|
||||
writer.writerows(output2)
|
||||
fprint("done creating csv", settings)
|
||||
fprint("done creating csv")
|
||||
|
||||
|
||||
def start():
|
||||
setup_child()
|
||||
fprint("netstat started", settings)
|
||||
fprint("netstat started")
|
||||
|
||||
if win32:
|
||||
data = run_cmd("netstat -n -o -b")
|
||||
fprint("data acquired", settings)
|
||||
fprint("data acquired")
|
||||
return data
|
||||
|
||||
if linux:
|
||||
data = run_cmd("netstat -atunpw")
|
||||
fprint("data acquired", settings)
|
||||
fprint("data acquired")
|
||||
return data
|
||||
|
||||
if macos:
|
||||
data = run_cmd("netstat -anv")
|
||||
fprint("data acquired")
|
||||
return data
|
||||
|
93
panel.py
93
panel.py
@ -1,6 +1,4 @@
|
||||
import glob
|
||||
import logging
|
||||
import sys
|
||||
import wx
|
||||
import wx.lib.buttons as buttons
|
||||
import numpy as np
|
||||
@ -49,7 +47,7 @@ class OtherFrame(wx.Frame):
|
||||
self.Show()
|
||||
|
||||
def on_edit(self, event):
|
||||
fprint('in on_edit', settings)
|
||||
fprint('in on_edit')
|
||||
|
||||
def on_window(self, event):
|
||||
return
|
||||
@ -166,7 +164,7 @@ class ServerPanel(wx.Panel):
|
||||
#main_sizer.SetBackgroundColour((44, 51, 51))
|
||||
# self.pnl1.SetBackgroundColour(wx.BLACK)
|
||||
self.handle_columns()
|
||||
#self.updatedata()
|
||||
# self.updatedata()
|
||||
wx.CallAfter(self.updatedata)
|
||||
|
||||
wx.GetApp().ProcessPendingEvents()
|
||||
@ -175,20 +173,11 @@ class ServerPanel(wx.Panel):
|
||||
start_button.SetBackgroundColour((205, 215, 206))
|
||||
start_button.Bind(wx.EVT_BUTTON, self.on_start)
|
||||
#start_button.Bind(wx.EVT_ENTER_WINDOW, self.on_start)
|
||||
|
||||
stop_button = wx.Button(self, label='Stop IPPigeon')
|
||||
stop_button.SetBackgroundColour('#F08080')
|
||||
|
||||
secondary_frame_button = wx.Button(self, label='Settings')
|
||||
secondary_frame_button.Bind(wx.EVT_BUTTON, self.on_window)
|
||||
|
||||
log_button = wx.Button(self, label='Logs')
|
||||
log_button.Bind(wx.EVT_BUTTON, self.on_log)
|
||||
|
||||
#self.log_window = wx.LogWindow(self, 'Log Window', True)
|
||||
|
||||
#show_log_button = wx.Button(self, wx.NewId(), 'Show Log')
|
||||
#show_log_button.Bind(wx.EVT_BUTTON, self._show_log)
|
||||
# wx.BORDER(stop_button, wx.BORDER_NONE)
|
||||
stop_button.Bind(wx.EVT_BUTTON, self.on_stop)
|
||||
self.main_sizer.Add(self.statustext, 0, wx.CENTER | wx.ALL | 100, 5)
|
||||
@ -197,7 +186,6 @@ class ServerPanel(wx.Panel):
|
||||
self.main_sizer.Add(secondary_frame_button, 0, wx.CENTER | wx.ALL | 100, 5)
|
||||
self.SetSizer(self.main_sizer)
|
||||
|
||||
|
||||
def handle_columns(self):
|
||||
for col in range(len(COLUMN_NAMES)):
|
||||
self.list_ctrl.InsertColumn(0, COLUMN_NAMES[col], width=COLUMN_SIZES[col])
|
||||
@ -215,13 +203,12 @@ class ServerPanel(wx.Panel):
|
||||
else:
|
||||
wx.CallLater(1000, self.updatedata)
|
||||
return
|
||||
fprint("updatedata called", settings)
|
||||
fprint("updatedata called")
|
||||
loaddata()
|
||||
#logData.doLogging(logData)
|
||||
if self.list_ctrl.DeleteAllItems():
|
||||
fprint("Items deleted", settings)
|
||||
fprint("Items deleted")
|
||||
else:
|
||||
fprint("Unable to delete", settings)
|
||||
fprint("Unable to delete")
|
||||
for i in range(len(TEST_FILE)):
|
||||
if str(TEST_FILE.iloc[i, 4]).find("TIME_WAIT") >= 0 or str(TEST_FILE.iloc[i, 4]).find("FIN_WAIT_2") >= 0:
|
||||
continue
|
||||
@ -249,29 +236,20 @@ class ServerPanel(wx.Panel):
|
||||
wx.CallLater(1000, self.updatedata)
|
||||
|
||||
def on_start(self, event):
|
||||
fprint('in on_start', settings)
|
||||
fprint('in on_start')
|
||||
settings["running"] = True
|
||||
# fprint("check if settings[running] is set to true" + str(settings["running"]))
|
||||
|
||||
def on_stop(self, event):
|
||||
fprint('in on_stop', settings)
|
||||
fprint('in on_stop')
|
||||
settings["running"] = False
|
||||
util.clear_fwll()
|
||||
|
||||
def on_window(self, event):
|
||||
fprint("open settings", settings)
|
||||
fprint("open settings")
|
||||
dg = GetData(parent = None)
|
||||
dg.ShowModal()
|
||||
|
||||
def on_log(self, event):
|
||||
fprint("open log", settings)
|
||||
dg = logData(parent = None)
|
||||
#fprint("attempting logLoop", settings)
|
||||
logData.logLoop(dg)
|
||||
#fprint("did logLoop work?", settings)
|
||||
dg.ShowModal()
|
||||
|
||||
|
||||
|
||||
def ShowImage(self, imageFile):
|
||||
if imageFile == "":
|
||||
self.bitmap = wx.StaticBitmap(self, -1, size=(0, 0))
|
||||
@ -299,65 +277,20 @@ def openwindow(data, sets, kill):
|
||||
killme = kill
|
||||
displaydata = data
|
||||
settings = sets
|
||||
if settings["loggedin"]:
|
||||
fprint("Creating server panel", settings)
|
||||
if settings["loggedin"] == False:
|
||||
fprint("Creating server panel")
|
||||
loaddata()
|
||||
app = wx.App(False)
|
||||
frame = OtherFrame()
|
||||
frame.SetIcon(wx.Icon(find_data_file("icon.ico"), wx.BITMAP_TYPE_ICO))
|
||||
app.MainLoop()
|
||||
else:
|
||||
fprint("Creating login panel", settings)
|
||||
fprint("Creating login panel")
|
||||
|
||||
app = wx.App(False)
|
||||
frame = ServerFrame()
|
||||
frame.SetIcon(wx.Icon(find_data_file("icon.ico"), wx.BITMAP_TYPE_ICO))
|
||||
app.MainLoop()
|
||||
class RedirectText(object):
|
||||
def __init__(self,aWxTextCtrl):
|
||||
self.out = aWxTextCtrl
|
||||
|
||||
def write(self,string):
|
||||
self.out.WriteText(string)
|
||||
|
||||
class logData(wx.Dialog):
|
||||
def __init__(self, parent):
|
||||
wx.Dialog.__init__(self, parent, wx.ID_ANY, "Logs: ", size = (800,500))
|
||||
self.p = wx.Panel(self, wx.ID_ANY)
|
||||
#self.logBox = wx.BoxSizer(wx.VERTICAL)
|
||||
self.logsTitle = wx.StaticText(self.p, label="Logs", pos=(20,20))
|
||||
self.logs = wx.TextCtrl(self.p, pos=(20,40), size= (700, 400), style=wx.TE_MULTILINE|wx.TE_READONLY|wx.HSCROLL)
|
||||
self.logs.WriteText("init\n")
|
||||
#keepLoop = False
|
||||
|
||||
def logLoop(self):
|
||||
self.logs.WriteText("before while loop\n")
|
||||
i=0
|
||||
if (settings["logMsg"] is not None):
|
||||
while(i < len(settings["logMsg"])):
|
||||
#for i in range(len(settings["logMsg"])):
|
||||
#self.logs.WriteText("in while loop\n")
|
||||
self.logs.WriteText(settings["logMsg"][i])
|
||||
self.logs.WriteText("\n")
|
||||
i+=1
|
||||
else:
|
||||
self.logs.WriteText("settings is none :(")
|
||||
settings["logMsg"].add("init string for list")
|
||||
logData.logLoop(self)
|
||||
self.logs.WriteText("after while loop\n")
|
||||
|
||||
|
||||
|
||||
#redir = RedirectText(self.logs)
|
||||
#sys.stdout = redir
|
||||
#self.logs.WriteText(redir)
|
||||
|
||||
#self.logs.LoadFile('output.log')
|
||||
|
||||
#def doLogging(self):
|
||||
#self.logs.WriteText("hi from doLogging\n")
|
||||
#self.logs.WriteText(settings["logMsg"])
|
||||
|
||||
|
||||
class GetData(wx.Dialog):
|
||||
def __init__(self, parent):
|
||||
@ -406,7 +339,7 @@ class GetData(wx.Dialog):
|
||||
|
||||
def OnQuit(self, event):
|
||||
# save changes
|
||||
fprint("saving changes...", settings)
|
||||
fprint("saving changes...")
|
||||
config = settings["config"]
|
||||
config["sftp"]["host"] = self.hostnametext.GetValue()
|
||||
config["sftp"]["user"] = self.usertext.GetValue()
|
||||
|
20
ssh.py
20
ssh.py
@ -5,25 +5,25 @@ from util import setup_child
|
||||
from util import fprint
|
||||
from invoke import exceptions
|
||||
import sys
|
||||
settings = None
|
||||
|
||||
def sftp_send_data(config, filename, filetype):
|
||||
setup_child()
|
||||
fprint("Connecting over SSH to " + config['sftp']['host'], settings)
|
||||
fprint("Connecting over SSH to " + config['sftp']['host'])
|
||||
c = Connection(host=config['sftp']['host'], user=config['sftp']['user'], port=config['sftp']['port'], connect_kwargs={"key_filename": find_data_file(config['sftp']['keyfile']),})
|
||||
fprint("Sending data over SFTP: " + filename, settings)
|
||||
fprint(c.put(find_data_file(filename), remote=config['sftp']['filepath'][filetype]), settings)
|
||||
fprint("Data sent over SFTP successfully", settings)
|
||||
fprint("Sending data over SFTP: " + filename)
|
||||
fprint(c.put(find_data_file(filename), remote=config['sftp']['filepath'][filetype]))
|
||||
fprint("Data sent over SFTP successfully")
|
||||
#command = 'ls ' + config['sftp']['filepath'][filetype]
|
||||
#fprint(c.run(command))
|
||||
|
||||
def check_for_file(config, filename, location):
|
||||
setup_child()
|
||||
fprint("Connecting over SSH to " + config['sftp']['host'], settings)
|
||||
fprint("Connecting over SSH to " + config['sftp']['host'])
|
||||
c = Connection(host=config['sftp']['host'], user=config['sftp']['user'], port=config['sftp']['port'], connect_kwargs={"key_filename": find_data_file(config['sftp']['keyfile']),})
|
||||
fprint("Checking for existence of file " + config['sftp']['filepath'][location] + "/" + filename, settings)
|
||||
fprint("Checking for existence of file " + config['sftp']['filepath'][location] + "/" + filename)
|
||||
try:
|
||||
res = c.run("ls -l " + config['sftp']['filepath'][location] + "/" + filename, hide=True)
|
||||
fprint("File " + filename + " exists!", settings)
|
||||
fprint("File " + filename + " exists!")
|
||||
return c.run("cat " + config['sftp']['filepath'][location] + "/" + filename, hide=True)
|
||||
except exceptions.UnexpectedExit:
|
||||
return False
|
||||
@ -32,9 +32,9 @@ def run_ssh(config, command, location):
|
||||
setup_child()
|
||||
fprint("Connecting over SSH to " + config['sftp']['host'])
|
||||
c = Connection(host=config['sftp']['host'], user=config['sftp']['user'], port=config['sftp']['port'], connect_kwargs={"key_filename": find_data_file(config['sftp']['keyfile']),})
|
||||
fprint("cd to " + config['sftp']['filepath'][location], settings)
|
||||
fprint("cd to " + config['sftp']['filepath'][location])
|
||||
with c.cd(config['sftp']['filepath'][location]):
|
||||
fprint("Running ssh command: " + command, settings)
|
||||
fprint("Running ssh command: " + command)
|
||||
res = c.run(command, hide=True, asynchronous=True)
|
||||
return res
|
||||
|
||||
|
@ -42,7 +42,7 @@ class TaskBarIcon(wx.adv.TaskBarIcon):
|
||||
self.SetIcon(icon, TRAY_TOOLTIP)
|
||||
|
||||
def on_left_down(self, event):
|
||||
fprint ('Tray icon was left-clicked.', settings)
|
||||
fprint ('Tray icon was left-clicked.')
|
||||
|
||||
def on_open(self, event):
|
||||
settings["showui"] = True
|
||||
@ -81,7 +81,7 @@ def background(data, sets, kill):
|
||||
app = TaskbarApp(False)
|
||||
displaydata = data
|
||||
settings = sets
|
||||
fprint("Creating taskbar icon", settings)
|
||||
fprint("Creating taskbar icon")
|
||||
app.MainLoop()
|
||||
|
||||
TRAY_ICON = find_data_file('icon.png')
|
||||
|
45
util.py
45
util.py
@ -7,13 +7,11 @@ import time as t
|
||||
from time import sleep
|
||||
import uuid
|
||||
|
||||
logMsg = ""
|
||||
logCont = ""
|
||||
win32 = platform == "win32"
|
||||
linux = platform == "linux" or platform == "linux2"
|
||||
macos = platform == "darwin"
|
||||
datafile = ""
|
||||
settings=None
|
||||
|
||||
if win32:
|
||||
sysid = hex(uuid.getnode())
|
||||
datafile += sysid
|
||||
@ -28,7 +26,7 @@ if win32:
|
||||
_, username = res.strip().rsplit("\n", 1)
|
||||
userid, sysdom = username.rsplit("\\", 1)
|
||||
|
||||
if linux:
|
||||
if linux or macos:
|
||||
sysid = hex(uuid.getnode())
|
||||
#fprint(sysid)
|
||||
datafile += sysid
|
||||
@ -45,28 +43,21 @@ def time():
|
||||
def kill(pid):
|
||||
setup_child()
|
||||
if pid > 0:
|
||||
fprint("Killing PID " + str(pid), settings)
|
||||
fprint("Killing PID " + str(pid))
|
||||
os.kill(int(pid), 9)
|
||||
fprint("Signal 9 sent to PID " + str(pid), settings)
|
||||
fprint("Signal 9 sent to PID " + str(pid))
|
||||
|
||||
def fprint(msg, settings = None):
|
||||
def fprint(msg):
|
||||
#if not getattr(sys, "frozen", False):
|
||||
setup_child(settings)
|
||||
setup_child()
|
||||
try:
|
||||
frm = inspect.stack()[1]
|
||||
|
||||
mod = inspect.getmodule(frm[0])
|
||||
logMsg = '[' + mod.__name__ + ":" + frm.function + ']:' + str(msg)
|
||||
|
||||
print(logMsg)
|
||||
if (settings is not None):
|
||||
tmpList = settings["logMsg"]
|
||||
tmpList.append(logMsg)
|
||||
settings["logMsg"] = tmpList
|
||||
print('[' + mod.__name__ + ":" + frm.function + ']:', str(msg))
|
||||
except Exception as e:
|
||||
try:
|
||||
print('[????:' + frm.function + ']:', str(msg))
|
||||
print(e)
|
||||
except:
|
||||
print('[????]:', str(msg))
|
||||
|
||||
@ -95,38 +86,28 @@ def run_cmd(cmd):
|
||||
#else:
|
||||
# print("alt")
|
||||
startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW # , "-WindowStyle", "hidden"
|
||||
fprint("running PS command: " + cmd, settings)
|
||||
fprint("running PS command: " + cmd)
|
||||
completed = subprocess.run(["powershell", "-Command", cmd], capture_output=True, startupinfo=startupinfo)
|
||||
fprint("ran PS command successfully", settings)
|
||||
fprint("ran PS command successfully")
|
||||
#completed = subprocess.run(["powershell", "-WindowStyle", "hidden", "-Command", cmd], capture_output=True, startupinfo=startupinfo)
|
||||
return completed
|
||||
if linux:
|
||||
fprint("running sh command: " + cmd, settings)
|
||||
if linux or macos:
|
||||
fprint("running sh command: " + cmd)
|
||||
completed = subprocess.run(["sh", "-c", cmd], capture_output=True)
|
||||
fprint("ran sh command successfully", settings)
|
||||
fprint("ran sh command successfully")
|
||||
return completed
|
||||
|
||||
def setup_child(sets=None):
|
||||
def setup_child():
|
||||
if not getattr(sys, "frozen", False):
|
||||
sys.stdout = Logger(filename=find_data_file("output.log"))
|
||||
sys.stderr = Logger(filename=find_data_file("output.log"))
|
||||
if sets is not None:
|
||||
settings = sets
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
class Logger(object):
|
||||
def __init__(self, filename="output.log"):
|
||||
self.string = ""
|
||||
self.log = open(filename, "a")
|
||||
self.terminal = sys.stdout
|
||||
|
||||
def write(self, message):
|
||||
self.string += message
|
||||
self.string += "\n"
|
||||
|
||||
self.log.write(message)
|
||||
#close(filename)
|
||||
#self.log = open(filename, "a")
|
||||
|
34
wizard.py
Normal file
34
wizard.py
Normal file
@ -0,0 +1,34 @@
|
||||
import wx
|
||||
from wx.adv import Wizard, WizardPageSimple
|
||||
|
||||
class TitlePage(WizardPageSimple):
|
||||
|
||||
def __init__(self, parent, title):
|
||||
WizardPageSimple.__init__(self, parent)
|
||||
|
||||
sizer = wx.BoxSizer(wx.VERTICAL)
|
||||
self.SetSizer(sizer)
|
||||
|
||||
title = wx.StaticText(self, wx.ID_ANY, title)
|
||||
title.SetFont(wx.Font(18, wx.SWISS, wx.NORMAL, wx.BOLD))
|
||||
sizer.Add(title, 0, wx.ALIGN_CENTER|wx.ALL, 5)
|
||||
sizer.Add(wx.StaticLine(self, wx.ID_ANY), 0, wx.EXPAND|wx.ALL, 5)
|
||||
|
||||
|
||||
def main():
|
||||
wizard = Wizard(None, wx.ID_ANY, "Simple Wizard")
|
||||
page1 = TitlePage(wizard, "Page 1")
|
||||
page2 = TitlePage(wizard, "Page 2")
|
||||
page3 = TitlePage(wizard, "Page 3")
|
||||
|
||||
WizardPageSimple.Chain(page1, page2)
|
||||
WizardPageSimple.Chain(page2, page3)
|
||||
wizard.FitToPage(page1)
|
||||
|
||||
wizard.RunWizard(page1)
|
||||
wizard.Destroy()
|
||||
|
||||
if __name__ == "__main__":
|
||||
app = wx.App()
|
||||
main()
|
||||
app.MainLoop()
|
111
wizardTutorial.py
Normal file
111
wizardTutorial.py
Normal file
@ -0,0 +1,111 @@
|
||||
import wx
|
||||
########################################################################
|
||||
class WizardPage(wx.Panel):
|
||||
""""""
|
||||
#----------------------------------------------------------------------
|
||||
def __init__(self, parent, title=None):
|
||||
"""Constructor"""
|
||||
wx.Panel.__init__(self, parent)
|
||||
|
||||
sizer = wx.BoxSizer(wx.VERTICAL)
|
||||
self.SetSizer(sizer)
|
||||
|
||||
if title:
|
||||
title = wx.StaticText(self, -1, title)
|
||||
title.SetFont(wx.Font(18, wx.SWISS, wx.NORMAL, wx.BOLD))
|
||||
sizer.Add(title, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
|
||||
sizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND|wx.ALL, 5)
|
||||
|
||||
|
||||
########################################################################
|
||||
class WizardPanel(wx.Panel):
|
||||
""""""
|
||||
#----------------------------------------------------------------------
|
||||
def __init__(self, parent):
|
||||
"""Constructor"""
|
||||
wx.Panel.__init__(self, parent=parent)
|
||||
self.pages = []
|
||||
self.page_num = 0
|
||||
|
||||
self.mainSizer = wx.BoxSizer(wx.VERTICAL)
|
||||
self.panelSizer = wx.BoxSizer(wx.VERTICAL)
|
||||
btnSizer = wx.BoxSizer(wx.HORIZONTAL)
|
||||
|
||||
# add prev/next buttons
|
||||
self.prevBtn = wx.Button(self, label="Previous")
|
||||
self.prevBtn.Bind(wx.EVT_BUTTON, self.onPrev)
|
||||
btnSizer.Add(self.prevBtn, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
|
||||
|
||||
self.nextBtn = wx.Button(self, label="Next")
|
||||
self.nextBtn.Bind(wx.EVT_BUTTON, self.onNext)
|
||||
btnSizer.Add(self.nextBtn, 0, wx.ALL|wx.ALIGN_RIGHT, 5)
|
||||
|
||||
# finish layout
|
||||
self.mainSizer.Add(self.panelSizer, 1, wx.EXPAND)
|
||||
self.mainSizer.Add(btnSizer, 0, wx.ALIGN_RIGHT)
|
||||
self.SetSizer(self.mainSizer)
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
def addPage(self, title=None):
|
||||
""""""
|
||||
panel = WizardPage(self, title)
|
||||
self.panelSizer.Add(panel, 2, wx.EXPAND)
|
||||
self.pages.append(panel)
|
||||
if len(self.pages) > 1:
|
||||
# hide all panels after the first one
|
||||
panel.Hide()
|
||||
self.Layout()
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
def onNext(self, event):
|
||||
""""""
|
||||
pageCount = len(self.pages)
|
||||
if pageCount-1 != self.page_num:
|
||||
self.pages[self.page_num].Hide()
|
||||
self.page_num += 1
|
||||
self.pages[self.page_num].Show()
|
||||
self.panelSizer.Layout()
|
||||
else:
|
||||
print("End of pages!")
|
||||
|
||||
if self.nextBtn.GetLabel() == "Finish":
|
||||
# close the app
|
||||
self.GetParent().Close()
|
||||
|
||||
if pageCount == self.page_num+1:
|
||||
# change label
|
||||
self.nextBtn.SetLabel("Finish")
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
def onPrev(self, event):
|
||||
""""""
|
||||
pageCount = len(self.pages)
|
||||
if self.page_num-1 != -1:
|
||||
self.pages[self.page_num].Hide()
|
||||
self.page_num -= 1
|
||||
self.pages[self.page_num].Show()
|
||||
self.panelSizer.Layout()
|
||||
else:
|
||||
print("You're already on the first page!")
|
||||
|
||||
|
||||
########################################################################
|
||||
class MainFrame(wx.Frame):
|
||||
""""""
|
||||
#----------------------------------------------------------------------
|
||||
def __init__(self):
|
||||
"""Constructor"""
|
||||
wx.Frame.__init__(self, None, title="Generic Wizard", size=(800,600))
|
||||
|
||||
self.panel = WizardPanel(self)
|
||||
self.panel.addPage("Page 1")
|
||||
self.panel.addPage("Page 2")
|
||||
self.panel.addPage("Page 3")
|
||||
|
||||
self.Show()
|
||||
|
||||
if __name__ == "__main__":
|
||||
app = wx.App()
|
||||
frame = MainFrame()
|
||||
app.MainLoop()
|
Reference in New Issue
Block a user