MahmoudEmad/herolib
1
0
Fork 0
Code Issues 55 Pull Requests 1 Actions Packages Projects Releases 26 Wiki Activity

fixes in rclone module

Browse Source
This commit is contained in:
mariobassem
2024-12-29 14:05:09 +02:00
parent 84d3aaade7
commit f25be20e21
5 changed files with 151 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/clients/rclone/config.v
View File

@@ -2,8 +2,9 @@ module rclone
import freeflowuniverse.herolib.core.playbook
import freeflowuniverse.herolib.core.texttools
import os
const configfile = '${HOME}/.config/rclone/rclone.conf'
const configfile = '${os.home_dir()}/.config/rclone/rclone.conf'
// will look for personal configuration file in ~/hero/config .
// this file is in heroscript format and will have all required info to configure rclone
@@ -17,13 +18,15 @@ const configfile = '${HOME}/.config/rclone/rclone.conf'
// url:''
//```
pub fn configure() ! {
actions := playbook.new(
path: configfile
actor_filter: ['config']
action_filter: [
's3server_define',
]
mut plbook := playbook.new(
path: rclone.configfile
// actor_filter: ['config']
// action_filter: [
// 's3server_define',
// ]
)!
actions := plbook.find(filter: 'config.s3server_define')!
mut out := ''
for action in actions {
mut name := action.params.get_default('name', '')!

1
lib/clients/rclone/rclone.v
View File

@@ -1,7 +1,6 @@
module rclone
import os
import freeflowuniverse.herolib.core.texttools
// // RCloneClient represents a configured rclone instance
// pub struct RCloneClient {

7
lib/clients/rclone/rclone_factory_.v
View File

@@ -2,7 +2,6 @@ module rclone
import freeflowuniverse.herolib.core.base
import freeflowuniverse.herolib.core.playbook
import freeflowuniverse.herolib.ui.console
__global (
rclone_global map[string]&RCloneClient
@@ -91,9 +90,9 @@ pub fn play(args_ PlayArgs) ! {
if install_actions.len > 0 {
for install_action in install_actions {
mut p := install_action.params
mycfg := cfg_play(p)!
console.print_debug('install action rclone.configure\n${mycfg}')
set(mycfg)!
cfg_play(p)!
// console.print_debug('install action rclone.configure\n${mycfg}')
// set(mycfg)!
}
}
}

63
test_basic.vsh
View File

@@ -5,18 +5,14 @@ import flag
import time
import json
const (
cache_file = '/tmp/herolib_tests.json'
test_expiry_seconds = 3600 // 1 hour
)
const cache_file = '/tmp/herolib_tests.json'
const test_expiry_seconds = 3600 // 1 hour
struct TestCache {
mut:
tests map[string]i64 // Map of test paths to last successful run timestamp
}
// Load the test cache from JSON file
fn load_test_cache() TestCache {
if !os.exists(cache_file) {
@@ -25,25 +21,19 @@ fn load_test_cache() TestCache {
}
}
content := os.read_file(cache_file) or {
return TestCache{
content := os.read_file(cache_file) or { return TestCache{
tests: map[string]i64{}
}
}
} }
return json.decode(TestCache, content) or {
return TestCache{
return json.decode(TestCache, content) or { return TestCache{
tests: map[string]i64{}
}
}
} }
}
// Save the test cache to JSON file
fn save_test_cache(cache TestCache) {
json_str := json.encode_pretty(cache)
os.write_file(cache_file, json_str) or {
eprintln('Failed to save test cache: ${err}')
}
os.write_file(cache_file, json_str) or { eprintln('Failed to save test cache: ${err}') }
}
// Check if a test needs to be rerun based on timestamp
@@ -82,14 +72,14 @@ fn get_cache_key(path string, base_dir string) string {
}
// Check if a file should be ignored or marked as error based on its path
fn process_test_file(path string, base_dir string, test_files_ignore []string, test_files_error []string, mut cache TestCache, mut tests_in_error []string)! {
fn process_test_file(path string, base_dir string, test_files_ignore []string, test_files_error []string, mut cache TestCache, mut tests_in_error []string) ! {
// Get normalized paths
norm_path, rel_path := get_normalized_paths(path, base_dir)
mut should_ignore := false
mut is_error := false
if ! path.to_lower().contains("_test.v"){
if !path.to_lower().contains('_test.v') {
return
}
@@ -119,7 +109,7 @@ fn process_test_file(path string, base_dir string, test_files_ignore []string, t
}
}
fn dotest(path string, base_dir string, mut cache TestCache)! {
fn dotest(path string, base_dir string, mut cache TestCache) ! {
norm_path, _ := get_normalized_paths(path, base_dir)
test_key := get_cache_key(norm_path, base_dir)
@@ -144,7 +134,6 @@ fn dotest(path string, base_dir string, mut cache TestCache)! {
println('Test passed: ${path}')
}
/////////////////////////
/////////////////////////
@@ -152,13 +141,12 @@ fn dotest(path string, base_dir string, mut cache TestCache)! {
mut fp := flag.new_flag_parser(os.args)
fp.application('test_basic')
fp.description('Run tests for herolib')
remove_cache := fp.bool('r', `r`, false, 'Remove cache file before running tests', flag.FlagConfig{})
remove_cache := fp.bool('r', `r`, false, 'Remove cache file before running tests')
fp.finalize() or {
eprintln(err)
exit(1)
}
// Remove cache file if -r flag is set
if remove_cache && os.exists(cache_file) {
os.rm(cache_file) or {
@@ -168,15 +156,12 @@ if remove_cache && os.exists(cache_file) {
println('Removed cache file: ${cache_file}')
}
abs_dir_of_script := dir(@FILE)
norm_dir_of_script := normalize_path(abs_dir_of_script)
os.chdir(abs_dir_of_script) or { panic(err) }
// can use // inside this list as well to ignore temporary certain dirs, useful for testing
tests := "
tests := '
lib/data
lib/osal
lib/lang
@@ -185,17 +170,17 @@ lib/clients
// lib/crypt
lib/core
lib/develop
"
'
//the following tests have no prio and can be ignored
tests_ignore := "
// the following tests have no prio and can be ignored
tests_ignore := '
notifier_test.v
clients/meilisearch
clients/zdb
systemd_process_test.v
"
'
tests_error := "
tests_error := '
net_test.v
osal/package_test.v
rpc_test.v
@@ -229,8 +214,7 @@ encoderhero/encoder_test.v
encoderhero/decoder_test.v
code/codeparser
gittools_test.v
"
'
// Split tests into array and remove empty lines
test_files := tests.split('\n').filter(it.trim_space() != '')
@@ -239,14 +223,14 @@ test_files_error := tests_error.split('\n').filter(it.trim_space() != '')
mut tests_in_error := []string{}
// Load test cache
mut cache := load_test_cache()
println('Test cache loaded from ${cache_file}')
// Run each test with proper v command flags
for test in test_files {
if test.trim_space() == '' || test.trim_space().starts_with("//") || test.trim_space().starts_with("#") {
if test.trim_space() == '' || test.trim_space().starts_with('//')
|| test.trim_space().starts_with('#') {
continue
}
@@ -261,11 +245,12 @@ for test in test_files {
// If directory, run tests for each .v file in it recursively
files := os.walk_ext(full_path, '.v')
for file in files {
process_test_file(file, norm_dir_of_script, test_files_ignore, test_files_error, mut cache, mut tests_in_error)!
process_test_file(file, norm_dir_of_script, test_files_ignore, test_files_error, mut
cache, mut tests_in_error)!
}
} else if os.is_file(full_path) {
process_test_file(full_path, norm_dir_of_script, test_files_ignore, test_files_error, mut cache, mut tests_in_error)!
process_test_file(full_path, norm_dir_of_script, test_files_ignore, test_files_error, mut
cache, mut tests_in_error)!
}
}