fix lock file location

Author: timon-schelling

desktop/src/cef/dirs.rs

@@ -1,11 +1,11 @@
 use std::path::PathBuf;
 
-use crate::dirs::{ensure_dir_exists, graphite_data_dir};
+use crate::dirs::{app_data_dir, ensure_dir_exists};
 
 static CEF_DIR_NAME: &str = "browser";
 
 pub(crate) fn delete_instance_dirs() {
-	let cef_dir = graphite_data_dir().join(CEF_DIR_NAME);
+	let cef_dir = app_data_dir().join(CEF_DIR_NAME);
 	if let Ok(entries) = std::fs::read_dir(&cef_dir) {
 		for entry in entries.flatten() {
 			let path = entry.path();
@@ -18,7 +18,7 @@ pub(crate) fn delete_instance_dirs() {
 
 pub(crate) fn create_instance_dir() -> PathBuf {
 	let instance_id: String = (0..32).map(|_| format!("{:x}", rand::random::<u8>() % 16)).collect();
-	let path = graphite_data_dir().join(CEF_DIR_NAME).join(instance_id);
+	let path = app_data_dir().join(CEF_DIR_NAME).join(instance_id);
 	ensure_dir_exists(&path);
 	path
 }

desktop/src/dirs.rs

@@ -9,14 +9,14 @@ pub(crate) fn ensure_dir_exists(path: &PathBuf) {
 	}
 }
 
-pub(crate) fn graphite_data_dir() -> PathBuf {
+pub(crate) fn app_data_dir() -> PathBuf {
 	let path = dirs::data_dir().expect("Failed to get data directory").join(APP_DIRECTORY_NAME);
 	ensure_dir_exists(&path);
 	path
 }
 
-pub(crate) fn graphite_autosave_documents_dir() -> PathBuf {
-	let path = graphite_data_dir().join(APP_DOCUMENTS_DIRECTORY_NAME);
+pub(crate) fn app_autosave_documents_dir() -> PathBuf {
+	let path = app_data_dir().join(APP_DOCUMENTS_DIRECTORY_NAME);
 	ensure_dir_exists(&path);
 	path
 }

desktop/src/lib.rs

@@ -38,7 +38,7 @@ pub fn start() {
 		return;
 	}
 
-	let mut lock = pidlock::Pidlock::new_validated(APP_LOCK_FILE_NAME).unwrap();
+	let mut lock = pidlock::Pidlock::new_validated(dirs::app_data_dir().join(APP_LOCK_FILE_NAME)).unwrap();
 	match lock.acquire() {
 		Ok(lock) => {
 			tracing::info!("Acquired application lock");

desktop/src/persist.rs

@@ -125,13 +125,13 @@ impl PersistentData {
 	}
 
 	fn state_file_path() -> std::path::PathBuf {
-		let mut path = crate::dirs::graphite_data_dir();
+		let mut path = crate::dirs::app_data_dir();
 		path.push(crate::consts::APP_STATE_FILE_NAME);
 		path
 	}
 
 	fn preferences_file_path() -> std::path::PathBuf {
-		let mut path = crate::dirs::graphite_data_dir();
+		let mut path = crate::dirs::app_data_dir();
 		path.push(crate::consts::APP_PREFERENCES_FILE_NAME);
 		path
 	}
@@ -189,7 +189,7 @@ impl DocumentStore {
 	}
 
 	fn document_path(id: &DocumentId) -> std::path::PathBuf {
-		let mut path = crate::dirs::graphite_autosave_documents_dir();
+		let mut path = crate::dirs::app_autosave_documents_dir();
 		path.push(format!("{:x}.graphite", id.0));
 		path
 	}