Fix categories in dioxus

Author: StirlingMouse

mlm_web_dioxus/src/search.rs

@@ -60,7 +60,11 @@ pub fn map_search_torrent(
             .collect(),
         tags: mam_torrent.tags,
         description: mam_torrent.description,
-        categories: meta.categories.clone(),
+        categories: meta
+            .categories
+            .iter()
+            .map(|c| c.as_str().to_string())
+            .collect(),
         flags: flag_values,
         old_category,
         media_type: meta.media_type.as_str().to_string(),

mlm_web_dioxus/src/torrent_detail/server_fns.rs

@@ -91,7 +91,11 @@ fn torrent_info_from_meta(
         filetypes: meta.filetypes.iter().map(|f| f.to_string()).collect(),
         size: meta.size.to_string(),
         num_files: meta.num_files,
-        categories: meta.categories.clone(),
+        categories: meta
+            .categories
+            .iter()
+            .map(|c| c.as_str().to_string())
+            .collect(),
         old_category: meta.cat.as_ref().map(|c| c.to_string()),
         flags: flag_values,
         library_path: None,
@@ -209,7 +213,11 @@ async fn other_torrents_data(
                     .collect(),
                 tags: mam_torrent.tags,
                 description: mam_torrent.description,
-                categories: meta.categories.clone(),
+                categories: meta
+                    .categories
+                    .iter()
+                    .map(|c| c.as_str().to_string())
+                    .collect(),
                 flags: {
                     let flags = mlm_db::Flags::from_bitfield(meta.flags.map_or(0, |f| f.0));
                     crate::utils::flags_to_strings(&flags)

mlm_web_dioxus/src/torrent_edit.rs

@@ -161,7 +161,12 @@ pub async fn get_torrent_meta_edit_data(id: String) -> Result<TorrentMetaEditFor
             .main_cat
             .map(|cat: mlm_db::MainCat| cat.as_id().to_string())
             .unwrap_or_default(),
-        categories_text: meta.categories.join("\n"),
+        categories_text: meta
+            .categories
+            .iter()
+            .map(|c| c.as_str())
+            .collect::<Vec<_>>()
+            .join("\n"),
         tags_text: meta.tags.join("\n"),
         language_id: meta
             .language
@@ -325,14 +330,22 @@ pub async fn update_torrent_meta_edit_data(form: TorrentMetaEditForm) -> Result<
         lgbt: Some(form.lgbt),
     };
 
+    let categories = split_list(&form.categories_text)
+        .into_iter()
+        .map(|raw| {
+            raw.parse::<mlm_db::Category>()
+                .map_err(|e| ServerFnError::new(format!("invalid category '{raw}': {e}")))
+        })
+        .collect::<Result<Vec<_>, _>>()?;
+
     let meta =
         mlm_db::TorrentMeta {
             ids,
             vip_status: parse_vip_status(&form.vip_mode, &form.vip_temp_date)?,
             cat: category,
             media_type,
             main_cat,
-            categories: split_list(&form.categories_text),
+            categories,
             tags: split_list(&form.tags_text),
             language,
             flags: Some(mlm_db::FlagBits::new(flags.as_bitfield())),

mlm_web_dioxus/src/torrents/components.rs

@@ -597,10 +597,10 @@ pub fn TorrentsPage() -> Element {
         }
     }
 
-    if let Some(value) = &value {
-        if let Some(Ok(data)) = &*value.read() {
-            cached.set(Some(data.clone()));
-        }
+    if let Some(value) = &value
+        && let Some(Ok(data)) = &*value.read()
+    {
+        cached.set(Some(data.clone()));
     }
 
     let data_to_show = if let Some(value) = &value {

mlm_web_dioxus/src/torrents/server_fns.rs

@@ -482,7 +482,12 @@ fn convert_torrent_row(t: &DbTorrent) -> TorrentsRow {
             media_type: t.meta.media_type.as_str().to_string(),
             cat_name,
             cat_id,
-            categories: t.meta.categories.clone(),
+            categories: t
+                .meta
+                .categories
+                .iter()
+                .map(|c| c.as_str().to_string())
+                .collect(),
             flags: flag_values,
             edition: t.meta.edition.as_ref().map(|(edition, _)| edition.clone()),
             authors: t.meta.authors.clone(),