From b5a89eae7aa57486b6441977a91d83ee605b6be5 Mon Sep 17 00:00:00 2001 From: Kasper Date: Wed, 25 Sep 2024 22:20:01 +0200 Subject: [PATCH] Remove unused code --- src-native/js.rs | 25 ------------------------- src-native/lib.rs | 1 - src-native/tracks/mod.rs | 3 +-- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 src-native/js.rs diff --git a/src-native/js.rs b/src-native/js.rs deleted file mode 100644 index a487a293..00000000 --- a/src-native/js.rs +++ /dev/null @@ -1,25 +0,0 @@ -use atomicwrites::{AllowOverwrite, AtomicFile}; -use napi::Error as NapiError; -use std::fs::copy; -use std::io::Write; - -// Create NapiError from string -pub fn nerr(msg: &str) -> NapiError { - return NapiError::from_reason(msg.to_owned()); -} - -#[napi] -#[allow(dead_code)] -fn copy_file(from: String, to: String) -> napi::Result<()> { - match copy(from, to) { - Ok(_) => Ok(()), - Err(err) => Err(err.into()), - } -} - -#[napi] -#[allow(dead_code)] -fn atomic_file_save(file_path: String, content: String) { - let af = AtomicFile::new(file_path, AllowOverwrite); - af.write(|f| f.write_all(content.as_bytes())).unwrap(); -} diff --git a/src-native/lib.rs b/src-native/lib.rs index f29ea470..7a5653a0 100644 --- a/src-native/lib.rs +++ b/src-native/lib.rs @@ -25,7 +25,6 @@ mod data; mod data_js; mod filter; mod itunes_import; -mod js; mod library; mod library_types; mod page; diff --git a/src-native/tracks/mod.rs b/src-native/tracks/mod.rs index 85c0b7cf..65aa417a 100644 --- a/src-native/tracks/mod.rs +++ b/src-native/tracks/mod.rs @@ -1,7 +1,6 @@ use crate::data::Data; use crate::data_js::get_data; use crate::get_now_timestamp; -use crate::js::nerr; use crate::library_types::{ItemId, MsSinceUnixEpoch, Track, TrackID, TRACK_ID_MAP}; use napi::{Env, JsArrayBuffer, JsBuffer, JsObject, Result, Task}; use std::fs; @@ -103,7 +102,7 @@ pub fn add_skip(track_id: String, env: Env) -> Result<()> { pub fn add_play_time(id: TrackID, start: MsSinceUnixEpoch, dur_ms: i64, env: Env) -> Result<()> { let data: &mut Data = get_data(&env)?; let tracks = data.library.get_tracks(); - tracks.get(&id).ok_or(nerr("Track ID not found"))?; + tracks.get(&id).ok_or(nerr!("Track ID not found"))?; data.library.playTime.push((id, start, dur_ms)); Ok(()) }