Reorg to put web app in its own directory

20 files changed, 4 insertions, 3 deletions

diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index d263ccdd..c4cbb36a 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -9,7 +9,8 @@ import flask
 import requests
 from netlib import odict, wsgi
 import netlib.http
-from . import controller, protocol, tnetstring, filt, script, version, app
+from . import controller, protocol, tnetstring, filt, script, version
+from .web import app
 from .protocol import http, handle
 from .proxy.config import parse_host_pattern
 
@@ -727,7 +728,7 @@ class FlowMaster(controller.Master):
             self.stream_large_bodies.run(f, False)
 
         f.reply()
-        return f        
+        return f
 
     def handle_response(self, f):
         self.state.add_response(f)
diff --git a/libmproxy/web/__init__.py b/libmproxy/web/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/libmproxy/web/__init__.py
diff --git a/libmproxy/app.py b/libmproxy/web/app.py
index ed7ec72a..9b5db38a 100644
--- a/libmproxy/app.py
+++ b/libmproxy/web/app.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 import flask
 import os
-from .proxy import config
+from ..proxy import config
 
 mapp = flask.Flask(__name__)
 mapp.debug = True
diff --git a/libmproxy/static/bootstrap.min.css b/libmproxy/web/static/bootstrap.min.css
index f31489f9..f31489f9 100644
--- a/libmproxy/static/bootstrap.min.css
+++ b/libmproxy/web/static/bootstrap.min.css
diff --git a/libmproxy/static/bootstrap.min.js b/libmproxy/web/static/bootstrap.min.js
index 1a6258ef..1a6258ef 100644
--- a/libmproxy/static/bootstrap.min.js
+++ b/libmproxy/web/static/bootstrap.min.js
diff --git a/libmproxy/static/fontawesome/css/font-awesome.css b/libmproxy/web/static/fontawesome/css/font-awesome.css
index 048cff97..048cff97 100644
--- a/libmproxy/static/fontawesome/css/font-awesome.css
+++ b/libmproxy/web/static/fontawesome/css/font-awesome.css
diff --git a/libmproxy/static/fontawesome/css/font-awesome.min.css b/libmproxy/web/static/fontawesome/css/font-awesome.min.css
index 449d6ac5..449d6ac5 100644
--- a/libmproxy/static/fontawesome/css/font-awesome.min.css
+++ b/libmproxy/web/static/fontawesome/css/font-awesome.min.css
diff --git a/libmproxy/static/fontawesome/fonts/FontAwesome.otf b/libmproxy/web/static/fontawesome/fonts/FontAwesome.otf
index 8b0f54e4..8b0f54e4 100644
--- a/libmproxy/static/fontawesome/fonts/FontAwesome.otf
+++ b/libmproxy/web/static/fontawesome/fonts/FontAwesome.otf
diff --git a/libmproxy/static/fontawesome/fonts/fontawesome-webfont.eot b/libmproxy/web/static/fontawesome/fonts/fontawesome-webfont.eot
index 7c79c6a6..7c79c6a6 100755
--- a/libmproxy/static/fontawesome/fonts/fontawesome-webfont.eot
+++ b/libmproxy/web/static/fontawesome/fonts/fontawesome-webfont.eot
diff --git a/libmproxy/static/fontawesome/fonts/fontawesome-webfont.svg b/libmproxy/web/static/fontawesome/fonts/fontawesome-webfont.svg
index 45fdf338..45fdf338 100755
--- a/libmproxy/static/fontawesome/fonts/fontawesome-webfont.svg
+++ b/libmproxy/web/static/fontawesome/fonts/fontawesome-webfont.svg
diff --git a/libmproxy/static/fontawesome/fonts/fontawesome-webfont.ttf b/libmproxy/web/static/fontawesome/fonts/fontawesome-webfont.ttf
index e89738de..e89738de 100755
--- a/libmproxy/static/fontawesome/fonts/fontawesome-webfont.ttf
+++ b/libmproxy/web/static/fontawesome/fonts/fontawesome-webfont.ttf
diff --git a/libmproxy/static/fontawesome/fonts/fontawesome-webfont.woff b/libmproxy/web/static/fontawesome/fonts/fontawesome-webfont.woff
index 8c1748aa..8c1748aa 100755
--- a/libmproxy/static/fontawesome/fonts/fontawesome-webfont.woff
+++ b/libmproxy/web/static/fontawesome/fonts/fontawesome-webfont.woff
diff --git a/libmproxy/static/jquery-1.10.1.min.js b/libmproxy/web/static/jquery-1.10.1.min.js
index e407e769..e407e769 100644
--- a/libmproxy/static/jquery-1.10.1.min.js
+++ b/libmproxy/web/static/jquery-1.10.1.min.js
diff --git a/libmproxy/static/jquery.localscroll-min.js b/libmproxy/web/static/jquery.localscroll-min.js
index 3f8d64cc..3f8d64cc 100644
--- a/libmproxy/static/jquery.localscroll-min.js
+++ b/libmproxy/web/static/jquery.localscroll-min.js
diff --git a/libmproxy/static/jquery.scrollTo-min.js b/libmproxy/web/static/jquery.scrollTo-min.js
index 7d4001dc..7d4001dc 100644
--- a/libmproxy/static/jquery.scrollTo-min.js
+++ b/libmproxy/web/static/jquery.scrollTo-min.js
diff --git a/libmproxy/static/mitmproxy.css b/libmproxy/web/static/mitmproxy.css
index b390976a..b390976a 100644
--- a/libmproxy/static/mitmproxy.css
+++ b/libmproxy/web/static/mitmproxy.css
diff --git a/libmproxy/templates/certs.html b/libmproxy/web/templates/certs.html
index d30f23a3..d30f23a3 100644
--- a/libmproxy/templates/certs.html
+++ b/libmproxy/web/templates/certs.html
diff --git a/libmproxy/templates/frame.html b/libmproxy/web/templates/frame.html
index b5c5c67c..b5c5c67c 100644
--- a/libmproxy/templates/frame.html
+++ b/libmproxy/web/templates/frame.html
diff --git a/libmproxy/templates/index.html b/libmproxy/web/templates/index.html
index 50cfd5db..50cfd5db 100644
--- a/libmproxy/templates/index.html
+++ b/libmproxy/web/templates/index.html
diff --git a/libmproxy/templates/layout.html b/libmproxy/web/templates/layout.html
index 9c8721d8..9c8721d8 100644
--- a/libmproxy/templates/layout.html
+++ b/libmproxy/web/templates/layout.html