feat: Display pending torrents in content folders

Author: angrynode

src/database/content_folder/folder_view.rs

@@ -1,3 +1,5 @@
+use crate::database::torrent;
+
 use super::*;
 
 /// A loaded folder, with all surrounding entities loaded as well:
@@ -11,6 +13,7 @@ pub struct FolderView {
     pub ancestors: Vec<Model>,
     pub children: Vec<Model>,
     pub folder: Option<Model>,
+    pub torrents: Vec<torrent::Model>,
 }
 
 impl FolderView {
@@ -27,6 +30,7 @@ impl FolderView {
             ancestors: vec![],
             folder: None,
             children,
+            torrents: vec![],
         })
     }
 
@@ -43,6 +47,8 @@ impl FolderView {
         let list = operator.list().await?;
 
         if let Some(folder) = list.iter().find(|x| x.id == id) {
+            let torrents = operator.torrent().list_for_folder(folder).await.unwrap();
+
             Ok(Self {
                 ancestors: folder
                     .ancestors_from_list(&list)
@@ -55,6 +61,7 @@ impl FolderView {
                     .cloned()
                     .collect(),
                 folder: Some(folder.clone()),
+                torrents,
             })
         } else {
             Err(ContentFolderError::NotFound { id })

src/database/torrent/operator.rs

@@ -52,6 +52,22 @@ impl TorrentOperator<'_> {
             .context(DBSnafu)
     }
 
+    /// List torrents for a given content folder
+    ///
+    /// Should not fail, unless SQLite was corrupted for some reason.
+    pub async fn list_for_folder(
+        &self,
+        folder: &content_folder::Model,
+    ) -> Result<Vec<Model>, TorrentError> {
+        // TODO: optimization
+        Ok(self
+            .list()
+            .await?
+            .into_iter()
+            .filter(|x| x.content_folder_id == folder.id)
+            .collect())
+    }
+
     /// Count torrents
     ///
     /// Should not fail, unless SQLite was corrupted for some reason.

src/routes/content_folder.rs

@@ -5,7 +5,7 @@ use axum::extract::Path;
 use axum_extra::extract::CookieJar;
 use serde::{Deserialize, Serialize};
 
-use crate::database::content_folder;
+use crate::database::{content_folder, torrent};
 use crate::state::AppStateContext;
 use crate::state::error::AppStateError;
 use crate::state::flash_message::{
@@ -24,6 +24,8 @@ pub struct ContentFolderShowTemplate {
     pub state: AppStateContext,
     /// Current folder, unless we're on the index page
     pub folder: Option<content_folder::Model>,
+    /// Torrents associated with the content folder (empty on index page)
+    pub torrents: Vec<torrent::Model>,
     /// Folders with parent_id set to current folder
     // TODO: order by alphanumeric
     pub children: Vec<content_folder::Model>,
@@ -39,12 +41,14 @@ impl ContentFolderShowTemplate {
             ancestors,
             children,
             folder,
+            torrents,
         } = folder;
 
         Self {
             children,
             flash: None,
             folder,
+            torrents,
             ancestors,
             state: context,
         }

templates/content_folders/show.html

@@ -45,6 +45,35 @@ <h4 class="mb-0">{% block folder_title %}{% if let Some(folder) = folder %}{{ fo
             </div>
           </div>
 
+          {% if 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 %}
+              {% if let Some(torrent_file) = torrent.torrent_file %}
+              <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>
+              {% else %}
+              <li><span>{{ torrent.name }} is still resolving so we can't know the files yet</span></li>
+              {% endif %}
+              {% endfor %}
+              </ul>
+            </div>
+          </div>
+          {% endif %}
+
           <ul class="list-group">
             {% block system_list %}
             {% if children.is_empty() %}