From b315024c6aac352877a54bc567327c8150c85618 Mon Sep 17 00:00:00 2001
From: trivernis <trivernis@protonmail.com>
Date: Thu, 6 Jan 2022 20:49:41 +0100
Subject: [PATCH] Change file id variant CID to CD

Signed-off-by: trivernis <trivernis@protonmail.com>
---
 mediarepo-api/Cargo.toml                         | 2 +-
 mediarepo-api/src/tauri_plugin/commands/file.rs  | 5 +----
 mediarepo-api/src/tauri_plugin/custom_schemes.rs | 6 +++---
 mediarepo-api/src/types/identifier.rs            | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/mediarepo-api/Cargo.toml b/mediarepo-api/Cargo.toml
index 494f224..9f74909 100644
--- a/mediarepo-api/Cargo.toml
+++ b/mediarepo-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mediarepo-api"
-version = "0.21.0"
+version = "0.22.0"
 edition = "2018"
 license = "gpl-3"
 
diff --git a/mediarepo-api/src/tauri_plugin/commands/file.rs b/mediarepo-api/src/tauri_plugin/commands/file.rs
index d9a4111..eba42ca 100644
--- a/mediarepo-api/src/tauri_plugin/commands/file.rs
+++ b/mediarepo-api/src/tauri_plugin/commands/file.rs
@@ -122,10 +122,7 @@ pub async fn read_file(
         Ok(buffer.buf)
     } else {
         let api = api_state.api().await?;
-        let content = api
-            .file
-            .read_file(FileIdentifier::CID(hash.clone()))
-            .await?;
+        let content = api.file.read_file(FileIdentifier::CD(hash.clone())).await?;
 
         Ok(content)
     }
diff --git a/mediarepo-api/src/tauri_plugin/custom_schemes.rs b/mediarepo-api/src/tauri_plugin/custom_schemes.rs
index 1419b98..436b8f4 100644
--- a/mediarepo-api/src/tauri_plugin/custom_schemes.rs
+++ b/mediarepo-api/src/tauri_plugin/custom_schemes.rs
@@ -69,12 +69,12 @@ async fn content_scheme<R: Runtime>(app: &AppHandle<R>, request: &Request) -> Re
         let api = api_state.api().await?;
         let file = api
             .file
-            .get_file(FileIdentifier::CID(hash.to_string()))
+            .get_file(FileIdentifier::CD(hash.to_string()))
             .await?;
         let mime = file.mime_type;
         let bytes = api
             .file
-            .read_file(FileIdentifier::CID(hash.to_string()))
+            .read_file(FileIdentifier::CD(hash.to_string()))
             .await?;
         tracing::debug!("Received {} content bytes", bytes.len());
         buf_state.add_entry(hash.to_string(), mime.clone(), bytes.clone());
@@ -121,7 +121,7 @@ async fn thumb_scheme<R: Runtime>(app: &AppHandle<R>, request: &Request) -> Resu
         let (thumb, bytes) = api
             .file
             .get_thumbnail_of_size(
-                FileIdentifier::CID(hash.to_string()),
+                FileIdentifier::CD(hash.to_string()),
                 ((height as f32 * 0.8) as u32, (width as f32 * 0.8) as u32),
                 ((height as f32 * 1.2) as u32, (width as f32 * 1.2) as u32),
             )
diff --git a/mediarepo-api/src/types/identifier.rs b/mediarepo-api/src/types/identifier.rs
index 7afef60..3ec9929 100644
--- a/mediarepo-api/src/types/identifier.rs
+++ b/mediarepo-api/src/types/identifier.rs
@@ -3,5 +3,5 @@ use serde::{Deserialize, Serialize};
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub enum FileIdentifier {
     ID(i64),
-    CID(String),
+    CD(String),
 }