whistle 2.9.19 → 2.9.22

package/.gitattributes

@@ -0,0 +1 @@
+biz/webui/htdocs/js/index.js diff=nodiff

package/bin/use.js

@@ -145,10 +145,12 @@ module.exports = function(filepath, storage, force) {
           error('The rules cannot be empty and the size cannot exceed 256k.');
           return;
         }
+        var groupName = getString(result.groupName) || getString(result.group);
         var setRules = function() {
           var body = [
             'name=' + encodeURIComponent(name),
-            'rules=' + encodeURIComponent(rules)
+            'rules=' + encodeURIComponent(rules),
+            'groupName=' + encodeURIComponent(groupName.trim())
           ].join('&');
           request(body, function() {
             info('Setting whistle (' + (options.host || '127.0.0.1') + ':' + port + ') rules successful.');

package/biz/webui/cgi-bin/rules/add.js

@@ -1,12 +1,20 @@
 var rules = require('../../../../lib/rules/util').rules;
 var recycleBin = require('../../../../lib/rules/util').rules.recycleBin;
+var isGroup = require('../../../../lib/util/common').isGroup;
 
 module.exports = function(req, res) {
   var body = req.body;
   var list;
-  rules.add(body.name, body.value, body.clientId);
-  if (body.addToTop) {
-    rules.moveToTop(body.name, body.clientId);
+  var exists = rules.exists(body.name);
+  if (rules.add(body.name, body.value, body.clientId) != null && !isGroup(body.name)) {
+    if (body.groupName) {
+      rules.moveToGroup(body.name, body.groupName, body.addToTop);
+    } else if (body.addToTop) {
+      rules.moveToTop(body.name, body.clientId);
+    } else if (!exists) {
+      var group = rules.getFirstGroup();
+      group && rules.moveTo(body.name, group.name, body.clientId);
+    }
   }
   if (req.body.recycleFilename) {
     recycleBin.remove(req.body.recycleFilename);

package/biz/webui/cgi-bin/rules/move-to.js

@@ -2,6 +2,6 @@ var rules = require('../../../../lib/rules/util').rules;
 
 module.exports = function(req, res) {
   var body = req.body;
-  var result = rules.moveTo(body.from, body.to, body.clientId);
+  var result = rules.moveTo(body.from, body.to, body.clientId, body.group === 'true', body.toTop === 'true');
   res.json({ec: result ? 0 : 2, em: 'success'});
 };

package/biz/webui/cgi-bin/rules/project.js

@@ -1,20 +1,37 @@
 var rules = require('../../../../lib/rules/util').rules;
 
+var DEFAULT_GROUP = '\rothers';
+
 module.exports = function(req, res) {
   var body = req.body;
-  var name = body.name;
+  var name = typeof body.name === 'string' ? body.name.trim() : null;
+  if (!name) {
+    return res.json({ ec: 0 });
+  }
   var rulesText = body.rules || body.value;
   if (!rulesText || !name || typeof rulesText !== 'string') {
     if (body.enable == 1) {
       rules.select(name);
     }
-    if (body.top == 1) {
+    return res.json({ ec: 0, rules: !!rules.get(name) });
+  }
+  if (rules.add(name, rulesText) != null) {
+    var groupName = typeof body.groupName === 'string' ? body.groupName.trim() : '';
+    rules.select(name);
+    if (groupName) {
+      groupName = '\r' + groupName;
+      var group = rules.getFirstGroup();
+      if (rules.add(groupName) != null) {
+        if (!group && groupName !== DEFAULT_GROUP) {
+          rules.add(DEFAULT_GROUP);
+          rules.moveToTop(DEFAULT_GROUP);
+        }
+        rules.moveToGroup(name, groupName, true);
+        rules.moveGroupToTop(groupName);
+      }
+    } else {
       rules.moveToTop(name);
     }
-    return res.json({ ec: 0, rules: !!rules.get(name) });
   }
-  rules.add(name, rulesText);
-  rules.select(name);
-  rules.moveToTop(name);
   res.json({ ec: 0 });
 };

package/biz/webui/cgi-bin/values/add.js

@@ -1,10 +1,19 @@
 var values = require('../../../../lib/rules/util').values;
 var recycleBin = require('../../../../lib/rules/util').values.recycleBin;
+var isGroup = require('../../../../lib/util/common').isGroup;
 
 module.exports = function(req, res) {
   var body = req.body;
   var list;
-  values.add(body.name, body.value, body.clientId);
+  var exists = values.exists(body.name);
+  if (values.add(body.name, body.value, body.clientId) != null && !isGroup(body.name)) {
+    if (body.groupName) {
+      values.moveToGroup(body.name, body.groupName);
+    } else if (!exists) {
+      var group = values.getFirstGroup();
+      group && values.moveTo(body.name, group.name, body.clientId);
+    }
+  }
   if (req.body.recycleFilename) {
     recycleBin.remove(req.body.recycleFilename);
     list = recycleBin.list();

package/biz/webui/cgi-bin/values/move-to.js

@@ -2,6 +2,6 @@ var values = require('../../../../lib/rules/util').values;
 
 module.exports = function(req, res) {
   var body = req.body;
-  var result = values.moveTo(body.from, body.to, body.clientId);
+  var result = values.moveTo(body.from, body.to, body.clientId, body.group === 'true');
   res.json({ec: result ? 0 : 2, em: 'success'});
 };

package/biz/webui/htdocs/index.html

@@ -8,6 +8,6 @@
 </head>
 <body style="overscroll-behavior-x: none;">
 <div id="container" class="main"></div>
-<script src="js/index.js?v=2.9.19"></script>
+<script src="js/index.js?v=2.9.22"></script>
 </body>
 </html>