Accept new form of download:upload limit for bwlimit. Fixes #120

rclone · Feb 21, 2021 · 9ed0e9e · 9ed0e9e
1 parent 46983b3
commit 9ed0e9e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/src/views/Base/BandwidthStatusCard/BandwidthStatusCard.js b/src/views/Base/BandwidthStatusCard/BandwidthStatusCard.js
@@ -36,13 +36,15 @@ class BandwidthStatusCard extends React.Component {
         const {bandwidthText, hasError} = this.state;
         if (!hasError) {
             const {setBandwidth} = this.props;
-            if (bandwidthText)
+            if (bandwidthText) {
                 setBandwidth(bandwidthText);
+                this.toggleShowChangeBandwidth();
+            }
             else {
                 setBandwidth("0M");
             }
         } else {
-            toast.error("Error in form");
+            toast.error("Please check the errors before submitting");
         }
     };
 
@@ -53,10 +55,22 @@ class BandwidthStatusCard extends React.Component {
      */
     changeBandwidthInput = (e) => {
         const inputValue = e.target.value;
-        const validateInput = validateSizeSuffix(inputValue);
+        let validateInput = false;
+        if (inputValue === "") {
+            validateInput = true;
+        } else if (inputValue) {
+            const splitValue = inputValue.split(":");
+            if(splitValue.length === 1) {
+                validateInput = validateSizeSuffix(splitValue[0]);
+            }else if(splitValue.length === 2) {
+                const validateDownloadLimit = validateSizeSuffix(splitValue[0]);
+                const validateUploadLimit = validateSizeSuffix(splitValue[1]);
+                validateInput = validateDownloadLimit && validateUploadLimit;
+            }
+        }
         this.setState({
             bandwidthText: inputValue,
-            hasError: (inputValue !== "" ? !validateInput : false)
+            hasError: !validateInput
         })
     };
 
@@ -94,15 +108,14 @@ class BandwidthStatusCard extends React.Component {
                 </p>
                 <Form onSubmit={this.setBandwidth} className={showChangeBandwidth ? "" : "d-none"}>
                     <FormGroup row>
-                        <Label for="bandwidthValue" sm={5}>Enter new max speed</Label>
+                        <Label for="bandwidthValue" sm={5}>Enter new max speed (upload:download)</Label>
                         <Col sm={7}>
                             <Input type="text" value={bandwidthText}
                                     valid={!hasError} invalid={hasError}
                                     id="bandwidthValue" onChange={this.changeBandwidthInput}>
                             </Input>
                             <FormFeedback valid>Keep empty to reset.</FormFeedback>
-                            <FormFeedback>The bandwidth should be of the form 1M|2M|1G|1K|1.1K
-                                etc</FormFeedback>
+                            <FormFeedback>The bandwidth should be of the form 1M|2M|1G|1K|1.1K etc. Can also be specified as (upload:download)</FormFeedback>
 
                         </Col>
                     </FormGroup>

diff --git a/src/views/Base/BandwidthStatusCard/__snapshots__/BandwidthStatusCard.test.js.snap b/src/views/Base/BandwidthStatusCard/__snapshots__/BandwidthStatusCard.test.js.snap
@@ -54,7 +54,7 @@ exports[`Bandwidth Status Card should match snapshot 1`] = `
             ]
           }
         >
-          Enter new max speed
+          Enter new max speed (upload:download)
         </Label>
         <Col
           sm={7}
@@ -86,7 +86,7 @@ exports[`Bandwidth Status Card should match snapshot 1`] = `
           <FormFeedback
             tag="div"
           >
-            The bandwidth should be of the form 1M|2M|1G|1K|1.1K etc
+            The bandwidth should be of the form 1M|2M|1G|1K|1.1K etc. Can also be specified as (upload:download)
           </FormFeedback>
         </Col>
       </FormGroup>