Add 2 funcitions

whenyd · Nov 4, 2018 · c50f032 · c50f032
1 parent 0464d72
commit c50f032
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 6 deletions.
diff --git a/src/webui/_project.py b/src/webui/_project.py
@@ -187,6 +187,12 @@ def newLicense(args):
     output = os.path.join(path, 'licenses', title, 'license.lic')
     return dict(title=title, filename=output)
 
+def obfuscateScripts(args):
+    return args
+
+def generateLicenses(args):
+    return args
+
 if __name__ == '__main__':
     import doctest
     doctest.testmod()
diff --git a/src/webui/index.html b/src/webui/index.html
@@ -66,21 +66,21 @@
         <div class="panel-body">
           <form>
             <div class="form-group">
-              <label for="input_project_src">Src</label>
+              <label for="input_src">Source Path</label>
               <input type="text" class="form-control" id="input_src"/>
-              <p class="help-block">Required. Base path for MANIFEST.in to match files.</p>
+              <p class="help-block">Required. All the <code>.py</code> files in this path will be obfuscated recursively.</p>
             </div>
             <div class="form-group">
-              <label for="input_project_entry">Entry Script</label>
+              <label for="input_entry">Entry Script</label>
               <input type="text" class="form-control" id="input_entry"/>
               <p class="help-block">Filename of entry script, relative to Src path</p>
             </div>
             <div class="form-group">
-              <label for="input_project_output">Output</label>
+              <label for="input_output">Output</label>
               <input type="text" class="form-control" id="input_output"/>
               <p class="help-block">Where to save obfuscated scripts and runtime files</p>
             </div>
-            <button type="button" class="btn btn-primary btn-lg" id="obfuscate-scripts">Build</button>
+            <button type="button" class="btn btn-primary" id="obfuscate-scripts">Build</button>
           </form>
         </div>
         <!-- /.panel-body -->
@@ -118,7 +118,7 @@
               <input type="text" class="form-control" id="input_license_rcode"/>
               <p class="help-block">Identify string, for example, <em>Customer-Tom</em></p>
             </div>
-            <button type="button" class="btn btn-primary pull-right" id="generate-license">Generate</button>
+            <button type="button" class="btn btn-primary" id="generate-license">Generate</button>
           </form>
         </div>
         <!-- /.panel-body -->

diff --git a/src/webui/js/connector.js b/src/webui/js/connector.js
@@ -45,6 +45,14 @@ define(['settings', 'utils', 'demo'], function(settings, utils, demo) {
 
     return {
 
+        obfuscateScripts: function (args, callback) {
+            sendRequest('/obfuscateScripts', args, callback);
+        },
+
+        generateLicenses: function (args, callback) {
+            sendRequest('/generateLicenses', args, callback);
+        },
+
         newProject: function (callback) {
             sendRequest('/newProject', {}, callback);
         },

diff --git a/src/webui/js/main.js b/src/webui/js/main.js
@@ -7,6 +7,8 @@ define(['settings', 'utils', 'connector', 'project'], function (settings, utils,
                 && (e.target.parentElement.getAttribute('data-target') !== '#navbar-main-tab'))
                 document.getElementById('navbar-main-tab').classList.remove('in');
         }, false);
+        document.getElementById('obfuscate-scripts').addEventListener('click', project.obfuscateScripts, false);
+        document.getElementById('generate-licenses').addEventListener('click', project.generateLicenses, false);
     }
 
     // Project mode

diff --git a/src/webui/js/project.js b/src/webui/js/project.js
@@ -178,6 +178,41 @@ define(['connector', 'utils'], function(conn, utils) {
             conn.queryProject({ name: name }, _callback);
     }
 
+    function obfuscateScripts() {
+        var _callback = function (response) {
+            if (response.errcode) {
+                utils.showMessage(response.result);
+                return ;
+            }
+            var result = response.result;
+            utils.showMessage('Obfuscate scripts "' + result + '" OK.');
+        };
+        var args = {};
+        args.src = document.getElementById('input_src').value;
+        args.entry = document.getElementById('input_entry').value;
+        args.output = document.getElementById('input_output').value;
+        conn.obfuscateScripts(args, _callback);
+    }
+
+    function generateLicenses() {
+        var _callback = function (response) {
+            if (response.errcode) {
+                utils.showMessage(response.result);
+                return ;
+            }
+            var result = response.result;
+            utils.showMessage('Generate license "' + result + '" OK.');
+        };
+        var args = {};
+        args.expired = document.getElementById('input_expired_date').value;
+        args.bind_disk = document.getElementById('input_bind_disk').value;
+        args.bind_ipv4 = document.getElementById('input_bind_ipv4').value;
+        args.bind_mac = document.getElementById('input_bind_mac').value;
+        args.rcode = document.getElementById('input_license_rcode').value;
+        args.name = _project.name;
+        conn.obfuscateScripts(args, _callback);
+    }
+
     return {
         currentProject: _project,