mirrors/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2025-08-02 20:42:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

#[macro_use] the log crate (#775)

Browse source
This commit is contained in:
0HyperCube 2022-09-08 21:14:01 +01:00 • committed by Keavon Chambers
parent 655831eedf
commit 788552e10c
18 changed files with 49 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
editor/src/dispatcher.rs
View file

@ -161,7 +161,7 @@ impl Dispatcher {
&mut queue,
);
} else {
log::warn!("Called ToolMessage without an active document.\nGot {:?}", message);
warn!("Called ToolMessage without an active document.\nGot {:?}", message);
}
}
Workspace(message) => {
@ -218,11 +218,11 @@ impl Dispatcher {
match message_logging_verbosity {
MessageLoggingVerbosity::Off => {}
MessageLoggingVerbosity::Names => {
log::info!("{}{:?}", Self::create_indents(queues), message.to_discriminant());
info!("{}{:?}", Self::create_indents(queues), message.to_discriminant());
}
MessageLoggingVerbosity::Contents => {
if !(matches!(message, Message::InputPreprocessor(_))) {
log::info!("Message: {}{:?}", Self::create_indents(queues), message);
info!("Message: {}{:?}", Self::create_indents(queues), message);
}
}
}
@ -232,7 +232,7 @@ impl Dispatcher {
/// Logs into the tree that the message is in the side effect free messages and its execution will be deferred
fn log_deferred_message(&self, message: &Message, queues: &[VecDeque<Message>], message_logging_verbosity: MessageLoggingVerbosity) {
if let MessageLoggingVerbosity::Names = message_logging_verbosity {
log::info!("{}Deferred \"{:?}\" because it's a SIDE_EFFECT_FREE_MESSAGE", Self::create_indents(queues), message.to_discriminant());
info!("{}Deferred \"{:?}\" because it's a SIDE_EFFECT_FREE_MESSAGE", Self::create_indents(queues), message.to_discriminant());
}
}
}

4
editor/src/lib.rs
View file

@ -4,6 +4,10 @@ extern crate graphite_proc_macros;
#[macro_use]
mod macros;
// `macro_use` puts the log macros (`error!`, `warn!`, `debug!`, `info!` and `trace!`) in scope for the crate
#[macro_use]
extern crate log;
pub mod application;
pub mod consts;
pub mod dispatcher;

2
editor/src/messages/input_mapper/utility_types/misc.rs
View file

@ -98,7 +98,7 @@ impl ActionKeys {
}
}
ActionKeys::Keys(keys) => {
log::warn!("Calling `.to_keys()` on a `ActionKeys::Keys` is a mistake/bug. Keys are: {:?}.", keys);
warn!("Calling `.to_keys()` on a `ActionKeys::Keys` is a mistake/bug. Keys are: {:?}.", keys);
}
}
}

10
editor/src/messages/layout/layout_message_handler.rs
View file

@ -34,10 +34,9 @@ impl<F: Fn(&MessageDiscriminant) -> Vec<KeysGroup>> MessageHandler<LayoutMessage
let layout = if let Some(layout) = self.layouts.get_mut(layout_target as usize) {
layout
} else {
log::warn!(
warn!(
"UpdateLayout was called referencing an invalid layout. `widget_id: {}`, `layout_target: {:?}`",
widget_id,
layout_target
widget_id, layout_target
);
return;
};
@ -45,10 +44,9 @@ impl<F: Fn(&MessageDiscriminant) -> Vec<KeysGroup>> MessageHandler<LayoutMessage
let widget_holder = if let Some(widget_holder) = layout.iter_mut().find(|widget| widget.widget_id == widget_id) {
widget_holder
} else {
log::warn!(
warn!(
"UpdateLayout was called referencing an invalid widget ID, although the layout target was valid. `widget_id: {}`, `layout_target: {:?}`",
widget_id,
layout_target
widget_id, layout_target
);
return;
};

2
editor/src/messages/portfolio/document/artboard/artboard_message_handler.rs
View file

@ -40,7 +40,7 @@ impl MessageHandler<ArtboardMessage, &FontCache> for ArtboardMessageHandler {
}
}
Ok(None) => {}
Err(e) => log::error!("Artboard Error: {:?}", e),
Err(e) => error!("Artboard Error: {:?}", e),
},
// Messages

17
editor/src/messages/portfolio/document/document_message_handler.rs
View file

@ -27,7 +27,6 @@ use graphene::layers::vector::subpath::Subpath;
use graphene::{DocumentError, DocumentResponse, LayerId, Operation as DocumentOperation};
use glam::{DAffine2, DVec2};
use log::warn;
use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, Serialize, Deserialize)]
@ -108,7 +107,7 @@ impl MessageHandler<DocumentMessage, (&InputPreprocessorMessageHandler, &FontCac
DocumentResponse::LayerChanged { path } => responses.push_back(LayerChanged { affected_layer_path: path.clone() }.into()),
DocumentResponse::CreatedLayer { path } => {
if self.layer_metadata.contains_key(path) {
log::warn!("CreatedLayer overrides existing layer metadata.");
warn!("CreatedLayer overrides existing layer metadata.");
}
self.layer_metadata.insert(path.clone(), LayerMetadata::new(false));
@ -126,7 +125,7 @@ impl MessageHandler<DocumentMessage, (&InputPreprocessorMessageHandler, &FontCac
responses.push_back(BroadcastEvent::DocumentIsDirty.into());
}
}
Err(e) => log::error!("DocumentError: {:?}", e),
Err(e) => error!("DocumentError: {:?}", e),
Ok(_) => (),
},
#[remain::unsorted]
@ -162,7 +161,7 @@ impl MessageHandler<DocumentMessage, (&InputPreprocessorMessageHandler, &FontCac
// Messages
AbortTransaction => {
self.undo(responses).unwrap_or_else(|e| log::warn!("{}", e));
self.undo(responses).unwrap_or_else(|e| warn!("{}", e));
responses.extend([RenderDocument.into(), DocumentStructureChanged.into()]);
}
AddSelectedLayers { additional_layers } => {
@ -243,7 +242,7 @@ impl MessageHandler<DocumentMessage, (&InputPreprocessorMessageHandler, &FontCac
let initial_level = log::max_level();
log::set_max_level(log::LevelFilter::Trace);
log::trace!("{:#?}\n{:#?}", self.graphene_document, self.layer_metadata);
trace!("{:#?}\n{:#?}", self.graphene_document, self.layer_metadata);
log::set_max_level(initial_level);
}
@ -291,8 +290,8 @@ impl MessageHandler<DocumentMessage, (&InputPreprocessorMessageHandler, &FontCac
responses.push_front(DocumentMessage::DirtyRenderDocument.into());
}
}
DocumentHistoryBackward => self.undo(responses).unwrap_or_else(|e| log::warn!("{}", e)),
DocumentHistoryForward => self.redo(responses).unwrap_or_else(|e| log::warn!("{}", e)),
DocumentHistoryBackward => self.undo(responses).unwrap_or_else(|e| warn!("{}", e)),
DocumentHistoryForward => self.redo(responses).unwrap_or_else(|e| warn!("{}", e)),
DocumentStructureChanged => {
let data_buffer: RawBuffer = self.serialize_root().into();
responses.push_back(FrontendMessage::UpdateDocumentLayerTreeStructure { data_buffer }.into())
@ -537,7 +536,7 @@ impl MessageHandler<DocumentMessage, (&InputPreprocessorMessageHandler, &FontCac
);
}
RollbackTransaction => {
self.rollback(responses).unwrap_or_else(|e| log::warn!("{}", e));
self.rollback(responses).unwrap_or_else(|e| warn!("{}", e));
responses.extend([RenderDocument.into(), DocumentStructureChanged.into()]);
}
SaveDocument => {
@ -867,7 +866,7 @@ impl DocumentMessageHandler {
let data = self.layer_panel_entry(path.to_vec(), font_cache).ok()?;
(!path.is_empty()).then(|| FrontendMessage::UpdateDocumentLayerDetails { data }.into())
} else {
log::warn!("Tried to select non existing layer {:?}", path);
warn!("Tried to select non existing layer {:?}", path);
None
}
}

2
editor/src/messages/portfolio/document/overlays/overlays_message_handler.rs
View file

@ -20,7 +20,7 @@ impl MessageHandler<OverlaysMessage, (bool, &FontCache, &InputPreprocessorMessag
#[remain::unsorted]
DispatchOperation(operation) => match self.overlays_graphene_document.handle_operation(*operation, font_cache) {
Ok(_) => responses.push_back(OverlaysMessage::Rerender.into()),
Err(e) => log::error!("OverlaysError: {:?}", e),
Err(e) => error!("OverlaysError: {:?}", e),
},
// Messages

2
editor/src/messages/portfolio/document/utility_types/misc.rs
View file

@ -77,7 +77,7 @@ impl Platform {
match self {
Platform::Mac => KeyboardPlatformLayout::Mac,
Platform::Unknown => {
log::warn!("The platform has not been set, remember to send `GlobalsMessage::SetPlatform` during editor initialization.");
warn!("The platform has not been set, remember to send `GlobalsMessage::SetPlatform` during editor initialization.");
KeyboardPlatformLayout::Standard
}
_ => KeyboardPlatformLayout::Standard,

2
editor/src/messages/portfolio/document/utility_types/transformation.rs
View file

@ -203,7 +203,7 @@ impl<'a> Selected<'a> {
if let Ok(layer) = document.layer(path) {
original_transforms.insert(path.to_vec(), layer.transform);
} else {
log::warn!("Didn't find a layer for {:?}", path);
warn!("Didn't find a layer for {:?}", path);
}
}
}

4
editor/src/messages/portfolio/portfolio_message_handler.rs
View file

@ -11,8 +11,6 @@ use graphene::layers::layer_info::LayerDataTypeDiscriminant;
use graphene::layers::text_layer::{Font, FontCache};
use graphene::Operation as DocumentOperation;
use log::warn;
#[derive(Debug, Clone, Default)]
pub struct PortfolioMessageHandler {
menu_bar_message_handler: MenuBarMessageHandler,
@ -292,7 +290,7 @@ impl MessageHandler<PortfolioMessage, &InputPreprocessorMessageHandler> for Port
} => {
let paste = |entry: &CopyBufferEntry, responses: &mut VecDeque<_>| {
if let Some(document) = self.active_document() {
log::trace!("Pasting into folder {:?} as index: {}", &path, insert_index);
trace!("Pasting into folder {:?} as index: {}", &path, insert_index);
let destination_path = [path.to_vec(), vec![generate_uuid()]].concat();
responses.push_front(

10
editor/src/messages/tool/common_functionality/overlay_renderer.rs
View file

@ -42,16 +42,16 @@ impl OverlayRenderer {
if let Some(shape) = layer.as_subpath() {
let outline_cache = self.shape_overlay_cache.get(layer_id);
log::trace!("Overlay: Outline cache {:?}", &outline_cache);
trace!("Overlay: Outline cache {:?}", &outline_cache);
// Create an outline if we do not have a cached one
if outline_cache == None {
let outline_path = self.create_shape_outline_overlay(shape.clone(), responses);
self.shape_overlay_cache.insert(*layer_id, outline_path.clone());
Self::place_outline_overlays(outline_path.clone(), &transform, responses);
log::trace!("Overlay: Creating new outline {:?}", &outline_path);
trace!("Overlay: Creating new outline {:?}", &outline_path);
} else if let Some(outline_path) = outline_cache {
log::trace!("Overlay: Updating overlays for {:?} owning layer: {:?}", outline_path, layer_id);
trace!("Overlay: Updating overlays for {:?} owning layer: {:?}", outline_path, layer_id);
Self::modify_outline_overlays(outline_path.clone(), shape.clone(), responses);
Self::place_outline_overlays(outline_path.clone(), &transform, responses);
}
@ -62,7 +62,7 @@ impl OverlayRenderer {
// If cached update placement and style
if let Some(manipulator_group_overlays) = manipulator_group_cache {
log::trace!("Overlay: Updating detail overlays for {:?}", manipulator_group_overlays);
trace!("Overlay: Updating detail overlays for {:?}", manipulator_group_overlays);
Self::place_manipulator_group_overlays(manipulator_group, manipulator_group_overlays, &transform, responses);
Self::style_overlays(manipulator_group, manipulator_group_overlays, responses);
} else {
@ -251,7 +251,7 @@ impl OverlayRenderer {
/// Removes the manipulator overlays from the overlay document.
fn remove_manipulator_group_overlays(overlay_paths: &ManipulatorGroupOverlays, responses: &mut VecDeque<Message>) {
overlay_paths.iter().flatten().for_each(|layer_id| {
log::trace!("Overlay: Sending delete message for: {:?}", layer_id);
trace!("Overlay: Sending delete message for: {:?}", layer_id);
responses.push_back(DocumentMessage::Overlays(Operation::DeleteLayer { path: layer_id.clone() }.into()).into());
});
}

4
editor/src/messages/tool/common_functionality/shape_editor.rs
View file

@ -45,7 +45,7 @@ impl ShapeEditor {
}
if let Some((shape_layer_path, manipulator_group_id, manipulator_point_index)) = self.find_nearest_point_indices(document, mouse_position, select_threshold) {
log::trace!("Selecting... manipulator group ID: {}, manipulator point index: {}", manipulator_group_id, manipulator_point_index);
trace!("Selecting... manipulator group ID: {}, manipulator point index: {}", manipulator_group_id, manipulator_point_index);
// If the point we're selecting has already been selected
// we can assume this point exists.. since we did just click on it hence the unwrap
@ -225,7 +225,7 @@ impl ShapeEditor {
if let Some((manipulator_id, manipulator_point_index, distance_squared)) = self.closest_point_in_layer(document, layer, mouse_position) {
// Choose the first point under the threshold
if distance_squared < select_threshold_squared {
log::trace!("Selecting... manipulator ID: {}, manipulator point index: {}", manipulator_id, manipulator_point_index);
trace!("Selecting... manipulator ID: {}, manipulator point index: {}", manipulator_id, manipulator_point_index);
return Some((layer, manipulator_id, manipulator_point_index));
}
}

2
editor/src/messages/tool/tool_messages/select_tool.rs
View file

@ -941,7 +941,7 @@ impl SelectToolData {
let layer = match document.graphene_document.layer(layer_path) {
Ok(layer) => layer.clone(),
Err(e) => {
log::warn!("Could not access selected layer {:?}: {:?}", layer_path, e);
warn!("Could not access selected layer {:?}: {:?}", layer_path, e);
continue;
}
};

6
frontend/wasm/src/editor_api.rs
View file

@ -98,7 +98,7 @@ impl JsEditorHandle {
let js_return_value = self.frontend_message_handler_callback.call2(&JsValue::null(), &JsValue::from(message_type), &message_data);
if let Err(error) = js_return_value {
log::error!(
error!(
"While handling FrontendMessage \"{:?}\", JavaScript threw an error: {:?}",
message.to_discriminant().local_name(),
error,
@ -295,7 +295,7 @@ impl JsEditorHandle {
let key = translate_key(&name);
let modifier_keys = ModifierKeys::from_bits(modifiers).expect("Invalid modifier keys");
log::trace!("Key down {:?}, name: {}, modifiers: {:?}", key, name, modifiers);
trace!("Key down {:?}, name: {}, modifiers: {:?}", key, name, modifiers);
let message = InputPreprocessorMessage::KeyDown { key, modifier_keys };
self.dispatch(message);
@ -307,7 +307,7 @@ impl JsEditorHandle {
let key = translate_key(&name);
let modifier_keys = ModifierKeys::from_bits(modifiers).expect("Invalid modifier keys");
log::trace!("Key up {:?}, name: {}, modifiers: {:?}", key, name, modifier_keys);
trace!("Key up {:?}, name: {}, modifiers: {:?}", key, name, modifier_keys);
let message = InputPreprocessorMessage::KeyUp { key, modifier_keys };
self.dispatch(message);

4
frontend/wasm/src/helpers.rs
View file

@ -11,7 +11,7 @@ pub fn panic_hook(info: &panic::PanicInfo) {
let header = "The editor crashed — sorry about that";
let description = "An internal error occurred. Reload the editor to continue. Please report this by filing an issue on GitHub.";
log::error!("{}", info);
error!("{}", info);
JS_EDITOR_HANDLES.with(|instances| {
instances.borrow_mut().values_mut().for_each(|instance| {
@ -74,7 +74,7 @@ impl log::Log for WasmLog {
pub fn translate_key(name: &str) -> Key {
use Key::*;
log::trace!("Key event received: {}", name);
trace!("Key event received: {}", name);
match name {
// Writing system keys

4
frontend/wasm/src/lib.rs
View file

@ -1,5 +1,9 @@
#![doc = include_str!("../README.md")]
// `macro_use` puts the log macros (`error!`, `warn!`, `debug!`, `info!` and `trace!`) in scope for the crate
#[macro_use]
extern crate log;
pub mod editor_api;
pub mod helpers;

4
graphene/src/intersection.rs
View file

@ -335,7 +335,7 @@ fn path_intersections(a: &SubCurve, b: &SubCurve, intersections: &mut Vec<Inters
// Return the best estimate of intersection regardless of quality
// Also provides a base case and prevents infinite recursion
if a.available_precision() <= F64PRECISE || b.available_precision() <= F64PRECISE {
log::trace!("Precision reached");
trace!("Precision reached");
intersections.push(cross);
return;
}
@ -343,7 +343,7 @@ fn path_intersections(a: &SubCurve, b: &SubCurve, intersections: &mut Vec<Inters
// Alternate base case
// Note: may occur for the less forgiving side of a `PathSeg` endpoint intersect
if a.available_precision() <= F64PRECISE || b.available_precision() <= F64PRECISE {
log::trace!("Precision reached without finding intersect");
trace!("Precision reached without finding intersect");
return;
}
}

4
graphene/src/lib.rs
View file

@ -1,3 +1,7 @@
// `macro_use` puts the log macros (`error!`, `warn!`, `debug!`, `info!` and `trace!`) in scope for the crate
#[macro_use]
extern crate log;
pub mod boolean_ops;
/// Contains the [Color](color::Color) type.
pub mod color;