feat: Allow moving (resolved) torrents between folders

Author: angrynode

Cargo.lock

@@ -74,6 +74,7 @@ toml = { version = "1", features = ["preserve_order"] }
 uucore = { version = "0.8.0", features = ["fsext"] }
 # Finding XDG standard directories (such as ~/.config/torrentmanager/config.toml)
 xdg = "3.0.0"
+serde_with = "3.20.0"
 
 [dev-dependencies]
 async-tempfile = "0.7"

Cargo.toml

@@ -22,6 +22,11 @@ pub enum ContentFolderError {
     Logger { source: LoggerError },
     #[snafu(display("Failed to create the folder on disk"))]
     IO { source: std::io::Error },
+    #[snafu(display("Failed to load the torrent {id} requested to be moved"))]
+    MovingTorrent {
+        id: i32,
+        source: crate::database::torrent::TorrentError,
+    },
 }
 
 impl From<ContentFolderError> for AppStateError {

src/database/content_folder/error.rs

@@ -1,3 +1,5 @@
+use snafu::prelude::*;
+
 use crate::database::torrent;
 
 use super::*;
@@ -14,6 +16,7 @@ pub struct FolderView {
     pub children: Vec<Model>,
     pub folder: Option<Model>,
     pub torrents: Vec<torrent::Model>,
+    pub moving_torrent: Option<torrent::Model>,
 }
 
 impl FolderView {
@@ -31,6 +34,7 @@ impl FolderView {
             folder: None,
             children,
             torrents: vec![],
+            moving_torrent: None,
         })
     }
 
@@ -43,6 +47,7 @@ impl FolderView {
     pub async fn from_id(
         operator: &ContentFolderOperator<'_>,
         id: i32,
+        moving_id: Option<i32>,
     ) -> Result<Self, ContentFolderError> {
         let list = operator.list().await?;
 
@@ -54,6 +59,19 @@ impl FolderView {
                 .await
                 .unwrap();
 
+            let moving_torrent = if let Some(moving_id) = moving_id {
+                Some(
+                    operator
+                        .db()
+                        .torrent()
+                        .get(moving_id)
+                        .await
+                        .context(MovingTorrentSnafu { id: moving_id })?,
+                )
+            } else {
+                None
+            };
+
             Ok(Self {
                 ancestors: folder
                     .ancestors_from_list(&list)
@@ -67,6 +85,7 @@ impl FolderView {
                     .collect(),
                 folder: Some(folder.clone()),
                 torrents,
+                moving_torrent,
             })
         } else {
             Err(ContentFolderError::NotFound { id })

src/database/content_folder/folder_view.rs

@@ -201,6 +201,33 @@ impl TorrentOperator<'_> {
         Ok(model)
     }
 
+    /// Moves a torrent to a given content folder
+    ///
+    /// TODO: This should error if there are conflicting files over there,
+    /// by checking torrent content.
+    pub async fn move_folder(
+        &self,
+        torrent: Model,
+        folder: &content_folder::Model,
+    ) -> Result<Model, TorrentError> {
+        let mut active_model: ActiveModel = torrent.into();
+        active_model.content_folder_id = Set(folder.id);
+        let torrent = active_model
+            .update(&self.state.database)
+            .await
+            .context(DBSnafu)?;
+
+        // TODO: log the move
+        // self.log_update(TorrentOperation::MoveFolder {
+        //     id: torrent.id,
+        //     name: torrent.name.to_string(),
+        //     previous_folder: 
+        //     new_folder: 
+        // }).await.context(LoggerSnafu)?;
+
+        Ok(torrent)
+    }
+
     /// Internal method used by `import_torrent`.
     ///
     /// Resolves a magnet to a torrent, or if it's already resolved, errors because of duplicate.

src/database/torrent/operator.rs

@@ -2,8 +2,11 @@ use askama::Template;
 use askama_web::WebTemplate;
 use axum::extract::Form;
 use axum::extract::Path;
+use axum::extract::Query;
+use axum::response::{IntoResponse, Response};
 use axum_extra::extract::CookieJar;
 use serde::{Deserialize, Serialize};
+use serde_with::serde_as;
 
 use crate::database::{content_folder, torrent};
 use crate::state::AppStateContext;
@@ -17,6 +20,19 @@ pub struct ContentFolderForm {
     pub name: String,
 }
 
+/// A request to move a torrent around in the categories/folders.
+///
+/// When validate is set, the requested folder is set to the database.
+#[derive(Clone, Debug, Deserialize)]
+#[serde_as]
+pub struct MoveTorrentQuery {
+    #[serde(default)]
+    #[serde_as(as = "DeserializeFromStr")]
+    pub moving_id: Option<i32>,
+    #[serde(default)]
+    pub moving_validate: bool,
+}
+
 #[derive(Template, WebTemplate)]
 #[template(path = "content_folders/show.html")]
 pub struct ContentFolderShowTemplate {
@@ -33,6 +49,8 @@ pub struct ContentFolderShowTemplate {
     pub ancestors: Vec<content_folder::Model>,
     /// Operation status for UI confirmation (Cookie)
     pub flash: Option<OperationStatus>,
+    /// Torrent being moved (if any)
+    pub moving_torrent: Option<torrent::Model>,
 }
 
 impl ContentFolderShowTemplate {
@@ -42,6 +60,7 @@ impl ContentFolderShowTemplate {
             children,
             folder,
             torrents,
+            moving_torrent,
         } = folder;
 
         Self {
@@ -51,6 +70,7 @@ impl ContentFolderShowTemplate {
             torrents,
             ancestors,
             state: context,
+            moving_torrent,
         }
     }
 }
@@ -65,10 +85,40 @@ pub async fn show(
     context: AppStateContext,
     Path(id): Path<i32>,
     status: StatusCookie,
-) -> Result<FlashTemplate<ContentFolderShowTemplate>, AppStateError> {
+    Query(moving): Query<MoveTorrentQuery>,
+) -> Result<Response, AppStateError> {
     // 404 if requested ID does not exist
-    let view = content_folder::FolderView::from_id(&context.db.content_folder(), id).await?;
-    Ok(status.with_template(ContentFolderShowTemplate::new(context, view)))
+    let view =
+        content_folder::FolderView::from_id(&context.db.content_folder(), id, moving.moving_id)
+            .await?;
+
+    if view.moving_torrent.is_some() && moving.moving_validate {
+        // Request to effectively move the torrent to this folder
+        // Once done, redirect to the same page
+        if let Err(e) = context
+            .db
+            .torrent()
+            .move_folder(
+                view.moving_torrent.clone().unwrap(),
+                view.folder.as_ref().unwrap(),
+            )
+            .await
+        {
+            return Ok(OperationStatus::error(e)
+                .with_template(ContentFolderShowTemplate::new(context, view))
+                .into_response());
+        }
+
+        // Success! Perform a redirection
+        return Ok(status
+            .with_success("Torrent successfully moved".to_string())
+            .redirect(&format!("/folders/{}", view.folder.as_ref().unwrap().id))
+            .into_response());
+    }
+
+    Ok(status
+        .with_template(ContentFolderShowTemplate::new(context, view))
+        .into_response())
 }
 
 pub async fn index(
@@ -112,14 +162,13 @@ pub async fn create_folder(
     }
 }
 
-// TODO: create top-level
 pub async fn create_subfolder(
     context: AppStateContext,
     jar: CookieJar,
     Path(id): Path<i32>,
     Form(form): Form<ContentFolderForm>,
 ) -> Result<Result<FlashRedirect, ContentFolderShowTemplate>, AppStateError> {
-    let view = content_folder::FolderView::from_id(&context.db.content_folder(), id).await?;
+    let view = content_folder::FolderView::from_id(&context.db.content_folder(), id, None).await?;
     match context
         .db
         .content_folder()

src/routes/content_folder.rs

@@ -37,7 +37,7 @@ pub async fn upload_torrent(
     jar: CookieJar,
     TypedMultipart(form): TypedMultipart<TorrentForm>,
 ) -> Result<Response, AppStateError> {
-    let view = FolderView::from_id(&context.db.content_folder(), id).await?;
+    let view = FolderView::from_id(&context.db.content_folder(), id, None).await?;
 
     if let Err(e) = context
         .db
@@ -64,7 +64,7 @@ pub async fn upload_magnet(
     jar: CookieJar,
     Form(form): Form<MagnetForm>,
 ) -> Result<Response, AppStateError> {
-    let view = FolderView::from_id(&context.db.content_folder(), id).await?;
+    let view = FolderView::from_id(&context.db.content_folder(), id, None).await?;
 
     if let Err(e) = context
         .db