From 3f6521f9125b13f61192fefde94d9b6d0fc6e489 Mon Sep 17 00:00:00 2001 From: Matthew Shao Date: Wed, 11 Nov 2015 09:03:05 +0800 Subject: Use watchdog to reload scripts automatically. --- libmproxy/script.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'libmproxy/script.py') diff --git a/libmproxy/script.py b/libmproxy/script.py index 9d051c12..896f5245 100644 --- a/libmproxy/script.py +++ b/libmproxy/script.py @@ -4,6 +4,9 @@ import traceback import threading import shlex import sys +from watchdog.observers import Observer +from watchdog.events import PatternMatchingEventHandler, FileModifiedEvent +from .console import signals class ScriptError(Exception): @@ -192,3 +195,22 @@ def concurrent(fn): return _concurrent raise NotImplementedError( "Concurrent decorator not supported for '%s' method." % fn.func_name) + + +class ScriptModified(PatternMatchingEventHandler): + + def __init__(self, FlowMaster): + self.FlowMaster = FlowMaster + PatternMatchingEventHandler.__init__(self, ignore_directories=True, patterns=["*.py"]) + + def on_modified(self, event=FileModifiedEvent): + self.FlowMaster.reload_scripts() + signals.status_message.send(message="script: <{0}> reloaded.".format(event.src_path)) + + +def ObserveScripts(FlowMaster, path): + script_dir = os.path.dirname(path) + event_handler = ScriptModified(FlowMaster) + observer = Observer() + observer.schedule(event_handler, script_dir) + observer.start() -- cgit v1.2.3 From 2522ba69fa5a8acb394c48cba05afdb5e01b4e4a Mon Sep 17 00:00:00 2001 From: Matthew Shao Date: Wed, 11 Nov 2015 20:59:12 +0800 Subject: Move the observer initalization to the constructor of Script class.Should work with both mitmproxy and mitmdump now. Change the names in PEP8 style. --- libmproxy/script.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'libmproxy/script.py') diff --git a/libmproxy/script.py b/libmproxy/script.py index 896f5245..464ac4aa 100644 --- a/libmproxy/script.py +++ b/libmproxy/script.py @@ -6,7 +6,6 @@ import shlex import sys from watchdog.observers import Observer from watchdog.events import PatternMatchingEventHandler, FileModifiedEvent -from .console import signals class ScriptError(Exception): @@ -71,6 +70,7 @@ class Script: self.ctx = ScriptContext(master) self.ns = None self.load() + observe_scripts(master, self.args[0]) @classmethod def parse_command(cls, command): @@ -199,18 +199,19 @@ def concurrent(fn): class ScriptModified(PatternMatchingEventHandler): - def __init__(self, FlowMaster): - self.FlowMaster = FlowMaster + def __init__(self, flow_master): + self.flow_master = flow_master PatternMatchingEventHandler.__init__(self, ignore_directories=True, patterns=["*.py"]) - + self.context = ScriptContext(self.flow_master) + def on_modified(self, event=FileModifiedEvent): - self.FlowMaster.reload_scripts() - signals.status_message.send(message="script: <{0}> reloaded.".format(event.src_path)) + self.flow_master.reload_scripts() + self.context.log("script: <{}> reloaded.".format(event.src_path)) -def ObserveScripts(FlowMaster, path): +def observe_scripts(flow_master, path): script_dir = os.path.dirname(path) - event_handler = ScriptModified(FlowMaster) + event_handler = ScriptModified(flow_master) observer = Observer() observer.schedule(event_handler, script_dir) observer.start() -- cgit v1.2.3 From cd0b9e01be4041275165ab5e90b524ab0b3247f0 Mon Sep 17 00:00:00 2001 From: Matthew Shao Date: Fri, 13 Nov 2015 21:08:39 +0800 Subject: Decouple libmproxy.script from libmproxy.flow --- libmproxy/script.py | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'libmproxy/script.py') diff --git a/libmproxy/script.py b/libmproxy/script.py index 464ac4aa..b1ea83c8 100644 --- a/libmproxy/script.py +++ b/libmproxy/script.py @@ -6,7 +6,9 @@ import shlex import sys from watchdog.observers import Observer from watchdog.events import PatternMatchingEventHandler, FileModifiedEvent +import blinker +sig_script_change = blinker.Signal() class ScriptError(Exception): pass @@ -70,7 +72,7 @@ class Script: self.ctx = ScriptContext(master) self.ns = None self.load() - observe_scripts(master, self.args[0]) + self.observe_scripts() @classmethod def parse_command(cls, command): @@ -139,6 +141,13 @@ class Script: raise ScriptError(traceback.format_exc(e)) else: return None + + def observe_scripts(self): + script_dir = os.path.dirname(self.args[0]) + event_handler = ScriptModified(self) + observer = Observer() + observer.schedule(event_handler, script_dir) + observer.start() class ReplyProxy(object): @@ -199,19 +208,9 @@ def concurrent(fn): class ScriptModified(PatternMatchingEventHandler): - def __init__(self, flow_master): - self.flow_master = flow_master + def __init__(self, script): PatternMatchingEventHandler.__init__(self, ignore_directories=True, patterns=["*.py"]) - self.context = ScriptContext(self.flow_master) + self.script = script def on_modified(self, event=FileModifiedEvent): - self.flow_master.reload_scripts() - self.context.log("script: <{}> reloaded.".format(event.src_path)) - - -def observe_scripts(flow_master, path): - script_dir = os.path.dirname(path) - event_handler = ScriptModified(flow_master) - observer = Observer() - observer.schedule(event_handler, script_dir) - observer.start() + sig_script_change.send(self.script) -- cgit v1.2.3