Prechádzať zdrojové kódy

Fix issue where multiple spaces in tc output would screw up parsing

Alex Meuer 7 rokov pred
rodič
commit
5cdf12b07e
2 zmenil súbory, kde vykonal 24 pridanie a 19 odobranie
  1. 7 7
      main.py
  2. 17 12
      templates/main.html

+ 7 - 7
main.py

@@ -89,7 +89,7 @@ def get_active_rules():
     rules = []
     dev = set()
     for line in lines:
-        arguments = line.split(' ')
+        arguments = line.split()
         rule = parse_rule(arguments)
         if rule['name'] and rule['name'] not in dev:
             rules.append(rule)
@@ -126,18 +126,18 @@ def parse_rule(split_rule):
             rule['rate'] = split_rule[i + 1].split('Mbit')[0]
         elif argument == 'delay':
             rule['delay'] = split_rule[i + 1]
-            if 'ms' in split_rule[i+2]:
-                rule['delayVariance'] = split_rule[i+2];
+            if 'ms' in split_rule[i + 2]:
+                rule['delayVariance'] = split_rule[i + 2]
         elif argument == 'loss':
             rule['loss'] = split_rule[i + 1]
-            if '%' in split_rule[i+2]:
-                rule['lossCorrelation'] = split_rule[i+2]
+            if '%' in split_rule[i + 2]:
+                rule['lossCorrelation'] = split_rule[i + 2]
         elif argument == 'duplicate':
             rule['duplicate'] = split_rule[i + 1]
         elif argument == 'reorder':
             rule['reorder'] = split_rule[i + 1]
-            if '%' in split_rule[i+2]:
-                rule['reorderCorrelation'] = split_rule[i+2]
+            if '%' in split_rule[i + 2]:
+                rule['reorderCorrelation'] = split_rule[i + 2]
         elif argument == 'corrupt':
             rule['corrupt'] = split_rule[i + 1]
         i += 1

+ 17 - 12
templates/main.html

@@ -21,39 +21,39 @@
                     </tr>
                     <tr>
                         <td>Rate:</td>
-                        <td>{{ rule['rate'] }}</td>
-                        <td><input type="text" name="Rate" size="5"> Mbit</td>
+			<td>{{ rule['rate'] }}</td>
+                        <td><input type="number" name="Rate" size="5"> Mbit</td>
                     </tr>
                     <tr>
                         <td>Delay:</td>
                         <td>{{ rule['delay'] }}</td>
-                        <td><input type="text" name="Delay" size="5"> ms</td>
-                        <td>{{ rule['delayVariance'] }}</td>
-                        <td>±<input type="text" name="DelayVariance" size="5"> ms</td>
+                        <td><input type="number" name="Delay" size="5"> ms</td>
+                        <td>±{{ rule['delayVariance'] }}</td>
+                        <td>±<input type="number" name="DelayVariance" size="5"> ms</td>
                     </tr>
                     <tr>
                         <td>Loss:</td>
                         <td>{{ rule['loss'] }}</td>
-                        <td><input type="text" name="Loss" size="5"> %</td>
+                        <td><input type="number" name="Loss" size="5"> %</td>
                         <td>{{ rule['lossCorrelation'] }}</td>
-                        <td><input type="text" name="LossCorrelation" size="5"> %</td>
+                        <td><input type="number" name="LossCorrelation" size="5"> %</td>
                     </tr>
                     <tr>
                         <td>Duplicate:</td>
                         <td>{{ rule['duplicate'] }}</td>
-                        <td><input type="text" name="Duplicate" size="5"> %</td>
+                        <td><input type="number" name="Duplicate" size="5"> %</td>
                     </tr>
                     <tr>
                         <td>Reorder:</td>
                         <td>{{ rule['reorder'] }}</td>
-                        <td><input type="text" name="Reorder" size="5"> %</td>
+                        <td><input type="number" name="Reorder" size="5"> %</td>
                         <td>{{ rule['reorderCorrelation'] }}</td>
-                        <td><input type="text" name="ReorderCorrelation" size="5"> %</td>
+                        <td><input type="number" name="ReorderCorrelation" size="5"> %</td>
                     </tr>
                     <tr>
                         <td>Corrupt</td>
                         <td>{{ rule['corrupt'] }}</td>
-                        <td><input type="text" name="Corrupt" size="5"> %</td>
+                        <td><input type="number" name="Corrupt" size="5"> %</td>
                     </tr>
                 </table>
                 <input type="submit" value="Apply Rules">
@@ -64,5 +64,10 @@
         </li>
     {% endfor %}
 </ul>
+<style>
+    th,td {
+        text-align: center;
+    }
+</style>
 </body>
-</html>
+</html>