fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-27 18:48:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove GRAPHITE_DOCUMENT_VERSION

Browse Source
This commit is contained in:
Keavon Chambers
2024-01-06 17:25:05 -08:00
parent 121c1d2b9d
commit 7998947202
10 changed files with 8 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/messages/frontend/frontend_message.rs
-1
View File
@@ -85,7 +85,6 @@ pub enum FrontendMessage {
TriggerIndexedDbWriteDocument {
document: String,
details: FrontendDocumentDetails,
version: String,
},
TriggerLoadAutoSaveDocuments,
TriggerLoadPreferences,
editor/src/messages/portfolio/document/document_message_handler.rs
+2 -19
View File
@@ -1,7 +1,7 @@
use super::utility_types::error::EditorError;
use super::utility_types::misc::{SnappingOptions, SnappingState};
use crate::application::{generate_uuid, GRAPHITE_GIT_COMMIT_HASH};
use crate::consts::{ASYMPTOTIC_EFFECT, DEFAULT_DOCUMENT_NAME, FILE_SAVE_SUFFIX, GRAPHITE_DOCUMENT_VERSION, SCALE_EFFECT, SCROLLBAR_SPACING};
use crate::consts::{ASYMPTOTIC_EFFECT, DEFAULT_DOCUMENT_NAME, FILE_SAVE_SUFFIX, SCALE_EFFECT, SCROLLBAR_SPACING};
use crate::messages::input_mapper::utility_types::macros::action_keys;
use crate::messages::layout::utility_types::widget_prelude::*;
use crate::messages::portfolio::document::node_graph::NodeGraphHandlerData;
@@ -50,8 +50,6 @@ pub struct DocumentMessageHandler {
pub network: NodeNetwork,
#[serde(default = "default_name")]
pub name: String,
#[serde(default = "default_version")]
version: String,
#[serde(default = "default_commit_hash")]
commit_hash: String,
#[serde(default = "default_pan_tilt_zoom")]
@@ -105,7 +103,6 @@ impl Default for DocumentMessageHandler {
// ============================================
network: root_network(),
name: DEFAULT_DOCUMENT_NAME.to_string(),
version: GRAPHITE_DOCUMENT_VERSION.to_string(),
commit_hash: GRAPHITE_GIT_COMMIT_HASH.to_string(),
navigation: PTZ::default(),
document_mode: DocumentMode::DesignMode,
@@ -138,10 +135,6 @@ fn default_name() -> String {
DocumentMessageHandler::default().name
}
#[inline(always)]
fn default_version() -> String {
DocumentMessageHandler::default().version
}
#[inline(always)]
fn default_commit_hash() -> String {
DocumentMessageHandler::default().commit_hash
}
@@ -879,17 +872,7 @@ impl DocumentMessageHandler {
}
pub fn deserialize_document(serialized_content: &str) -> Result<Self, EditorError> {
let deserialized_result: Result<Self, EditorError> = serde_json::from_str(serialized_content).map_err(|e| EditorError::DocumentDeserialization(e.to_string()));
match deserialized_result {
Ok(document) => {
if document.version == GRAPHITE_DOCUMENT_VERSION {
Ok(document)
} else {
Err(EditorError::DocumentDeserialization("Graphite document version mismatch".to_string()))
}
}
Err(e) => Err(e),
}
serde_json::from_str(serialized_content).map_err(|e| EditorError::DocumentDeserialization(e.to_string()))
}
pub fn with_name(name: String, ipp: &InputPreprocessorMessageHandler, responses: &mut VecDeque<Message>) -> Self {
editor/src/messages/portfolio/portfolio_message_handler.rs
+1 -2
View File
@@ -1,6 +1,6 @@
use super::utility_types::PersistentData;
use crate::application::generate_uuid;
use crate::consts::{DEFAULT_DOCUMENT_NAME, GRAPHITE_DOCUMENT_VERSION};
use crate::consts::DEFAULT_DOCUMENT_NAME;
use crate::messages::dialog::simple_dialogs;
use crate::messages::frontend::utility_types::FrontendDocumentDetails;
use crate::messages::layout::utility_types::widget_prelude::*;
@@ -90,7 +90,6 @@ impl MessageHandler<PortfolioMessage, (&InputPreprocessorMessageHandler, &Prefer
id: document_id,
name: document.name.clone(),
},
version: GRAPHITE_DOCUMENT_VERSION.to_string(),
})
}
PortfolioMessage::CloseActiveDocumentWithConfirmation => {