feat: Display pending torrents in category/folders

Author: angrynode

src/database/torrent.rs

@@ -62,6 +62,10 @@ pub struct TorrentOperator {
 }
 
 impl TorrentOperator {
+    pub fn new(state: AppState, user: Option<User>) -> Self {
+        Self { state, user }
+    }
+
     pub fn db(&self) -> DatabaseOperator {
         DatabaseOperator {
             state: self.state.clone(),
@@ -97,6 +101,35 @@ impl TorrentOperator {
             .context(DBSnafu)
     }
 
+    /// List torrents in a specific category (without recursing)
+    ///
+    /// Should not fail, unless SQLite was corrupted for some reason.
+    pub async fn list_for_category(&self, category_id: i32) -> Result<Vec<Model>, TorrentError> {
+        // TODO: optimization
+        Ok(self
+            .list()
+            .await?
+            .into_iter()
+            .filter(|x| x.category_id == category_id && x.content_folder_id.is_none())
+            .collect())
+    }
+
+    /// List torrents in a specific content_folder (without recursing)
+    ///
+    /// Should not fail, unless SQLite was corrupted for some reason.
+    pub async fn list_for_content_folder(
+        &self,
+        content_folder_id: i32,
+    ) -> Result<Vec<Model>, TorrentError> {
+        // TODO: optimization
+        Ok(self
+            .list()
+            .await?
+            .into_iter()
+            .filter(|x| x.content_folder_id == Some(content_folder_id))
+            .collect())
+    }
+
     /// Count magnets
     ///
     /// Should not fail, unless SQLite was corrupted for some reason.

src/extractors/category_request.rs

@@ -4,6 +4,7 @@ use snafu::prelude::*;
 
 use crate::database::category::{self, CategoryOperator};
 use crate::database::content_folder::PathBreadcrumb;
+use crate::database::torrent::{self, TorrentOperator};
 use crate::filesystem::FileSystemEntry;
 use crate::state::{AppState, error::*};
 
@@ -34,6 +35,7 @@ pub struct CategoryRequest {
     pub category: category::Model,
     pub breadcrumbs: Vec<PathBreadcrumb>,
     pub children: Vec<FileSystemEntry>,
+    pub torrents: Vec<torrent::Model>,
 }
 
 impl FromRequestParts<AppState> for CategoryRequest {
@@ -66,10 +68,16 @@ impl FromRequestParts<AppState> for CategoryRequest {
 
         let breadcrumbs = PathBreadcrumb::for_filesystem_path(category.name.as_str());
 
+        let torrents = TorrentOperator::new(app_state.clone(), None)
+            .list_for_category(category.id)
+            .await
+            .context(TorrentUploadSnafu)?;
+
         Ok(Self {
             category,
             children,
             breadcrumbs,
+            torrents,
         })
     }
 }

src/extractors/folder_request.rs

@@ -4,6 +4,7 @@ use snafu::prelude::*;
 
 use crate::database::category::{self, CategoryOperator};
 use crate::database::content_folder::{self, ContentFolderOperator, PathBreadcrumb};
+use crate::database::torrent::{self, TorrentOperator};
 use crate::filesystem::FileSystemEntry;
 use crate::state::AppState;
 use crate::state::error::*;
@@ -14,6 +15,7 @@ pub struct FolderRequest {
     pub folder: content_folder::Model,
     pub children: Vec<FileSystemEntry>,
     pub breadcrumbs: Vec<PathBreadcrumb>,
+    pub torrents: Vec<torrent::Model>,
 }
 
 impl FromRequestParts<AppState> for FolderRequest {
@@ -34,6 +36,7 @@ impl FromRequestParts<AppState> for FolderRequest {
         // Read-only operators: no need to extract the current user
         let category_operator = CategoryOperator::new(app_state.clone(), None);
         let content_folder_operator = ContentFolderOperator::new(app_state.clone(), None);
+        let torrent_operator = TorrentOperator::new(app_state.clone(), None);
 
         // get current content folders with Path
         let current_content_folder = content_folder_operator
@@ -60,11 +63,17 @@ impl FromRequestParts<AppState> for FolderRequest {
             category.name, current_content_folder.path
         ));
 
+        let torrents = torrent_operator
+            .list_for_content_folder(current_content_folder.id)
+            .await
+            .context(TorrentUploadSnafu)?;
+
         Ok(Self {
             category,
             folder: current_content_folder,
             children,
             breadcrumbs,
+            torrents,
         })
     }
 }

src/routes/category.rs

@@ -7,6 +7,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::database::category;
 use crate::database::content_folder::PathBreadcrumb;
+use crate::database::torrent;
 use crate::extractors::category_request::{CategoriesRequest, CategoryRequest};
 use crate::filesystem::FileSystemEntry;
 use crate::routes::content_folder::ContentFolderForm;
@@ -92,6 +93,8 @@ pub struct CategoryShowTemplate {
     pub flash: Option<OperationStatus>,
     /// Breadcrumbs navigation
     pub breadcrumbs: Vec<PathBreadcrumb>,
+    /// Torrents in this category
+    pub torrents: Vec<torrent::Model>,
 }
 
 impl CategoryShowTemplate {
@@ -100,6 +103,7 @@ impl CategoryShowTemplate {
             breadcrumbs,
             category,
             children,
+            torrents,
         } = category;
 
         Self {
@@ -108,6 +112,7 @@ impl CategoryShowTemplate {
             children,
             flash: None,
             state: context,
+            torrents,
         }
     }
 }

src/routes/content_folder.rs

@@ -5,7 +5,7 @@ use axum_extra::extract::CookieJar;
 use serde::{Deserialize, Serialize};
 
 use crate::database::content_folder::PathBreadcrumb;
-use crate::database::{category, content_folder};
+use crate::database::{category, content_folder, torrent};
 use crate::extractors::folder_request::FolderRequest;
 use crate::filesystem::FileSystemEntry;
 use crate::state::AppStateContext;
@@ -35,6 +35,8 @@ pub struct ContentFolderShowTemplate {
     pub breadcrumbs: Vec<PathBreadcrumb>,
     /// Operation status for UI confirmation (Cookie)
     pub flash: Option<OperationStatus>,
+    /// Related torrents in this folder
+    pub torrents: Vec<torrent::Model>,
 }
 
 impl ContentFolderShowTemplate {
@@ -44,6 +46,7 @@ impl ContentFolderShowTemplate {
             category,
             children,
             folder,
+            torrents,
         } = folder;
 
         Self {
@@ -53,6 +56,7 @@ impl ContentFolderShowTemplate {
             flash: None,
             folder,
             state: context,
+            torrents,
         }
     }
 }

templates/layouts/file_system_base.html

@@ -42,6 +42,32 @@ <h1>File System</h1>
       </div>
     </div>
 
+    {# torrents is not defined on the homepage (category list) #}
+    {% if torrents is defined && torrents.len() > 0 %}
+    <div class="card mt-4">
+      <div class="card-body">
+        <div class="p-4">
+          <div class="d-flex align-items-center mb-4">
+            <h4 class="mb-0">{{ torrents.len() }} torrents waiting for confirmation in this folder</h4>
+          </div>
+        </div>
+        <ul class="list-group">
+        {% for torrent in torrents %}
+        <li>
+          <span>{{ torrent.name }} will create the following folders/files in this folder:</span>
+          {# TODO: file tree in hightorrent #}
+          <ul>
+          {% for file in torrent.file.decoded.files().unwrap() %}
+            <li>({{ file.size | filesizeformat }}) {{ file.path.to_str().unwrap() }}</li>
+          {% endfor %}
+          </ul>
+        </li>
+        {% endfor %}
+        </ul>
+      </div>
+    </div>
+    {% endif %}
+
     <div class="card mt-4">
       <div class="card-body">
         <div class="p-4">