Refactor persistence to combine document handling and workspace layout #4031
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,169 +1,91 @@ | ||
| use crate::wrapper::messages::{DocumentId, PersistedState}; | ||
|
timon-schelling marked this conversation as resolved.
|
||
|
|
||
| pub(crate) fn read_state() -> PersistedState { | ||
| let path = state_file_path(); | ||
| let data = match std::fs::read_to_string(&path) { | ||
| Ok(d) => d, | ||
| Err(e) if e.kind() == std::io::ErrorKind::NotFound => { | ||
| tracing::info!("No persistent data file found at {path:?}, starting fresh"); | ||
| return PersistedState::default(); | ||
| } | ||
| Err(e) => { | ||
| tracing::error!("Failed to read persistent data from disk: {e}"); | ||
| return PersistedState::default(); | ||
| } | ||
| }; | ||
| let loaded = match ron::from_str(&data) { | ||
| Ok(d) => d, | ||
| Err(e) => { | ||
| tracing::error!("Failed to deserialize persistent data: {e}"); | ||
| return PersistedState::default(); | ||
| } | ||
| }; | ||
|
|
||
| garbage_collect_document_files(&loaded); | ||
| loaded | ||
| } | ||
|
|
||
| pub(crate) fn write_state(state: PersistedState) { | ||
|
timon-schelling marked this conversation as resolved.
|
||
| let state: &PersistedState = &state; | ||
| let data = match ron::ser::to_string_pretty(state, Default::default()) { | ||
| Ok(d) => d, | ||
| Err(e) => { | ||
| tracing::error!("Failed to serialize persistent data: {e}"); | ||
| return; | ||
| } | ||
| }; | ||
| if let Err(e) = std::fs::write(state_file_path(), data) { | ||
| tracing::error!("Failed to write persistent data to disk: {e}"); | ||
| } | ||
| } | ||
|
Comment on lines
+28
to
+40
Contributor
There was a problem hiding this comment. Calling pub(crate) fn write_state(state: PersistedState) {
flush(&state);
} |
||
|
|
||
| pub(crate) fn write_document_content(id: DocumentId, document_content: String) { | ||
| if let Err(e) = std::fs::write(document_content_path(&id), document_content) { | ||
| tracing::error!("Failed to write document {id:?} to disk: {e}"); | ||
| } | ||
| } | ||
|
|
||
| pub(crate) fn read_document_content(id: &DocumentId) -> Option<String> { | ||
| std::fs::read_to_string(document_content_path(id)).ok() | ||
| } | ||
|
|
||
| pub(crate) fn delete_document(id: &DocumentId) { | ||
| if let Err(e) = std::fs::remove_file(document_content_path(id)) { | ||
| tracing::error!("Failed to delete document {id:?} from disk: {e}"); | ||
| } | ||
| } | ||
|
|
||
| fn garbage_collect_document_files(state: &PersistedState) { | ||
| let valid_paths: std::collections::HashSet<_> = state.documents.iter().map(|doc| document_content_path(&doc.id)).collect(); | ||
|
|
||
| let directory = crate::dirs::app_autosave_documents_dir(); | ||
| let entries = match std::fs::read_dir(&directory) { | ||
| Ok(entries) => entries, | ||
| Err(e) if e.kind() == std::io::ErrorKind::NotFound => return, | ||
| Err(e) => { | ||
| tracing::error!("Failed to read autosave documents directory: {e}"); | ||
| return; | ||
| } | ||
| }; | ||
|
|
||
| for entry in entries.flatten() { | ||
| let path = entry.path(); | ||
| if path.is_file() && !valid_paths.contains(&path) { | ||
| if let Err(e) = std::fs::remove_file(&path) { | ||
| tracing::error!("Failed to remove orphaned document file {path:?}: {e}"); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn state_file_path() -> std::path::PathBuf { | ||
| let mut path = crate::dirs::app_data_dir(); | ||
| path.push(crate::consts::APP_STATE_FILE_NAME); | ||
| path | ||
| } | ||
|
|
||
| fn document_content_path(id: &DocumentId) -> std::path::PathBuf { | ||
| let mut path = crate::dirs::app_autosave_documents_dir(); | ||
| path.push(format!("{:x}.{}", id.0, graphite_desktop_wrapper::FILE_EXTENSION)); | ||
| path | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.