feat: infer mime

feat: store in tmp dir next to output dir

Author: v0l

Cargo.lock

@@ -52,16 +52,18 @@ serde_with = { version = "3.8.1", features = ["hex"] }
 reqwest = { version = "0.12.8", features = ["stream"] }
 clap = { version = "4.5.18", features = ["derive"] }
 mime2ext = "0.1.53"
-tokio-util = { version = "0.7.13", features = ["io"] }
+infer = "0.16.0"
+tokio-util = { version = "0.7.13", features = ["io", "io-util"] }
 
 libc = { version = "0.2.153", optional = true }
-ffmpeg-rs-raw = { git = "https://git.v0l.io/Kieran/ffmpeg-rs-raw.git", rev = "76333375d8c7c825cd9e45c041866f2c655c7bbd", optional = true }
+ffmpeg-rs-raw = { git = "https://git.v0l.io/Kieran/ffmpeg-rs-raw.git", rev = "de2050cec07a095bace38d3ccf9c4c4f9b03b217", optional = true }
 candle-core = { git = "https://git.v0l.io/huggingface/candle.git", tag = "0.8.1", optional = true }
 candle-nn = { git = "https://git.v0l.io/huggingface/candle.git", tag = "0.8.1", optional = true }
 candle-transformers = { git = "https://git.v0l.io/huggingface/candle.git", tag = "0.8.1", optional = true }
 sqlx-postgres = { version = "0.8.2", optional = true, features = ["chrono", "uuid"] }
 http-range-header = { version = "0.4.2", optional = true }
 nostr-cursor = { git = "https://git.v0l.io/Kieran/nostr_backup_proc.git", branch = "main", optional = true }
 regex = { version = "1.11.1", optional = true }
+rand = "0.8.5"
 
 

Cargo.toml

@@ -125,10 +125,7 @@ async fn migrate_file(
     let md: Option<Vec<&str>> = f.media_dimensions.as_ref().map(|s| s.split("x").collect());
     let fu = FileUpload {
         id: id_vec,
-        name: match &f.name {
-            Some(n) => n.to_string(),
-            None => "".to_string(),
-        },
+        name: f.name.clone(),
         size: f.size as u64,
         mime_type: f.mime_type.clone(),
         created: f.uploaded,
@@ -142,7 +139,6 @@ async fn migrate_file(
         },
         blur_hash: None,
         alt: f.description.clone(),
-        ..Default::default()
     };
     db.add_file(&fu, uid).await?;
     Ok(())

src/bin/void_cat_migrate.rs

@@ -1,26 +1,53 @@
+use crate::filesystem::NewFileResult;
 use chrono::{DateTime, Utc};
 use serde::Serialize;
 use sqlx::migrate::MigrateError;
 use sqlx::{Error, Executor, FromRow, Row};
 
 #[derive(Clone, FromRow, Default, Serialize)]
 pub struct FileUpload {
+    /// SHA-256 hash of the file
     #[serde(with = "hex")]
     pub id: Vec<u8>,
-    pub name: String,
+    /// Filename
+    pub name: Option<String>,
+    /// Size in bytes
     pub size: u64,
+    /// MIME type
     pub mime_type: String,
+    /// When the upload was created
     pub created: DateTime<Utc>,
+    /// Width of the media in pixels
     pub width: Option<u32>,
+    /// Height of the media in pixels
     pub height: Option<u32>,
+    /// Blurhash of the media
     pub blur_hash: Option<String>,
+    /// Alt text of the media
     pub alt: Option<String>,
 
     #[sqlx(skip)]
     #[cfg(feature = "labels")]
     pub labels: Vec<FileLabel>,
 }
 
+impl From<&NewFileResult> for FileUpload {
+    fn from(value: &NewFileResult) -> Self {
+        Self {
+            id: value.id.clone(),
+            name: None,
+            size: value.size,
+            mime_type: value.mime_type.clone(),
+            created: Utc::now(),
+            width: value.width,
+            height: value.height,
+            blur_hash: value.blur_hash.clone(),
+            alt: None,
+            #[cfg(feature = "labels")]
+            labels: value.labels.clone(),
+        }
+    }
+}
 #[derive(Clone, FromRow, Serialize)]
 pub struct User {
     pub id: u64,