Skip to content

Commit e725042

Browse files
committed
change checkmount
1 parent 2d1384d commit e725042

File tree

2 files changed

+31
-20
lines changed

2 files changed

+31
-20
lines changed

tools.js

+30-16
Original file line numberDiff line numberDiff line change
@@ -149,27 +149,41 @@ function trackDevices(){
149149
})
150150
}
151151

152-
async function checkMount(){
152+
// async function checkMount(){
153+
// console.log("checkMount()")
154+
// try {
155+
// await fsPromise.readdir(`${mountFolder}`);
156+
// list = await getDir(`${mountFolder}`);
157+
// if (list.length > 0) {
158+
// global.mounted = true
159+
// updateRcloneProgress();
160+
// return true
161+
// }
162+
// global.mounted = false
163+
// return false;
164+
// }
165+
// catch (e) {
166+
// console.log("entering catch block");
167+
// console.log(e);
168+
// console.log("leaving catch block");
169+
// global.mounted = false
170+
// return false
171+
// }
172+
// return false;
173+
// }
174+
175+
async function checkMount() {
153176
console.log("checkMount()")
154177
try {
155-
await fsPromise.readdir(`${mountFolder}`);
156-
list = await getDir(`${mountFolder}`);
157-
if (list.length > 0) {
158-
global.mounted = true
159-
updateRcloneProgress();
160-
return true
161-
}
178+
const resp = await fetch("http://127.0.0.1:5572/rc/noop", {
179+
method: "post",
180+
});
181+
global.mounted = resp.ok
182+
return resp.ok
183+
} catch (e) {
162184
global.mounted = false
163185
return false;
164186
}
165-
catch (e) {
166-
console.log("entering catch block");
167-
console.log(e);
168-
console.log("leaving catch block");
169-
global.mounted = false
170-
return false
171-
}
172-
return false;
173187
}
174188

175189
async function checkDeps(){

views/layout.twig

+1-4
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,9 @@
111111
112112
ipcRenderer.on('rclone_data', (event, arg) => {
113113
data=arg;
114-
//console.log(arg)
115114
if(data.transferring && data.transferring.length > 0) {
116-
$("#progressstatus").text(data.transferring[0].percentage + "% - " + formatBytes(data.transferring[0].speedAvg) + "/s" + " - " + formatEta(data.transferring[0].eta));
117115
$(".mountcopystatus").text("(Downloading: "+data.transferring[0].percentage + "% - " + formatBytes(data.transferring[0].speedAvg) + "/s" + " - " + formatEta(data.transferring[0].eta) + ")");
118116
} else {
119-
$("#progressstatus").text("CONNECTED");
120117
$(".mountcopystatus").text('')
121118
}
122119
});
@@ -191,7 +188,7 @@
191188
$("#mountbtn").removeClass("btn-warning");
192189
$("#mountbtn").removeClass("btn-danger");
193190
$("#mountbtn").addClass("btn-success");
194-
$("#mountbtn").html(`<i id="mountrefresh" class="fa fa-check-circle-o"></i> | Mount status:</br><span id="progressstatus"></span>`)
191+
$("#mountbtn").html(`<i id="mountrefresh" class="fa fa-check-circle-o"></i> | Mount status:</br>Connected.`)
195192
$("#mountbtn").onclick = function() {return false;}
196193
} else {
197194
$("#mountrefresh").removeClass("fa-spin");

0 commit comments

Comments
 (0)