Skip to content

Commit 680a9e2

Browse files
KeavonKeavon
committed
Code revew
1 parent e9932c2 commit 680a9e2

File tree

4 files changed

+25
-24
lines changed

4 files changed

+25
-24
lines changed

‎desktop/src/app.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,23 +180,26 @@ impl WinitApp {
180180
self.persistent_data.set_document_order(ids);
181181
}
182182
DesktopFrontendMessage::PersistenceLoadCurrentDocument => {
183-
if let Some((id, document)) = self.persistent_data.get_current_document() {
183+
if let Some((id, document)) = self.persistent_data.current_document() {
184184
let message = DesktopWrapperMessage::LoadDocument { id, document, to_front: false };
185185
self.dispatch_desktop_wrapper_message(message);
186+
186187
let message = DesktopWrapperMessage::SelectDocument { id };
187188
self.dispatch_desktop_wrapper_message(message);
188189
}
189190
}
190191
DesktopFrontendMessage::PersistenceLoadRemainingDocuments => {
191-
for (id, document) in self.persistent_data.get_documents_before_current().into_iter().rev() {
192+
for (id, document) in self.persistent_data.documents_before_current().into_iter().rev() {
192193
let message = DesktopWrapperMessage::LoadDocument { id, document, to_front: true };
193194
self.dispatch_desktop_wrapper_message(message);
194195
}
195-
for (id, document) in self.persistent_data.get_documents_after_current() {
196+
197+
for (id, document) in self.persistent_data.documents_after_current() {
196198
let message = DesktopWrapperMessage::LoadDocument { id, document, to_front: false };
197199
self.dispatch_desktop_wrapper_message(message);
198200
}
199-
if let Some(id) = self.persistent_data.get_current_document_id() {
201+
202+
if let Some(id) = self.persistent_data.current_document_id() {
200203
let message = DesktopWrapperMessage::SelectDocument { id };
201204
self.dispatch_desktop_wrapper_message(message);
202205
}
@@ -347,7 +350,7 @@ impl ApplicationHandler<CustomEvent> for WinitApp {
347350
}
348351
WindowEvent::RedrawRequested => {
349352
let Some(ref mut graphics_state) = self.graphics_state else { return };
350-
// Only rerender once we have a new ui texture to display
353+
// Only rerender once we have a new UI texture to display
351354
if let Some(window) = &self.window {
352355
match graphics_state.render(window.as_ref()) {
353356
Ok(_) => {}

‎desktop/src/persist.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ impl PersistentData {
2525
self.flush();
2626
}
2727

28-
pub(crate) fn get_current_document_id(&self) -> Option<DocumentId> {
28+
pub(crate) fn current_document_id(&self) -> Option<DocumentId> {
2929
match self.current_document {
3030
Some(id) => Some(id),
3131
None => Some(*self.documents.document_ids().first()?),
3232
}
3333
}
3434

35-
pub(crate) fn get_current_document(&self) -> Option<(DocumentId, Document)> {
36-
let current_id = self.get_current_document_id()?;
35+
pub(crate) fn current_document(&self) -> Option<(DocumentId, Document)> {
36+
let current_id = self.current_document_id()?;
3737
Some((current_id, self.documents.read(&current_id)?))
3838
}
3939

40-
pub(crate) fn get_documents_before_current(&self) -> Vec<(DocumentId, Document)> {
41-
let Some(current_id) = self.get_current_document_id() else {
40+
pub(crate) fn documents_before_current(&self) -> Vec<(DocumentId, Document)> {
41+
let Some(current_id) = self.current_document_id() else {
4242
return Vec::new();
4343
};
4444
self.documents
@@ -49,8 +49,8 @@ impl PersistentData {
4949
.collect()
5050
}
5151

52-
pub(crate) fn get_documents_after_current(&self) -> Vec<(DocumentId, Document)> {
53-
let Some(current_id) = self.get_current_document_id() else {
52+
pub(crate) fn documents_after_current(&self) -> Vec<(DocumentId, Document)> {
53+
let Some(current_id) = self.current_document_id() else {
5454
return Vec::new();
5555
};
5656
self.documents
@@ -98,7 +98,7 @@ impl PersistentData {
9898
return;
9999
}
100100
};
101-
let loaded: PersistentData = match ron::from_str(&data) {
101+
let loaded = match ron::from_str(&data) {
102102
Ok(d) => d,
103103
Err(e) => {
104104
tracing::error!("Failed to deserialize persistent data: {e}");
@@ -116,10 +116,10 @@ impl PersistentData {
116116
}
117117

118118
#[derive(Default, serde::Serialize, serde::Deserialize)]
119-
struct DocumentStore(Vec<DocumentMeta>);
119+
struct DocumentStore(Vec<DocumentInfo>);
120120
impl DocumentStore {
121121
fn write(&mut self, id: DocumentId, document: Document) {
122-
let meta = DocumentMeta::new(id, &document);
122+
let meta = DocumentInfo::new(id, &document);
123123
if let Some(existing) = self.0.iter_mut().find(|meta| meta.id == id) {
124124
*existing = meta;
125125
} else {
@@ -174,13 +174,13 @@ impl DocumentStore {
174174
}
175175

176176
#[derive(serde::Serialize, serde::Deserialize)]
177-
struct DocumentMeta {
177+
struct DocumentInfo {
178178
id: DocumentId,
179179
name: String,
180180
path: Option<std::path::PathBuf>,
181181
is_saved: bool,
182182
}
183-
impl DocumentMeta {
183+
impl DocumentInfo {
184184
fn new(id: DocumentId, Document { name, path, is_saved, .. }: &Document) -> Self {
185185
Self {
186186
id,

‎desktop/wrapper/src/intercept_frontend_message.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ pub(super) fn intercept_frontend_message(dispatcher: &mut DesktopWrapperMessageD
6767
FrontendMessage::UpdateWindowState { maximized, minimized } => {
6868
dispatcher.respond(DesktopFrontendMessage::UpdateWindowState { maximized, minimized });
6969

70-
// Forward this to update the ui
70+
// Forward this to update the UI
7171
return Some(message);
7272
}
7373
FrontendMessage::CloseWindow => {
@@ -90,15 +90,15 @@ pub(super) fn intercept_frontend_message(dispatcher: &mut DesktopWrapperMessageD
9090
FrontendMessage::UpdateActiveDocument { document_id } => {
9191
dispatcher.respond(DesktopFrontendMessage::PersistenceUpdateCurrentDocument { id: document_id });
9292

93-
// Forward this to update the ui
93+
// Forward this to update the UI
9494
return Some(FrontendMessage::UpdateActiveDocument { document_id });
9595
}
9696
FrontendMessage::UpdateOpenDocumentsList { open_documents } => {
9797
dispatcher.respond(DesktopFrontendMessage::PersistenceUpdateDocumentsList {
9898
ids: open_documents.iter().map(|document| document.id).collect(),
9999
});
100100

101-
// Forward this to update the ui
101+
// Forward this to update the UI
102102
return Some(FrontendMessage::UpdateOpenDocumentsList { open_documents });
103103
}
104104
FrontendMessage::TriggerLoadFirstAutoSaveDocument => {

‎desktop/wrapper/src/messages.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1+
pub use graphite_editor::messages::prelude::DocumentId;
12
use graphite_editor::messages::prelude::FrontendMessage;
2-
use std::path::PathBuf;
3-
43
pub(crate) use graphite_editor::messages::prelude::Message as EditorMessage;
5-
6-
pub use graphite_editor::messages::prelude::DocumentId;
4+
use std::path::PathBuf;
75

86
pub enum DesktopFrontendMessage {
97
ToWeb(Vec<FrontendMessage>),

0 commit comments

Comments
 (0)