fix: Proper/link display of category/folder in magnet list

Author: amateurforger

Cargo.lock

@@ -37,6 +37,7 @@ env_logger = "0.11.8"
 # Comment/uncomment below for development version
 # hightorrent_api = { path = "../hightorrent_api" }
 hightorrent_api = { git = "https://github.com/angrynode/hightorrent_api", branch = "feat-sea-orm", features = [ "sea_orm" ]}
+itertools = "0.14.0"
 # hightorrent_api = "0.2"
 log = "0.4.27"
 # SQLite ORM

Cargo.toml

@@ -1,6 +1,7 @@
 use askama::Template;
 use askama_web::WebTemplate;
 use hightorrent_api::hightorrent::MagnetLink;
+use itertools::multizip;
 use serde::{Deserialize, Serialize};
 use snafu::prelude::*;
 
@@ -73,7 +74,11 @@ pub struct MagnetListTemplate {
     /// Global application state (errors/warnings)
     pub state: AppStateContext,
     /// Magnets stored in database
-    pub magnets: Vec<(magnet::Model, content_folder::Model)>,
+    pub magnets: Vec<(
+        magnet::Model,
+        category::Model,
+        Option<content_folder::Model>,
+    )>,
 }
 
 pub async fn list(context: AppStateContext) -> Result<MagnetListTemplate, AppStateError> {
@@ -86,18 +91,20 @@ pub async fn list(context: AppStateContext) -> Result<MagnetListTemplate, AppSta
         .context(OtherSnafu)?;
 
     // In the creation form we guarantee to set the content_folder so we can unwrap
-    let content_folders: Vec<content_folder::Model> = magnets
+    let content_folders: Vec<Option<content_folder::Model>> = magnets
         .load_one(content_folder::Entity, &context.state.database)
         .await
+        .context(SqliteSnafu)?;
+
+    let categories: Vec<category::Model> = magnets
+        .load_one(category::Entity, &context.state.database)
+        .await
         .context(SqliteSnafu)?
         .into_iter()
         .map(|x| x.unwrap())
         .collect();
 
-    let magnets = magnets
-        .into_iter()
-        .zip(content_folders.into_iter())
-        .collect();
+    let magnets = multizip((magnets, categories, content_folders)).collect();
 
     Ok(MagnetListTemplate {
         state: context,

src/routes/magnet.rs

@@ -15,10 +15,14 @@ <h1>List of uploaded magnets not yet resolved</h1>
                 <th>Actions</th>
               </tr>
             </thead>
-            {% for (magnet, content_folder) in magnets %}
+            {% for (magnet, category, content_folder) in magnets %}
             <tr>
               <td class="is-left" align="left"><a href="/magnet/{{ magnet.id }}">{{ magnet.name }}</a></td>
-              <td><a href="/folders/{{ content_folder.category_id }}/{{ content_folder.id }}">{{ content_folder.path }}</a></td>
+              {% if let Some(content_folder) = content_folder %}
+              <td><a href="/folders/{{ category.name }}{{ content_folder.path }}">{{ category.name }}{{ content_folder.path }}</a></td>
+              {% else %}
+              <td><a href="/folders/{{ category.name }}">{{ category.name }}</a></td>
+              {% endif %}
               <td>
                 {% if magnet.resolved %}
                   <!-- TODO: mettre le lien vers la page des d'import d'un torrent -->