[READ-ONLY] Mirror of https://github.com/probablykasper/ferrum. Music library app for Mac, Linux and Windows
ferrum.kasper.space
electron
linux
macos
music
music-library
music-player
napi
windows
Fix deprecation warnings
+9
-8
+5
-5
src-native/tracks/cover.rs
+5
-5
src-native/tracks/cover.rs
···
10
10
use image::{ImageEncoder, ImageFormat, ImageReader};
11
11
use lazy_static::lazy_static;
12
12
use napi::bindgen_prelude::{Buffer, PromiseRaw};
13
-
use napi::{Env, JsBuffer, Task};
13
+
use napi::{Env, Task};
14
14
use redb::{Database, TableDefinition};
15
15
use std::fs;
16
16
use std::io::{BufWriter, Cursor};
···
222
222
struct ReadCover(PathBuf, usize);
223
223
impl Task for ReadCover {
224
224
type Output = Option<Vec<u8>>;
225
-
type JsValue = Option<JsBuffer>;
225
+
type JsValue = Option<Buffer>;
226
226
fn compute(&mut self) -> napi::Result<Option<Vec<u8>>> {
227
227
let path = &self.0;
228
228
let index = self.1;
···
237
237
238
238
Ok(Some(image.data))
239
239
}
240
-
fn resolve(&mut self, env: Env, output: Self::Output) -> napi::Result<Option<JsBuffer>> {
240
+
fn resolve(&mut self, _env: Env, output: Self::Output) -> napi::Result<Option<Buffer>> {
241
241
match output {
242
-
Some(output) => Ok(Some(env.create_buffer_copy(output)?.into_raw())),
242
+
Some(output) => Ok(Some(Buffer::from(output))),
243
243
None => Ok(None),
244
244
}
245
245
}
···
253
253
track_id: String,
254
254
index: u16,
255
255
env: Env,
256
-
) -> Result<PromiseRaw<Option<JsBuffer>>> {
256
+
) -> Result<PromiseRaw<Option<Buffer>>> {
257
257
let data: &mut Data = get_data(&env)?;
258
258
let track = id_to_track(&env, &track_id)?;
259
259
let tracks_dir = &data.paths.tracks_dir;
+4
-3
src-native/tracks/mod.rs
+4
-3
src-native/tracks/mod.rs
···
3
3
use crate::get_now_timestamp;
4
4
use crate::library_types::{ItemId, MsSinceUnixEpoch, Track, TrackID, TRACK_ID_MAP};
5
5
use anyhow::{bail, Context, Result};
6
-
use napi::{Env, JsArrayBuffer, JsBuffer};
6
+
use napi::bindgen_prelude::Buffer;
7
+
use napi::{Env, JsArrayBuffer};
7
8
use std::fs;
8
9
use std::path::Path;
9
10
···
174
175
pub index: i64,
175
176
pub total_images: i64,
176
177
pub mime_type: String,
177
-
pub data: JsBuffer,
178
+
pub data: Buffer,
178
179
}
179
180
180
181
#[napi(js_name = "get_image")]
···
195
196
index: img.index,
196
197
total_images: img.total_images,
197
198
mime_type: img.mime_type.to_string(),
198
-
data: env.create_buffer_copy(img.data)?.into_raw(),
199
+
data: Buffer::from(img.data),
199
200
};
200
201
Ok(Some(js_image))
201
202
}