feat: Allow moving torrents between folders

Author: angrynode

Cargo.lock

@@ -48,6 +48,7 @@ sea-orm-migration = { version = "2.0.0-rc.38" }
 serde = { version = "1.0.228", features = ["derive", "rc"] }
 # (De)serialization for operations log
 serde_json = { version = "1" }
+serde_with = "3.20.0"
 # Error declaration/context
 snafu = "0.9"
 # Serve static assets directly from the binary

Cargo.toml

@@ -37,6 +37,11 @@ pub enum Operation {
     Category(CategoryForm),
     ContentFolder(ContentFolderForm),
     Torrent(TorrentForm),
+    MoveTorrent {
+        torrent: i32,
+        category: i32,
+        content_folder: Option<i32>,
+    },
 }
 
 impl std::fmt::Display for Operation {

src/database/operation.rs

@@ -263,4 +263,40 @@ impl TorrentOperator {
 
         Ok(model)
     }
+
+    pub async fn update_category_content_folder(
+        &self,
+        model: Model,
+        category: category::Model,
+        content_folder: Option<content_folder::Model>,
+    ) -> Result<Model, TorrentError> {
+        let mut active: ActiveModel = model.clone().into();
+        active.category_id = Set(category.id);
+        active.content_folder_id = Set(content_folder.as_ref().map(|x| x.id));
+        active.save(&self.state.database).await.context(DBSnafu)?;
+
+        let operation_log = OperationLog {
+            user: self.user.clone(),
+            date: Utc::now(),
+            table: Table::Torrent,
+            operation: OperationType::Update,
+            operation_id: OperationId {
+                object_id: model.id.to_owned(),
+                name: model.name.to_string(),
+            },
+            operation_form: Some(Operation::MoveTorrent {
+                torrent: model.id,
+                category: category.id,
+                content_folder: content_folder.map(|x| x.id),
+            }),
+        };
+
+        self.state
+            .logger
+            .write(operation_log)
+            .await
+            .context(LoggerSnafu)?;
+
+        Ok(model)
+    }
 }

src/database/torrent.rs

@@ -1,5 +1,6 @@
 pub mod category_request;
 pub mod folder_request;
+pub mod moving;
 pub mod normalized_path;
 pub mod torrent_list;
 pub mod user;

src/extractors/mod.rs

@@ -0,0 +1,15 @@
+use serde::Deserialize;
+use serde_with::serde_as;
+
+/// 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 MovingQuery {
+    #[serde(default)]
+    #[serde_as(as = "DeserializeFromStr")]
+    pub id: Option<i32>,
+    #[serde(default)]
+    pub validate: bool,
+}

src/extractors/moving.rs

@@ -1,21 +1,22 @@
 use askama::Template;
 use askama_web::WebTemplate;
 use axum::Form;
-use axum::extract::Path;
+use axum::extract::{Path, Query};
+use axum::response::{IntoResponse, Response};
 use axum_extra::extract::CookieJar;
 use serde::{Deserialize, Serialize};
+use snafu::prelude::*;
 
 use crate::database::category;
 use crate::database::content_folder::PathBreadcrumb;
 use crate::database::torrent;
 use crate::extractors::category_request::{CategoriesRequest, CategoryRequest};
+use crate::extractors::moving::MovingQuery;
 use crate::filesystem::FileSystemEntry;
 use crate::routes::content_folder::ContentFolderForm;
 use crate::routes::index::IndexTemplate;
-use crate::state::AppStateContext;
-use crate::state::flash_message::{
-    FallibleTemplate, FlashRedirect, FlashTemplate, OperationStatus, StatusCookie,
-};
+use crate::state::flash_message::{FallibleTemplate, FlashRedirect, OperationStatus, StatusCookie};
+use crate::state::{AppStateContext, error::*};
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct CategoryForm {
@@ -95,10 +96,16 @@ pub struct CategoryShowTemplate {
     pub breadcrumbs: Vec<PathBreadcrumb>,
     /// Torrents in this category
     pub torrents: Vec<torrent::Model>,
+    /// If any, the current torrent being moved in the folder.
+    pub current_torrent: Option<torrent::Model>,
 }
 
 impl CategoryShowTemplate {
-    fn new(context: AppStateContext, category: CategoryRequest) -> Self {
+    fn new(
+        context: AppStateContext,
+        category: CategoryRequest,
+        current_torrent: Option<torrent::Model>,
+    ) -> Self {
         let CategoryRequest {
             breadcrumbs,
             category,
@@ -113,6 +120,7 @@ impl CategoryShowTemplate {
             flash: None,
             state: context,
             torrents,
+            current_torrent,
         }
     }
 }
@@ -127,8 +135,41 @@ pub async fn show(
     context: AppStateContext,
     category: CategoryRequest,
     status: StatusCookie,
-) -> FlashTemplate<CategoryShowTemplate> {
-    status.with_template(CategoryShowTemplate::new(context, category))
+    Query(moving): Query<MovingQuery>,
+) -> Result<Response, AppStateError> {
+    if let Some(id) = moving.id {
+        // We are currently moving a torrent between folders
+        let torrent: torrent::Model = context
+            .db
+            .torrent()
+            .get(id)
+            .await
+            .context(TorrentUploadSnafu)?;
+        if moving.validate {
+            // Save to DB the new location of the torrent
+            let _torrent = context
+                .db
+                .torrent()
+                .update_category_content_folder(torrent.clone(), category.category.clone(), None)
+                .await
+                .context(TorrentUploadSnafu)?;
+            // Now we produce a redirection (to the same page) in order to refresh the list of torrents
+            // in this folder, which was already computed.
+            Ok(status
+                .with_success("Torrent successfully saved to this folder".to_string())
+                // Need to remove the query params
+                .redirect("?")
+                .into_response())
+        } else {
+            Ok(status
+                .with_template(CategoryShowTemplate::new(context, category, Some(torrent)))
+                .into_response())
+        }
+    } else {
+        Ok(status
+            .with_template(CategoryShowTemplate::new(context, category, None))
+            .into_response())
+    }
 }
 
 pub async fn create_folder(
@@ -152,7 +193,7 @@ pub async fn create_folder(
         }
         Err(error) => {
             let status = OperationStatus::error(error);
-            Err(status.with_template(CategoryShowTemplate::new(context, category)))
+            Err(status.with_template(CategoryShowTemplate::new(context, category, None)))
         }
     }
 }