From ba3dedfaa6fee280761282f50fdee92b65cf0bfd Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Sat, 5 Aug 2023 12:32:35 +0200
Subject: ability to override id from json and import

---
 server/src/import.rs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'server/src/import.rs')

diff --git a/server/src/import.rs b/server/src/import.rs
index 3b45f14..d72690c 100644
--- a/server/src/import.rs
+++ b/server/src/import.rs
@@ -100,14 +100,15 @@ pub async fn import_path(
         info!("loading {path:?}");
         let datafile = File::open(path.clone()).context("cant load metadata")?;
         let mut data: Node = serde_json::from_reader(datafile).context("invalid metadata")?;
-        let identifier = path
-            .file_name()
-            .unwrap()
-            .to_str()
-            .unwrap()
-            .strip_suffix(".jelly")
-            .unwrap()
-            .to_string();
+        let identifier = data.private.id.clone().unwrap_or_else(|| {
+            path.file_name()
+                .unwrap()
+                .to_str()
+                .unwrap()
+                .strip_suffix(".jelly")
+                .unwrap()
+                .to_string()
+        });
 
         if let Some(io) = data.private.import.take() {
             let session = fed
@@ -152,6 +153,7 @@ async fn import_remote(
             backdrop: Some(AssetLocation::Cache(backdrop)),
             poster: Some(AssetLocation::Cache(poster)),
             import: None,
+            id: None,
             source: Some(MediaSource::Remote {
                 host: opts.host.clone(),
                 remote_id: opts.id.clone(),
-- 
cgit v1.2.3-70-g09d2