Skip to content
This repository was archived by the owner on Nov 21, 2025. It is now read-only.

add basic support for s3 storage #260

Open
stanislau-arkhipenka wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

add basic support for s3 storage #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src/login/login_util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ use adw::{
use regex::Regex;
use url::Url;

/// Generic input
pub fn generic_str_input(name: &str) -> EntryRow {
EntryRow::builder().title(&tr::tr!(name)).build()
}

/// Get the input for the server name.
pub fn server_name_input() -> EntryRow {
let input = EntryRow::builder().title(&tr::tr!("Name")).build();
Expand Down
24 changes: 23 additions & 1 deletion src/login/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ mod nextcloud;
mod owncloud;
mod pcloud;
mod proton_drive;
mod s3;
mod webdav;

use adw::{
Expand All @@ -28,6 +29,7 @@ use nextcloud::NextcloudConfig;
use owncloud::OwncloudConfig;
use pcloud::PCloudConfig;
use proton_drive::ProtonDriveConfig;
use s3::S3Config;
use std::{cell::RefCell, rc::Rc};
use webdav::WebDavConfig;

Expand All @@ -52,6 +54,7 @@ pub enum ServerType {
PCloud(pcloud::PCloudConfig),
ProtonDrive(proton_drive::ProtonDriveConfig),
WebDav(webdav::WebDavConfig),
S3(s3::S3Config),
}

impl ToString for ServerType {
Expand All @@ -64,6 +67,7 @@ impl ToString for ServerType {
Self::PCloud(_) => "pCloud",
Self::ProtonDrive(_) => "Proton Drive",
Self::WebDav(_) => "WebDAV",
Self::S3(_) => "S3",
}
.to_string()
}
Expand Down Expand Up @@ -119,6 +123,7 @@ pub fn login(app: &Application, db: &DatabaseConnection) -> Option<RemotesModel>
let pcloud_name = ServerType::PCloud(Default::default()).to_string();
let proton_drive_name = ServerType::ProtonDrive(Default::default()).to_string();
let webdav_name = ServerType::WebDav(Default::default()).to_string();
let s3_name = ServerType::S3(Default::default()).to_string();

// The dropdown for selecting the server type.
let server_type_dropdown = ComboRow::builder().title(&tr::tr!("Server Type")).build();
Expand All @@ -130,6 +135,7 @@ pub fn login(app: &Application, db: &DatabaseConnection) -> Option<RemotesModel>
pcloud_name.as_str(),
proton_drive_name.as_str(),
webdav_name.as_str(),
s3_name.as_str(),
];
let server_types = StringList::new(&server_types_array);
server_type_dropdown.set_model(Some(&server_types));
Expand All @@ -155,7 +161,8 @@ pub fn login(app: &Application, db: &DatabaseConnection) -> Option<RemotesModel>
let owncloud_items = OwncloudConfig::get_sections(&window, sender.clone());
let pcloud_items = PCloudConfig::get_sections(&window, sender.clone());
let proton_drive_items = ProtonDriveConfig::get_sections(&window, sender.clone());
let webdav_items = WebDavConfig::get_sections(&window, sender);
let webdav_items = WebDavConfig::get_sections(&window, sender.clone());
let s3_items = S3Config::get_sections(&window, sender);

// Store the active items.
let active_items: Rc<RefCell<(Vec<EntryRow>, Button)>> =
Expand All @@ -174,6 +181,7 @@ pub fn login(app: &Application, db: &DatabaseConnection) -> Option<RemotesModel>
"pcloud" => pcloud_items.clone(),
"proton drive" => proton_drive_items.clone(),
"webdav" => webdav_items.clone(),
"s3" => s3_items.clone(),
_ => unreachable!()
};

Expand Down Expand Up @@ -226,6 +234,7 @@ pub fn login(app: &Application, db: &DatabaseConnection) -> Option<RemotesModel>
ServerType::PCloud(config) => config.server_name.clone(),
ServerType::ProtonDrive(config) => config.server_name.clone(),
ServerType::WebDav(config) => config.server_name.clone(),
ServerType::S3(config) => config.server_name.clone(),
};

let config_query = match &server {
Expand Down Expand Up @@ -313,6 +322,19 @@ pub fn login(app: &Application, db: &DatabaseConnection) -> Option<RemotesModel>
"obscure": true
}
}),
ServerType::S3(config) => json!({
"name": config_name,
"parameters": {
"endpoint": config.endpoint,
"region": config.region,
"access_key_id": config.access_key_id,
"secret_access_key": config.secret_access_key,
"provider": config.provider,
"acl": config.acl,
"bucket_acl": config.bucket_acl,
},
"type": "s3",
}),
};

util::run_in_background(move || {
Expand Down
68 changes: 68 additions & 0 deletions src/login/s3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
//! The data for a S3 Rclone config.
use super::{login_util, ServerType};
use crate::mpsc::Sender;
use adw::{
gtk::{glib, Button},
prelude::*,
ApplicationWindow, EntryRow,
};

#[derive(Clone, Debug, Default)]
pub struct S3Config {
pub server_name: String,
pub endpoint: String,
pub region: String,
pub access_key_id: String,
pub secret_access_key: String,
pub provider: String,
pub acl: String,
pub bucket_acl: String,
}
impl super::LoginTrait for S3Config {
fn get_sections(
_window: &ApplicationWindow,
sender: Sender<Option<ServerType>>,
) -> (Vec<EntryRow>, Button) {
let mut sections: Vec<EntryRow> = vec![];

let server_name = login_util::server_name_input();
let endpoint = login_util::generic_str_input("Endpoint");
let region = login_util::generic_str_input("Region");
let access_key_id = login_util::generic_str_input("Login ID");
let secret_access_key = login_util::generic_str_input("Secret key");

let submit_button = login_util::submit_button();

sections.push(server_name.clone());
sections.push(endpoint.clone());
sections.push(region.clone());
sections.push(access_key_id.clone());
sections.push(secret_access_key.clone());

submit_button.connect_clicked(
glib::clone!(@weak server_name, @weak endpoint, @weak region, @weak access_key_id, @weak secret_access_key => move |_| {

let server_type = ServerType::S3(S3Config {
server_name: server_name.text().to_string(),
endpoint: endpoint.text().to_string(),
region: region.text().to_string(),
access_key_id: access_key_id.text().to_string(),
secret_access_key: secret_access_key.text().to_string(),
// TODO handle these hardcoded values
provider: "Other".to_string(),
acl: "private".to_string(),
bucket_acl: "private".to_string(),
});
sender.send(Some(server_type));
}),
);

server_name.connect_changed(glib::clone!(@weak server_name, @weak endpoint, @weak region, @weak access_key_id, @weak secret_access_key, @weak submit_button => move |_| login_util::check_responses(&[&server_name, &endpoint, &region, &access_key_id, &secret_access_key], &submit_button)));
endpoint.connect_changed(glib::clone!(@weak server_name, @weak endpoint, @weak region, @weak access_key_id, @weak secret_access_key, @weak submit_button => move |_| login_util::check_responses(&[&server_name, &endpoint, &region, &access_key_id, &secret_access_key], &submit_button)));
region.connect_changed(glib::clone!(@weak server_name, @weak endpoint, @weak region, @weak access_key_id, @weak secret_access_key, @weak submit_button => move |_| login_util::check_responses(&[&server_name, &endpoint, &region, &access_key_id, &secret_access_key], &submit_button)));
access_key_id.connect_changed(glib::clone!(@weak server_name, @weak endpoint, @weak region, @weak access_key_id, @weak secret_access_key, @weak submit_button => move |_| login_util::check_responses(&[&server_name, &endpoint, &region, &access_key_id, &secret_access_key], &submit_button)));
secret_access_key.connect_changed(glib::clone!(@weak server_name, @weak endpoint, @weak region, @weak access_key_id, @weak secret_access_key, @weak submit_button => move |_| login_util::check_responses(&[&server_name, &endpoint, &region, &access_key_id, &secret_access_key], &submit_button)));

(sections, submit_button)
}
}
27 changes: 27 additions & 0 deletions src/rclone.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ pub fn get_remote<T: ToString>(remote: T) -> Option<Remote> {
vendor,
}))
}
"s3" => Some(Remote::S3(S3Remote {
remote_name: remote,
provider: config["provider"].clone(),
access_key_id: config["access_key_id"].clone(),
secret_access_key: config["secret_access_key"].clone(),
region: config["region"].clone(),
endpoint: config["endpoint"].clone(),
})),
_ => None,
}
}
Expand Down Expand Up @@ -84,6 +92,7 @@ pub enum Remote {
PCloud(PCloudRemote),
ProtonDrive(ProtonDriveRemote),
WebDav(WebDavRemote),
S3(S3Remote),
}

impl Remote {
Expand All @@ -94,6 +103,7 @@ impl Remote {
Remote::PCloud(remote) => remote.remote_name.clone(),
Remote::ProtonDrive(remote) => remote.remote_name.clone(),
Remote::WebDav(remote) => remote.remote_name.clone(),
Remote::S3(remote) => remote.remote_name.clone(),
}
}
}
Expand Down Expand Up @@ -140,6 +150,23 @@ pub struct ProtonDriveRemote {
pub username: String,
}

// The S3 remote type
#[derive(Clone, Debug)]
pub struct S3Remote {
/// The name of the remote.
pub remote_name: String,
/// The provider of the remote
pub provider: String,
/// The access key for the remote
pub access_key_id: String,
/// The scret key for the remote
pub secret_access_key: String,
/// The region of the remote
pub region: String,
/// The address to connect to
pub endpoint: String,
}

// The WebDav remote type.
#[derive(Clone, Debug)]
pub struct WebDavRemote {
Expand Down