again change folder structure

MissiaL · MissiaL · commit 8d9bea367a0a · 2015-05-15T17:23:54.000+03:00
diff --git a/config_monitoring.py b/config_monitoring.py
@@ -2,5 +2,7 @@
 port = 5555
 title = 'title Monitoring'
 database = 'monitoring.db'
+svn_login = ''
+svn_password = ''
 
 DEBUG = True
diff --git a/db.py b/db.py
@@ -2,9 +2,10 @@
 import time
 import configparser
 
-from scripts.parse import Parser
+from parse import Parser
 from config_monitoring import database
 
+
 class Database:
     def __init__(self, name):
         config = configparser.ConfigParser()
diff --git a/merger.py b/merger.py
@@ -4,17 +4,18 @@
 import os
 from shutil import rmtree
 import time
-from urllib.parse import urlparse
 import subprocess as sp
 from subprocess import PIPE
 import tempfile
 import pysvn
 
+from urllib.parse import urlparse
+from config_monitoring import svn_login, svn_password
 
 class SvnClient:
     def __init__(self):
-        self.login = ''
-        self.password = ''
+        self.login = svn_login
+        self.password = svn_password
         self.timeout = 300
 
     def connect(self):
diff --git a/parse.py b/parse.py
@@ -7,7 +7,7 @@
 from lxml import html
 import lxml
 
-from scripts import ping
+import ping
 
 
 class Parser:
diff --git a/ping.py b/ping.py
diff --git a/server.py b/server.py
@@ -2,12 +2,12 @@
 import itertools
 import os
 import sys
-import subprocess
 
-from flask import Flask, render_template, redirect, jsonify, request, Response, url_for
+from flask import Flask, render_template, redirect, jsonify, request, Response, url_for, abort
+
 from config_monitoring import host, port, title, database
+import db
 
-from scripts import db
 # from scripts import merger
 # from scripts.testbranch import downloadSource
 
@@ -71,13 +71,15 @@ def index_merge():
     return render_template('merge_template.html', buttons=buttons)
 
 
-@app.route('/<action>', methods=['POST'])
-def merge(action):
-    buttons = dtb.read_button()
-    for data in buttons:
-        if action == data[0]:
-            out = svn.mergeGo(data[1])
-            return render_template('merge_result.html', out=out)
+@app.route('/buttons', methods=['POST'])
+def merge():
+    buttons = [i[0] for i in dtb.read_button()]
+    input_name = [key for key in dict(request.form).keys()]
+    input_name = input_name[0]
+    if input_name in buttons:
+        # out = svn.mergeGo(input_name)
+        out = 'svn'
+        return render_template('merge_result.html', out=out)
     else:
         return redirect('/')
 
@@ -134,6 +136,13 @@ def events():
         return Response(events(), content_type='text/event-stream')
     return redirect(url_for('static', filename='mergeout.html'))
 
+# @app.route('/login')
+# def login():
+#     abort(404)
+#
+# @app.errorhandler(404)
+# def page_not_found(error):
+#     return render_template('branch.html'), 404
 
 if __name__ == '__main__':
     app.run(host=host, port=port)
diff --git a/static/css/merge.css b/static/css/merge.css
@@ -0,0 +1,7 @@
+div#loading {
+    width: 35px;
+    height: 35px;
+    display: none;
+    background: url(/static/img/loader.gif) no-repeat;
+    cursor: wait;
+    }
diff --git a/static/css/style.css b/static/css/style.css
@@ -30,3 +30,11 @@ input, label {
     float:left;
     margin:5px;
 }
+
+div#loading {
+    width: 35px;
+    height: 35px;
+    display: none;
+    background: url(/static/img/loader.gif) no-repeat;
+    cursor: wait;
+    }
diff --git a/static/img/loader.gif b/static/img/loader.gif
diff --git a/templates/index.html b/templates/index.html
@@ -4,9 +4,15 @@
     <title>Страница автотестирования</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-    <script src="templates/js/script.js"></script>
+    <script src="static/js/script.js"></script>
     <link rel="stylesheet" href="static/css/style.css" type="text/css">
     <link href="static/css/bootstrap.min.css" rel="stylesheet" media="screen">
+    <!--<script type="text/javascript">-->
+            <!--function loading(){-->
+                <!--$("#loading").show();-->
+                <!--$("#content").hide();-->
+            <!--}-->
+    <!--</script>-->
 </head>
 <body>
 <div class="container-fluid">
@@ -106,14 +112,14 @@
                 </div>
                 <div class="merge">
                     <p class="text-center"><strong>Кнопки мержа</strong></p>
-
-                    <div>
+                    <div id="loading"></div>
+                    <div id="content">
                         {% for button in buttons %}
-                        <form role="form" action="{{ ''.join([button[0]]) }}" target="_blank" method="post">
+                        <form role="form" action="buttons" target="_blank" method="post">
                             <div class="form-group">
-                                <input class="btn btn-default" type="submit" value="{{ ''.join([button[0]]) }}"
+                                <input name="{{ ''.join([button[0]]) }}" class="btn btn-default" type="submit" value="{{ ''.join([button[0]]) }}"
                                        title="{{ ''.join([button[1]]) }}"
-                                       style="width:150px;"/>
+                                       style="width:150px;">
                             </div>
                         </form>
                         {% endfor %}
diff --git a/testbranch.py b/testbranch.py
@@ -1,7 +1,7 @@
 import tempfile
 import sqlite3
 
-from scripts.merger import SvnClient
+from merger import SvnClient
 
 
 svn = SvnClient()
