Skip to content

Commit 9793b39

Browse files
committed
app: refactor a bit and fix some logs
1 parent 1b5c837 commit 9793b39

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

crates/companion-app/src/game.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -198,13 +198,12 @@ pub fn file_watcher(
198198
continue;
199199
}
200200

201-
if res.paths.len() == 1
202-
&& res.paths[0]
203-
.file_name()
204-
.is_some_and(|name| name == "data.owsave")
205-
{
201+
let [path] = res.paths.as_slice() else {
202+
continue;
203+
};
204+
205+
if path.file_name().is_some_and(|name| name == "data.owsave") {
206206
// save file updated
207-
let path = res.paths[0].clone();
208207
let name = path
209208
.parent()
210209
.expect("save path should have dir")
@@ -239,14 +238,17 @@ pub fn file_watcher(
239238

240239
last_name = name.clone();
241240
output
242-
.send(FileUpdateEvent::SaveUpdate { name, path })
241+
.send(FileUpdateEvent::SaveUpdate {
242+
name,
243+
path: path.clone(),
244+
})
243245
.await
244246
.inspect_err(|e| error!("failed to send file update event: {e}"))
245247
.ok();
246248
time_since_send = Instant::now();
247249

248250
trace!("sent file update event");
249-
} else if res.paths.len() == 1 && is_folder_event {
251+
} else if is_folder_event {
250252
// save created/deleted
251253
let path = res.paths[0].clone();
252254
let name = path
@@ -260,10 +262,8 @@ pub fn file_watcher(
260262
let event = match res.kind {
261263
EventKind::Create(_) => FileUpdateEvent::SaveCreate { name },
262264
EventKind::Remove(_) => FileUpdateEvent::SaveDelete { name },
263-
_ => {
264-
error!(
265-
"got unknown event kind where expected event for save create/remove"
266-
);
265+
kind => {
266+
error!("got unknown event kind {kind:?} for save create/delete");
267267
continue;
268268
}
269269
};

crates/companion-app/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fn update(state: &mut State, message: Message) -> Task<Message> {
5959
match message {
6060
Message::Auth { force } => {
6161
let Some(config) = &mut state.config else {
62-
error!("config not loaded, skipping forgetting");
62+
error!("config not loaded, skipping auth");
6363
return none;
6464
};
6565

0 commit comments

Comments
 (0)