tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

args: add datapath argument

Browse Source 
This will allow us to test cache resets

Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-09-06 21:03:33 -07:00
parent c879982260
commit 8602650278
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app.rs
View File

@@ -581,13 +581,14 @@ impl Damus {
setup_cc(cc, is_mobile, parsed_args.light); setup_cc(cc, is_mobile, parsed_args.light);
let dbpath = parsed_args let data_path = parsed_args
.dbpath .datapath
.unwrap_or(data_path.as_ref().to_str().expect("db path ok").to_string()); .unwrap_or(data_path.as_ref().to_str().expect("db path ok").to_string());
let dbpath = parsed_args.dbpath.unwrap_or(data_path.clone());
let _ = std::fs::create_dir_all(dbpath.clone()); let _ = std::fs::create_dir_all(dbpath.clone());
let imgcache_dir = data_path.as_ref().join(ImageCache::rel_datadir()); let imgcache_dir = format!("{}/{}", data_path, ImageCache::rel_datadir());
let _ = std::fs::create_dir_all(imgcache_dir.clone()); let _ = std::fs::create_dir_all(imgcache_dir.clone());
let mut config = Config::new(); let mut config = Config::new();
@@ -662,7 +663,7 @@ impl Damus {
threads: Threads::default(), threads: Threads::default(),
drafts: Drafts::default(), drafts: Drafts::default(),
state: DamusState::Initializing, state: DamusState::Initializing,
img_cache: ImageCache::new(imgcache_dir), img_cache: ImageCache::new(imgcache_dir.into()),
note_cache: NoteCache::default(), note_cache: NoteCache::default(),
selected_timeline: 0, selected_timeline: 0,
timelines, timelines,

11
src/args.rs
View File

@@ -15,6 +15,7 @@ pub struct Args {
pub debug: bool, pub debug: bool,
pub textmode: bool, pub textmode: bool,
pub dbpath: Option<String>, pub dbpath: Option<String>,
pub datapath: Option<String>,
} }
impl Args { impl Args {
@@ -29,6 +30,7 @@ impl Args {
debug: false, debug: false,
textmode: false, textmode: false,
dbpath: None, dbpath: None,
datapath: None,
}; };
let mut i = 0; let mut i = 0;
@@ -105,6 +107,15 @@ impl Args {
continue; continue;
}; };
res.dbpath = Some(path.clone()); res.dbpath = Some(path.clone());
} else if arg == "--datapath" {
i += 1;
let path = if let Some(next_arg) = args.get(i) {
next_arg
} else {
error!("datapath argument missing?");
continue;
};
res.datapath = Some(path.clone());
} else if arg == "-r" || arg == "--relay" { } else if arg == "-r" || arg == "--relay" {
i += 1; i += 1;
let relay = if let Some(next_arg) = args.get(i) { let relay = if let Some(next_arg) = args.get(i) {