Use rclone-api for rc calls

negative0 · negative0 · commit 686c3e4b6176 · 2020-06-14T14:43:45.000+05:30
Switch to rclone-api
diff --git a/package.json b/package.json
@@ -46,7 +46,8 @@
     "redux": "^4.0.5",
     "redux-thunk": "^2.3.0",
     "simple-line-icons": "^2.4.1",
-    "typescript": "^3.7.5"
+    "typescript": "^3.7.5",
+    "rclone-api": "^1.0.0"
   },
   "devDependencies": {
     "check-prop-types": "^1.1.2",
diff --git a/src/actions/configActions.js b/src/actions/configActions.js
@@ -1,30 +1,28 @@
-import axiosInstance from "../utils/API/API";
 import {GET_CONFIG_DUMP, GET_PROVIDERS, REQUEST_ERROR, REQUEST_SUCCESS} from "./types";
-import urls from "../utils/API/endpoint";
-
+import {getAllConfigDump, getAllProviders} from "rclone-api";
 
 /**
  * Gets all Providers from the rclone UI Backend
  * @returns {Function}
  */
 export const getProviders = () => dispatch => {
-    axiosInstance.post(urls.getProviders).then(res => dispatch({
+    getAllProviders().then(data => dispatch({
         type: GET_PROVIDERS,
-        payload: res.data.providers
+        payload: data.providers
     }))
 };
 /**
  * Gets dump of configured remotes from the rclone backend
  * @returns {Function}
  */
 export const getConfigDump = () => dispatch => {
-    axiosInstance.post(urls.getConfigDump).then(res => dispatch({
+    getAllConfigDump().then(res => dispatch({
         type: GET_CONFIG_DUMP,
         status: REQUEST_SUCCESS,
-        payload: res.data
+        payload: res
     }), error => dispatch({
         type: GET_CONFIG_DUMP,
         status: REQUEST_ERROR,
         payload: error
     }))
-};
+};
diff --git a/src/actions/explorerActions.js b/src/actions/explorerActions.js
@@ -1,52 +1,39 @@
-import axiosInstance from "../utils/API/API";
 import {
-	ADD_LAYOUT_CONTAINER,
-	CHANGE_ACTIVE_REMOTE_CONTAINER,
-	CHANGE_DISTRACTION_FREE_MODE,
-	CHANGE_LAYOUT_COLS,
-	GET_CONFIG_FOR_REMOTE,
-	GET_FILES_LIST,
-	GET_REMOTE_LIST,
-	REMOVE_LAYOUT_CONTAINER,
-	REQUEST_ERROR,
-	REQUEST_SUCCESS
+    ADD_LAYOUT_CONTAINER,
+    CHANGE_ACTIVE_REMOTE_CONTAINER,
+    CHANGE_DISTRACTION_FREE_MODE,
+    CHANGE_LAYOUT_COLS,
+    GET_CONFIG_FOR_REMOTE,
+    GET_FILES_LIST,
+    GET_REMOTE_LIST,
+    REMOVE_LAYOUT_CONTAINER,
+    REQUEST_ERROR,
+    REQUEST_SUCCESS
 } from "./types";
-import {addColonAtLast, isLocalRemoteName, makeUniqueID} from "../utils/Tools";
+import {makeUniqueID} from "../utils/Tools";
 import {createPath, removePath} from "./explorerStateActions";
-import urls from "../utils/API/endpoint";
+import {getAllRemoteNames, getFilesList, getRemoteInfo} from "rclone-api"
 
 /**
  * Gets the information regarding features, hashes from the rclone backend. Stores into redux store.
  * @param remoteName {string} The name of the remote
  * @returns {Function}
  */
 export const getFsInfo = (remoteName) => dispatch => {
-
-    let sentRemoteName;
-    let setRemoteName;
-
-    if (isLocalRemoteName(remoteName)) {
-        sentRemoteName = setRemoteName = "/";
-
-    } else {
-        setRemoteName = remoteName.split(':')[0];
-        sentRemoteName = addColonAtLast(setRemoteName);
-    }
     // console.log("Actual: ", sentRemoteName);
-    axiosInstance.post(urls.getFsInfo, {fs: sentRemoteName})
-        .then((res) => {
-                dispatch({
-                    type: GET_CONFIG_FOR_REMOTE,
-                    status: REQUEST_SUCCESS,
-                    payload: {[setRemoteName]: res.data},
-
-                })
-            },
-            error => dispatch({
+    getRemoteInfo(remoteName).then((res) => {
+            dispatch({
                 type: GET_CONFIG_FOR_REMOTE,
-                status: REQUEST_ERROR,
-                payload: error
-            }))
+                status: REQUEST_SUCCESS,
+                payload: {[remoteName.split(':')[0]]: res},
+
+            })
+        },
+        error => dispatch({
+            type: GET_CONFIG_FOR_REMOTE,
+            status: REQUEST_ERROR,
+            payload: error
+        }))
 
 };
 
@@ -61,10 +48,10 @@ export const getRemoteNames = () => {
         // console.log(state);
         if (!state.remote.remotes || state.remote.remotes.length < 1) {
 
-            axiosInstance.post(urls.listRemotes).then(res => dispatch({
+            getAllRemoteNames().then(res => dispatch({
                 type: GET_REMOTE_LIST,
                 status: REQUEST_SUCCESS,
-                payload: res.data.remotes
+                payload: res.remotes
             }), error => dispatch({
                 type: GET_REMOTE_LIST,
                 status: REQUEST_ERROR,
@@ -81,25 +68,12 @@ export const getRemoteNames = () => {
  * @returns {Function}
  */
 export const getFiles = (remoteName, remotePath) => dispatch => {
-    let newRemoteName = "";
     if (remoteName !== "") {
-        if (remoteName.indexOf('/') !== 0) {/*The name starts with a /: local Name*/
-            newRemoteName = addColonAtLast(remoteName);
-        } else {
-            newRemoteName = remoteName;
-        }
-
-
-        let data = {
-            fs: newRemoteName,
-            remote: remotePath
-        };
-
         const path = `${remoteName}-${remotePath}`;
-        axiosInstance.post(urls.getFilesList, data).then(res => dispatch({
+        getFilesList(remoteName, remotePath).then(res => dispatch({
                 type: GET_FILES_LIST,
                 status: REQUEST_SUCCESS,
-                payload: {path: path, filesList: res.data.list}
+                payload: {path: path, filesList: res.list}
             }),
             error => dispatch({
                 type: GET_FILES_LIST,
@@ -159,7 +133,7 @@ export const addRemoteContainer = (paneID) => (dispatch) => {
  * @returns {Function}
  */
 export const removeRemoteContainer = (containerID, paneID) => (dispatch) => {
-	dispatch(removePath(containerID));
+    dispatch(removePath(containerID));
     // console.log("Removing : " + containerID);
     dispatch({
         type: REMOVE_LAYOUT_CONTAINER,
diff --git a/src/actions/providerStatusActions.js b/src/actions/providerStatusActions.js
@@ -1,7 +1,6 @@
-import axiosInstance from "../utils/API/API";
 import {addColonAtLast, isLocalRemoteName} from "../utils/Tools";
 import {GET_REMOTE_ABOUT, REQUEST_ERROR, REQUEST_SUCCESS} from "../actions/types";
-import urls from "../utils/API/endpoint";
+import {getRemoteInfo} from "rclone-api";
 
 /**
  * Gets the information of a provider
@@ -29,13 +28,13 @@ export const getAbout = (containerID) => {
                 payload: {}
             });
 
-            axiosInstance.post(urls.getAbout, {fs: remoteName})
+            getRemoteInfo(remoteName)
                 .then((res) => {
                     dispatch({
                         type: GET_REMOTE_ABOUT,
                         status: REQUEST_SUCCESS,
                         id: containerID,
-                        payload: res.data
+                        payload: res
                     })
                 }, (res) => {
                     dispatch({
@@ -47,4 +46,4 @@ export const getAbout = (containerID) => {
                 })
         }
     }
-};
+};
diff --git a/src/actions/remoteOpsActions.js b/src/actions/remoteOpsActions.js
@@ -5,9 +5,8 @@ import {
     REQUEST_ERROR,
     REQUEST_SUCCESS
 } from './types';
-import axiosInstance from "../utils/API/API";
 import {toast} from "react-toastify";
-import urls from "../utils/API/endpoint";
+import {createNewPublicLink, getJobStatus} from "rclone-api";
 
 /**
  * Create a public link for a supported remote
@@ -17,11 +16,11 @@ import urls from "../utils/API/endpoint";
  */
 export const createPublicLink = (remoteName, remotePath) => {
     return (dispatch) => {
-        axiosInstance.post(urls.createPublicLink, {fs: remoteName, remote: remotePath}).then((res) =>
+        createNewPublicLink(remoteName, remotePath).then((res) =>
                 dispatch({
                     type: CREATE_PUBLIC_LINK,
                     status: REQUEST_SUCCESS,
-                    payload: res.data
+                    payload: res
                 }),
             (error) => {
                 dispatch({
@@ -42,11 +41,11 @@ export const createPublicLink = (remoteName, remotePath) => {
  */
 
 export const getRunningJobs = () => dispatch => {
-    axiosInstance.post(urls.getRunningJobs).then((res) => {
+    getRunningJobs().then((res) => {
             dispatch({
                 type: GET_RUNNING_JOBS,
                 status: REQUEST_SUCCESS,
-                payload: res.data
+                payload: res
             })
         },
         (err) => {
@@ -64,12 +63,12 @@ export const getRunningJobs = () => dispatch => {
  * @returns {Function}
  */
 export const getStatusForRunningJob = (jobId) => dispatch => {
-    axiosInstance.post(urls.getStatusForJob, {jobid: jobId}).then((res) => {
+    getJobStatus(jobId).then((res) => {
             dispatch({
                 type: GET_STATUS_FOR_RUNNING_JOB,
                 status: REQUEST_SUCCESS,
                 id: jobId,
-                payload: res.data
+                payload: res
             })
         },
         (err) => {
@@ -80,4 +79,4 @@ export const getStatusForRunningJob = (jobId) => dispatch => {
                 payload: err
             });
         })
-};
+};
diff --git a/src/actions/statusActions.js b/src/actions/statusActions.js
@@ -1,6 +1,5 @@
-import axiosInstance from "../utils/API/API";
 import {ENABLE_STATUS_CHECK, FETCH_STATUS, GET_BANDWIDTH, REQUEST_ERROR, REQUEST_SUCCESS, SET_BANDWIDTH} from "./types";
-import urls from "../utils/API/endpoint";
+import {getCurrentBandwidthSetting, getStats, setCurrentBandwidthSetting} from "rclone-api";
 
 /**
  * Gets the current status of the rclone backend.
@@ -11,10 +10,10 @@ export const getStatus = () => async (dispatch, getState) => {
     // console.log("get Status");
     const {status} = getState();
     if (status.checkStatus) {
-        axiosInstance.post(urls.stats).then(res => dispatch({
+        getStats().then(res => dispatch({
             type: FETCH_STATUS,
             status: REQUEST_SUCCESS,
-            payload: res.data
+            payload: res
         }), error => dispatch({
             type: FETCH_STATUS,
             status: REQUEST_ERROR,
@@ -43,10 +42,10 @@ export const enableCheckStatus = (shouldEnable) => async dispatch => {
  */
 export const getBandwidth = () => async dispatch => {
     // console.log("get Status");
-    axiosInstance.post(urls.bwlimit).then(res => dispatch({
+    getCurrentBandwidthSetting().then(res => dispatch({
         type: GET_BANDWIDTH,
         status: REQUEST_SUCCESS,
-        payload: res.data
+        payload: res
     }), error => dispatch({
         type: GET_BANDWIDTH,
         status: REQUEST_ERROR,
@@ -61,10 +60,10 @@ export const getBandwidth = () => async dispatch => {
  */
 export const setBandwidth = (newRate) => async dispatch => {
     // console.log("get Status");
-    axiosInstance.post(urls.bwlimit, {rate: newRate}).then(res => dispatch({
+    setCurrentBandwidthSetting(newRate).then(res => dispatch({
         type: SET_BANDWIDTH,
         status: REQUEST_SUCCESS,
-        payload: res.data
+        payload: res
     }), error => dispatch({
         type: SET_BANDWIDTH,
         status: REQUEST_ERROR,
diff --git a/src/actions/versionActions.js b/src/actions/versionActions.js
@@ -1,22 +1,21 @@
-import axiosInstance from '../utils/API/API';
-import urls from '../utils/API/endpoint';
-import { GET_VERSION, REQUEST_SUCCESS, REQUEST_ERROR } from './types';
+import {GET_VERSION, REQUEST_ERROR, REQUEST_SUCCESS} from './types';
+import {getRcloneVersion} from "rclone-api";
 
 export const getVersion = () => {
-  return dispatch => {
-    axiosInstance.post(urls.getRcloneVersion).then(
-      res =>
-        dispatch({
-          type: GET_VERSION,
-          status: REQUEST_SUCCESS,
-          payload: res.data
-        }),
-      error =>
-        dispatch({
-          type: GET_VERSION,
-          status: REQUEST_ERROR,
-          payload: error
-        })
-    );
-  };
+    return dispatch => {
+        getRcloneVersion().then(
+            res =>
+                dispatch({
+                    type: GET_VERSION,
+                    status: REQUEST_SUCCESS,
+                    payload: res
+                }),
+            error =>
+                dispatch({
+                    type: GET_VERSION,
+                    status: REQUEST_ERROR,
+                    payload: error
+                })
+        );
+    };
 };
diff --git a/src/views/Base/FileOperations/FileOperations.js b/src/views/Base/FileOperations/FileOperations.js
diff --git a/src/views/Explorer/FilesView/FilesView.js b/src/views/Explorer/FilesView/FilesView.js
