ITwrxOrg/EZ-Bkup
ITwrxOrg
/
EZ-Bkup
Template
2
0
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases 4 Wiki Activity

threads attempt

This commit is contained in:
itwrx 2023-06-27 11:23:34 -05:00
parent 3c0a8afe80
commit d63fe83a91
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
views/routine_list.nim
View File

@ -4,7 +4,9 @@ EZ-Bkup is released under the General Public License 3.0.
See COPYING or <https://www.gnu.org/licenses/> for details.]# See COPYING or <https://www.gnu.org/licenses/> for details.]#
import owlkettle import owlkettle
import std/osproc import std/osproc, std/os
#import asynctools
#import threadpool
import edit_routine_dialog import edit_routine_dialog
import "../models/routine", "../shared" import "../models/routine", "../shared"
@ -12,9 +14,19 @@ viewable RoutineList:
## Displays a list of routines ## Displays a list of routines
routineModel: RoutineModel ## Model of all routines routineModel: RoutineModel ## Model of all routines
runStatus: string runStatus: string
rsyncRun: tuple[output: string, exitCode: int]
proc changed(state: bool) proc changed(state: bool)
var thread: Thread[RoutineListState]
#var rsyncRun: tuple[output: string, exitCode: int]
proc rsyncThread(list: RoutineListState, rsyncCommand: string) {.thread.} =
while true:
list.rsyncRun = execCmdEx(rsyncCommand)
list.redrawFromThread()
sleep(1000)
method view(list: RoutineListState): Widget {.locks: "unknown".} = method view(list: RoutineListState): Widget {.locks: "unknown".} =
result = gui: result = gui:
ScrolledWindow: ScrolledWindow:
@ -138,7 +150,7 @@ method view(list: RoutineListState): Widget {.locks: "unknown".} =
useMarkup = true useMarkup = true
proc clicked() = proc clicked() =
list.runStatus = "<span color=\"#FFE97B\" size=\"large\">Running Bkup...</span>" list.runStatus = "<span color=\"#FFE97B\" size=\"large\">Running Bkup...</span>"
var rsyncRun: tuple[output: string, exitCode: int] #var rsyncRun: tuple[output: string, exitCode: int]
var rsyncErrors: seq[string] var rsyncErrors: seq[string]
var routineRunCount = 0 var routineRunCount = 0
for routine in list.routineModel.routineSeq(): for routine in list.routineModel.routineSeq():
@ -151,18 +163,29 @@ method view(list: RoutineListState): Widget {.locks: "unknown".} =
for destination in routine.destinations: for destination in routine.destinations:
list.runStatus = "<span color=\"#FFE97B\" size=\"large\">Bkup " & source & " to " & destination & "...</span>" list.runStatus = "<span color=\"#FFE97B\" size=\"large\">Bkup " & source & " to " & destination & "...</span>"
#try without requiring superuser privs by default. #try without requiring superuser privs by default.
rsyncRun = execCmdEx("rsync -aq " & source & " " & destination) #rsyncRun = execCmdEx("rsync -aq " & source & " " & destination)
if rsyncRun.exitCode != 0: let rsyncRunCmd = "rsync -aq " & source & " " & destination
#let rsyncThreadProcCall = rsyncThread(rsyncRunCmd)
createThread(thread, rsyncThread(list, rsyncRunCmd), list)
#createThread(thread, rsyncThreadProcCall, list)
#rsyncRun = spawn execCmdEx("rsync -aq " & source & " " & destination)
#sync()
#rsyncRun = await asynctools.execProcess("rsync -aq " & source & " " & destination)
if list.rsyncRun.exitCode != 0:
#handle permission denied error. #handle permission denied error.
if rsyncRun.exitCode == 23: if list.rsyncRun.exitCode == 23:
let rsyncRunCmd = "SUDO_ASKPASS=" & getAskPassPath() & " sudo -A rsync -aq " & source & " " & destination let rsyncRunCmd = "SUDO_ASKPASS=" & getAskPassPath() & " sudo -A rsync -aq " & source & " " & destination
rsyncRun = execCmdEx(rsyncRunCmd) #rsyncRun = execCmdEx(rsyncRunCmd)
if rsyncRun.exitCode != 0: #rsyncRun = spawn execCmdEx(rsyncRunCmd)
#sync()
createThread(thread, rsyncThread(rsyncRunCmd), list)
#rsyncRun = await asynctools.execProcess(rsyncRunCmd)
if list.rsyncRun.exitCode != 0:
rsyncErrors.add("EZ-Bkup's rsync process(es) returned error (" & $rsyncRun.output & ") while attempting to back up " & source & " to " & destination) rsyncErrors.add("EZ-Bkup's rsync process(es) returned error (" & $rsyncRun.output & ") while attempting to back up " & source & " to " & destination)
else: else:
rsyncErrors.add("EZ-Bkup's rsync process(es) returned error (" & $rsyncRun.output & ") while attempting to back up " & source & " to " & destination) rsyncErrors.add("EZ-Bkup's rsync process(es) returned error (" & $rsyncRun.output & ") while attempting to back up " & source & " to " & destination)
#makes the "Bkup Complete" msg below wait on the rsyncRun to finish. #makes the "Bkup Complete" msg below wait on the rsyncRun to finish.
if rsyncRun.exitCode == 1 or rsyncRun.exitCode == 0: if list.rsyncRun.exitCode == 1 or list.rsyncRun.exitCode == 0:
if rsyncErrors.len > 0: if rsyncErrors.len > 0:
list.runStatus = "<span color=\"#ff6b6b\" size=\"large\">Error! Please see the log at ~/.ez-bkup/errors.log</span>" list.runStatus = "<span color=\"#ff6b6b\" size=\"large\">Error! Please see the log at ~/.ez-bkup/errors.log</span>"
for err in rsyncErrors: for err in rsyncErrors: