summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/appimage.rs20
-rw-r--r--src/downloader.rs49
-rw-r--r--src/index.rs26
-rw-r--r--src/lib.rs29
-rw-r--r--src/manager.rs61
-rw-r--r--src/paths.rs14
-rw-r--r--src/symlink.rs34
-rw-r--r--src/types.rs177
8 files changed, 216 insertions, 194 deletions
diff --git a/src/appimage.rs b/src/appimage.rs
new file mode 100644
index 0000000..5d0f8e5
--- /dev/null
+++ b/src/appimage.rs
@@ -0,0 +1,20 @@
+use serde::{Deserialize, Serialize};
+use std::path::PathBuf;
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct AppImage {
+ pub file_path: PathBuf,
+ pub executable: String,
+ pub source: Source,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Source {
+ pub identifier: String,
+ pub meta: SourceMetadata,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct SourceMetadata {
+ pub url: String,
+}
diff --git a/src/downloader.rs b/src/downloader.rs
new file mode 100644
index 0000000..c40b0b4
--- /dev/null
+++ b/src/downloader.rs
@@ -0,0 +1,49 @@
+use futures_util::StreamExt;
+use std::path::PathBuf;
+use tokio::{fs, io::AsyncWriteExt};
+
+use crate::{appimages_dir, make_progress_bar};
+
+#[derive(Debug, Default)]
+pub struct Downloader {}
+
+impl Downloader {
+ pub fn new() -> Self {
+ Self {}
+ }
+ pub async fn download_with_progress(
+ &self,
+ url: &str,
+ path: &PathBuf,
+ ) -> Result<(), Box<dyn std::error::Error>> {
+ fs::create_dir_all(&appimages_dir()).await?;
+
+ let resp = reqwest::get(&url.to_string()).await?;
+ let total_size = resp.content_length().unwrap_or(0);
+
+ let bar = make_progress_bar(total_size);
+ let mut out = tokio::fs::File::create(&path).await?;
+
+ // Stream download with progress updates
+ let mut stream = resp.bytes_stream();
+ while let Some(chunk) = stream.next().await {
+ let chunk = chunk?;
+ let len = chunk.len() as u64;
+ out.write_all(&chunk).await?;
+ bar.inc(len);
+ }
+
+ bar.finish_with_message("Download complete!");
+
+ // Make executable
+ #[cfg(unix)]
+ {
+ use std::os::unix::fs::PermissionsExt;
+ let mut perms = fs::metadata(&path).await?.permissions();
+ perms.set_mode(0o755);
+ fs::set_permissions(&path, perms).await?;
+ }
+
+ Ok(())
+ }
+}
diff --git a/src/index.rs b/src/index.rs
new file mode 100644
index 0000000..e543b1d
--- /dev/null
+++ b/src/index.rs
@@ -0,0 +1,26 @@
+use tokio::fs;
+
+use crate::{AppImage, index_dir};
+
+#[derive(Debug, Default)]
+pub struct Index {}
+
+impl Index {
+ pub fn new() -> Self {
+ Self {}
+ }
+ pub async fn add(
+ &self,
+ appimage: &AppImage,
+ appname: &str,
+ ) -> Result<(), Box<dyn std::error::Error>> {
+ fs::create_dir_all(&index_dir()).await?;
+
+ let index_file = &index_dir().join(format!("{appname}.json"));
+
+ let json = serde_json::to_string_pretty(appimage)?;
+ fs::write(index_file, json).await?;
+
+ Ok(())
+ }
+}
diff --git a/src/lib.rs b/src/lib.rs
index e09a021..c0db44a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,22 +1,17 @@
+mod appimage;
mod args;
+mod downloader;
+mod index;
+mod manager;
+mod paths;
+mod symlink;
mod tui;
-mod types;
+pub use crate::appimage::*;
pub use crate::args::*;
+pub use crate::downloader::*;
+pub use crate::index::*;
+pub use crate::manager::*;
+pub use crate::paths::*;
+pub use crate::symlink::*;
pub use crate::tui::*;
-pub use crate::types::*;
-
-use std::path::PathBuf;
-
-pub fn zap_rs_home() -> PathBuf {
- let home = std::env::var("HOME").expect("HOME not set");
- PathBuf::from(home).join(".local/share/zap-rs")
-}
-
-pub fn index_dir() -> PathBuf {
- zap_rs_home().join("index")
-}
-
-pub fn appimages_dir() -> PathBuf {
- zap_rs_home().join("appimages")
-}
diff --git a/src/manager.rs b/src/manager.rs
new file mode 100644
index 0000000..e810bda
--- /dev/null
+++ b/src/manager.rs
@@ -0,0 +1,61 @@
+use std::path::PathBuf;
+
+use tokio::fs;
+
+use crate::{AppImage, Downloader, Index, SymlinkManager, appimages_dir, index_dir};
+
+#[derive(Debug)]
+pub struct PackageManager {
+ pub downloader: Downloader,
+ pub index: Index,
+ pub symlink_manager: SymlinkManager,
+}
+
+impl PackageManager {
+ pub async fn install(
+ appimage: &AppImage,
+ appname: &str,
+ ) -> Result<(), Box<dyn std::error::Error>> {
+ if index_dir()
+ .join(format!("{}.json", &appimage.executable))
+ .exists()
+ {
+ Err(format!("{} is already installed.", &appimage.executable).into())
+ } else {
+ // Try to extract filename from URL or use default
+ let url = &appimage.source.meta.url;
+ let filename = match url.split('/').next_back() {
+ Some(name) => name.to_string(),
+ None => format!("{}.AppImage", appimage.executable),
+ };
+ let path = &appimages_dir().join(filename);
+
+ let downloader = crate::Downloader::new();
+ downloader.download_with_progress(url, path).await?;
+
+ let index = crate::Index::new();
+ index.add(appimage, appname).await?;
+
+ let sm = crate::SymlinkManager::new();
+ sm.create(appimage).await?;
+ Ok(())
+ }
+ }
+ pub async fn remove(appname: &str) -> Result<(), Box<dyn std::error::Error>> {
+ let index_file_path = index_dir().join(format!("{appname}.json"));
+ let index_file_content = fs::read_to_string(&index_file_path).await?;
+ let appimage: AppImage = serde_json::from_str(&index_file_content)?;
+
+ let home = std::env::var("HOME")?;
+ let symlink_path = PathBuf::from(home)
+ .join(".local/bin")
+ .join(&appimage.executable);
+ let index_path = index_dir().join(format!("{}.json", &appimage.executable));
+
+ fs::remove_file(&appimage.file_path).await?;
+ fs::remove_file(symlink_path).await?;
+ fs::remove_file(index_path).await?;
+
+ Ok(())
+ }
+}
diff --git a/src/paths.rs b/src/paths.rs
new file mode 100644
index 0000000..172cae6
--- /dev/null
+++ b/src/paths.rs
@@ -0,0 +1,14 @@
+use std::path::PathBuf;
+
+pub fn zap_rs_home() -> PathBuf {
+ let home = std::env::var("HOME").expect("HOME not set");
+ PathBuf::from(home).join(".local/share/zap-rs")
+}
+
+pub fn index_dir() -> PathBuf {
+ zap_rs_home().join("index")
+}
+
+pub fn appimages_dir() -> PathBuf {
+ zap_rs_home().join("appimages")
+}
diff --git a/src/symlink.rs b/src/symlink.rs
new file mode 100644
index 0000000..3883172
--- /dev/null
+++ b/src/symlink.rs
@@ -0,0 +1,34 @@
+use std::path::PathBuf;
+use tokio::fs;
+
+use crate::AppImage;
+
+#[derive(Debug, Default)]
+pub struct SymlinkManager {}
+
+impl SymlinkManager {
+ pub fn new() -> Self {
+ Self {}
+ }
+ pub async fn create(&self, appimage: &AppImage) -> Result<(), Box<dyn std::error::Error>> {
+ let home = std::env::var("HOME")?;
+ let local_bin = PathBuf::from(home).join(".local/bin");
+
+ fs::create_dir_all(&local_bin).await?;
+
+ let symlink_path = local_bin.join(&appimage.executable);
+
+ #[cfg(unix)]
+ {
+ use tokio::fs;
+
+ if symlink_path.exists() {
+ fs::remove_file(&symlink_path).await?;
+ }
+
+ std::os::unix::fs::symlink(&appimage.file_path, &symlink_path)?;
+ }
+
+ Ok(())
+ }
+}
diff --git a/src/types.rs b/src/types.rs
deleted file mode 100644
index e0397a1..0000000
--- a/src/types.rs
+++ /dev/null
@@ -1,177 +0,0 @@
-use futures_util::StreamExt;
-use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
-use tokio::{fs, io::AsyncWriteExt};
-
-use crate::{appimages_dir, index_dir, make_progress_bar};
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct AppImage {
- pub file_path: PathBuf,
- pub executable: String,
- pub source: Source,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Source {
- pub identifier: String,
- pub meta: SourceMetadata,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct SourceMetadata {
- pub url: String,
-}
-
-#[derive(Debug)]
-pub struct PackageManager {
- pub downloader: Downloader,
- pub index: Index,
- pub symlink_manager: SymlinkManager,
-}
-
-#[derive(Debug, Default)]
-pub struct Downloader {}
-
-#[derive(Debug, Default)]
-pub struct Index {}
-
-#[derive(Debug, Default)]
-pub struct SymlinkManager {}
-
-impl PackageManager {
- pub async fn install(
- appimage: &AppImage,
- appname: &str,
- ) -> Result<(), Box<dyn std::error::Error>> {
- if index_dir()
- .join(format!("{}.json", &appimage.executable))
- .exists()
- {
- Err(format!("{} is already installed.", &appimage.executable).into())
- } else {
- // Try to extract filename from URL or use default
- let url = &appimage.source.meta.url;
- let filename = match url.split('/').next_back() {
- Some(name) => name.to_string(),
- None => format!("{}.AppImage", appimage.executable),
- };
- let path = &appimages_dir().join(filename);
-
- let downloader = crate::Downloader::new();
- downloader.download_with_progress(url, path).await?;
-
- let index = crate::Index::new();
- index.add(appimage, appname).await?;
-
- let sm = crate::SymlinkManager::new();
- sm.create(appimage).await?;
- Ok(())
- }
- }
- pub async fn remove(appname: &str) -> Result<(), Box<dyn std::error::Error>> {
- let index_file_path = index_dir().join(format!("{appname}.json"));
- let index_file_content = fs::read_to_string(&index_file_path).await?;
- let appimage: AppImage = serde_json::from_str(&index_file_content)?;
-
- let home = std::env::var("HOME")?;
- let symlink_path = PathBuf::from(home)
- .join(".local/bin")
- .join(&appimage.executable);
- let index_path = index_dir().join(format!("{}.json", &appimage.executable));
-
- fs::remove_file(&appimage.file_path).await?;
- fs::remove_file(symlink_path).await?;
- fs::remove_file(index_path).await?;
-
- Ok(())
- }
-}
-
-impl Downloader {
- pub fn new() -> Self {
- Self {}
- }
- pub async fn download_with_progress(
- &self,
- url: &str,
- path: &PathBuf,
- ) -> Result<(), Box<dyn std::error::Error>> {
- fs::create_dir_all(&appimages_dir()).await?;
-
- let resp = reqwest::get(&url.to_string()).await?;
- let total_size = resp.content_length().unwrap_or(0);
-
- let bar = make_progress_bar(total_size);
- let mut out = tokio::fs::File::create(&path).await?;
-
- // Stream download with progress updates
- let mut stream = resp.bytes_stream();
- while let Some(chunk) = stream.next().await {
- let chunk = chunk?;
- let len = chunk.len() as u64;
- out.write_all(&chunk).await?;
- bar.inc(len);
- }
-
- bar.finish_with_message("Download complete!");
-
- // Make executable
- #[cfg(unix)]
- {
- use std::os::unix::fs::PermissionsExt;
- let mut perms = fs::metadata(&path).await?.permissions();
- perms.set_mode(0o755);
- fs::set_permissions(&path, perms).await?;
- }
-
- Ok(())
- }
-}
-
-impl Index {
- pub fn new() -> Self {
- Self {}
- }
- pub async fn add(
- &self,
- appimage: &AppImage,
- appname: &str,
- ) -> Result<(), Box<dyn std::error::Error>> {
- fs::create_dir_all(&index_dir()).await?;
-
- let index_file = &index_dir().join(format!("{appname}.json"));
-
- let json = serde_json::to_string_pretty(appimage)?;
- fs::write(index_file, json).await?;
-
- Ok(())
- }
-}
-
-impl SymlinkManager {
- pub fn new() -> Self {
- Self {}
- }
- pub async fn create(&self, appimage: &AppImage) -> Result<(), Box<dyn std::error::Error>> {
- let home = std::env::var("HOME")?;
- let local_bin = PathBuf::from(home).join(".local/bin");
-
- fs::create_dir_all(&local_bin).await?;
-
- let symlink_path = local_bin.join(&appimage.executable);
-
- #[cfg(unix)]
- {
- use tokio::fs;
-
- if symlink_path.exists() {
- fs::remove_file(&symlink_path).await?;
- }
-
- std::os::unix::fs::symlink(&appimage.file_path, &symlink_path)?;
- }
-
- Ok(())
- }
-}
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-16 02:24:24 +0000