Skip to content

Commit 3d448e5

Browse files
committed
rebasing with upsream (webdav and wifi client)
1 parent ca57b2e commit 3d448e5

5 files changed

Lines changed: 11 additions & 7 deletions

File tree

daemon/src/gps.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,9 @@ pub async fn post_gps(
148148
}
149149
}
150150
} else {
151-
info!("GPS data received but no recording is active — position updated in memory only, not persisted to sidecar");
151+
info!(
152+
"GPS data received but no recording is active — position updated in memory only, not persisted to sidecar"
153+
);
152154
}
153155

154156
Ok(StatusCode::OK)

daemon/src/main.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,9 @@ async fn run_with_config(
318318
timestamp: 0,
319319
}),
320320
_ => {
321-
warn!("gps_mode is Fixed but gps_fixed_latitude or gps_fixed_longitude is missing from config — no GPS coordinates will be recorded");
321+
warn!(
322+
"gps_mode is Fixed but gps_fixed_latitude or gps_fixed_longitude is missing from config — no GPS coordinates will be recorded"
323+
);
322324
None
323325
}
324326
}

daemon/src/qmdl_store.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ mod tests {
639639
async fn test_mark_entry_as_uploaded_sets_time_and_persists() {
640640
let dir = make_temp_dir();
641641
let mut store = RecordingStore::create(dir.path()).await.unwrap();
642-
let _ = store.new_entry().await.unwrap();
642+
let _ = store.new_entry(GpsMode::Disabled).await.unwrap();
643643
let name = store.manifest.entries[0].name.clone();
644644
store.close_current_entry().await.unwrap();
645645

@@ -670,7 +670,7 @@ mod tests {
670670
let mut store = RecordingStore::create(dir.path()).await.unwrap();
671671

672672
for _ in 0..3 {
673-
let _ = store.new_entry().await.unwrap();
673+
let _ = store.new_entry(GpsMode::Disabled).await.unwrap();
674674
}
675675

676676
store.manifest.entries[0].name = "entry-0".to_owned();

daemon/src/server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ pub async fn debug_set_display_state(
513513
#[cfg(test)]
514514
mod tests {
515515
use super::*;
516-
use crate::config::GpsMode as _;
516+
use crate::config::GpsMode;
517517
use async_zip::base::read::mem::ZipFileReader;
518518
use axum::extract::{Path, State};
519519
use tempfile::TempDir;

daemon/src/webdav.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use tokio::{select, sync::RwLock, time};
1111
use tokio_util::io::ReaderStream;
1212
use tokio_util::{sync::CancellationToken, task::TaskTracker};
1313

14-
use crate::config::WebdavConfig;
14+
use crate::config::{GpsMode, WebdavConfig};
1515
use crate::qmdl_store::RecordingStore;
1616

1717
pub struct WebdavUploadWorkerConfig {
@@ -313,7 +313,7 @@ mod tests {
313313
dir: &std::path::Path,
314314
) -> (Arc<RwLock<RecordingStore>>, String) {
315315
let mut store = RecordingStore::create(dir).await.unwrap();
316-
let (mut qmdl_file, mut analysis_file) = store.new_entry().await.unwrap();
316+
let (mut qmdl_file, mut analysis_file) = store.new_entry(GpsMode::Disabled).await.unwrap();
317317
qmdl_file.write_all(b"fake qmdl payload").await.unwrap();
318318
qmdl_file.flush().await.unwrap();
319319
analysis_file

0 commit comments

Comments
 (0)