bump

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "git-mover"
-version = "1.0.3"
+version = "1.0.4"
 edition = "2021"
 keywords = ["utility", "git", "cli"]
 categories = ["command-line-utilities"]
@@ -25,3 +25,4 @@ serde_json = "1.0.135"
 tokio = { version = "1", features = ["full"] }
 toml = "0.8.19"
 url = "2.5.4"
+urlencoding = "2.1.3"

src/codeberg/platform.rs

@@ -2,11 +2,12 @@
 use reqwest::header::{ACCEPT, AUTHORIZATION, CONTENT_TYPE};
 use serde::{Deserialize, Serialize};
 use std::pin::Pin;
+use urlencoding::encode;
 
 use super::{repo::CodebergRepo, CODEBERG_URL};
 use crate::{
     errors::{GitMoverError, GitMoverErrorKind},
-    platform::Platform,
+    platform::{Platform, PlatformType},
     utils::Repo,
 };
 
@@ -62,7 +63,15 @@ impl Platform for CodebergPlatform {
 
             let response = request.await?;
             if !response.status().is_success() {
-                let get_repo = self.get_repo(repo_name.as_str()).await?;
+                let text = response.text().await?;
+                let get_repo = match self.get_repo(repo_name.as_str()).await {
+                    Ok(repo) => repo,
+                    Err(_e) => {
+                        return Err(GitMoverError::new(GitMoverErrorKind::RepoCreation)
+                            .with_platform(PlatformType::Codeberg)
+                            .with_text(&text));
+                    }
+                };
                 let json_body_as_repo = json_body.clone().into();
                 if get_repo != json_body_as_repo {
                     eprintln!(
@@ -91,7 +100,7 @@ impl Platform for CodebergPlatform {
                 "https://{}/api/v1/repos/{}/{}",
                 CODEBERG_URL,
                 self.get_username(),
-                repo_name
+                encode(&repo_name)
             );
             let request = client
                 .get(&url)
@@ -103,7 +112,9 @@ impl Platform for CodebergPlatform {
             let response = request.await?;
             if !response.status().is_success() {
                 let text = response.text().await?;
-                return Err(GitMoverError::new(GitMoverErrorKind::GetRepo).with_text(&text));
+                return Err(GitMoverError::new(GitMoverErrorKind::GetRepo)
+                    .with_platform(PlatformType::Codeberg)
+                    .with_text(&text));
             }
             let repo: CodebergRepo = response.json().await?;
             Ok(repo.into())
@@ -122,7 +133,7 @@ impl Platform for CodebergPlatform {
                 "https://{}/api/v1/repos/{}/{}",
                 CODEBERG_URL,
                 self.get_username(),
-                repo.name
+                encode(&repo.name)
             );
             let json_body = CodebergRepo {
                 name: repo.name.to_string(),
@@ -141,7 +152,9 @@ impl Platform for CodebergPlatform {
             let response = request.await?;
             if !response.status().is_success() {
                 let text = response.text().await?;
-                return Err(GitMoverError::new(GitMoverErrorKind::RepoEdition).with_text(&text));
+                return Err(GitMoverError::new(GitMoverErrorKind::RepoEdition)
+                    .with_platform(PlatformType::Codeberg)
+                    .with_text(&text));
             }
             Ok(())
         })
@@ -168,7 +181,9 @@ impl Platform for CodebergPlatform {
                 let response = request.await?;
                 if !response.status().is_success() {
                     let text = response.text().await?;
-                    return Err(GitMoverError::new(GitMoverErrorKind::GetAllRepos).with_text(&text));
+                    return Err(GitMoverError::new(GitMoverErrorKind::GetAllRepos)
+                        .with_platform(PlatformType::Codeberg)
+                        .with_text(&text));
                 }
                 let text = response.text().await?;
                 let repos: Vec<CodebergRepo> = serde_json::from_str(&text)?;
@@ -196,7 +211,7 @@ impl Platform for CodebergPlatform {
                 "https://{}/api/v1/repos/{}/{}",
                 CODEBERG_URL,
                 self.get_username(),
-                name
+                encode(&name)
             );
             let request = client
                 .delete(&url)
@@ -207,7 +222,9 @@ impl Platform for CodebergPlatform {
             let response = request.await?;
             if !response.status().is_success() {
                 let text = response.text().await?;
-                return Err(GitMoverError::new(GitMoverErrorKind::RepoDeletion).with_text(&text));
+                return Err(GitMoverError::new(GitMoverErrorKind::RepoDeletion)
+                    .with_platform(PlatformType::Codeberg)
+                    .with_text(&text));
             }
             Ok(())
         })

src/errors.rs

@@ -1,6 +1,8 @@
 //! Error handling for the git-mover crate.
 use std::{error::Error as StdError, fmt};
 
+use crate::platform::PlatformType;
+
 /// Error type for the git-mover crate.
 #[derive(Debug)]
 pub struct GitMoverError {
@@ -12,7 +14,11 @@ impl GitMoverError {
     /// Create a new error.
     pub(crate) fn new(kind: GitMoverErrorKind) -> Self {
         Self {
-            inner: Box::new(Inner { kind, source: None }),
+            inner: Box::new(Inner {
+                kind,
+                source: None,
+                platform: None,
+            }),
         }
     }
 
@@ -24,6 +30,12 @@ impl GitMoverError {
         )));
         self
     }
+
+    /// Create a new error with a platform.
+    pub(crate) fn with_platform(mut self, platform: PlatformType) -> Self {
+        self.inner.platform = Some(platform);
+        self
+    }
 }
 
 /// Type alias for a boxed error.
@@ -34,8 +46,12 @@ pub(crate) type BoxError = Box<dyn StdError + Send + Sync>;
 struct Inner {
     /// Error kind.
     kind: GitMoverErrorKind,
+
     /// Source error.
     source: Option<BoxError>,
+
+    /// Platform error
+    platform: Option<PlatformType>,
 }
 
 #[derive(Debug)]
@@ -49,12 +65,15 @@ pub(crate) enum GitMoverErrorKind {
     /// Error related to serde.
     Serde,
 
-    /// Error related to the configuration.
-    Unimplemented,
+    /// Error related to Git2.
+    Git2,
 
     /// Error related to the RepoEdition func.
     RepoEdition,
 
+    /// Error related to the RepoCreation func.
+    RepoCreation,
+
     /// Error related to the GetAllRepo func.
     GetAllRepos,
 
@@ -86,6 +105,7 @@ impl From<reqwest::Error> for GitMoverError {
             inner: Box::new(Inner {
                 kind: GitMoverErrorKind::Reqwest,
                 source: Some(Box::new(e)),
+                platform: None,
             }),
         }
     }
@@ -97,6 +117,7 @@ impl From<serde_json::Error> for GitMoverError {
             inner: Box::new(Inner {
                 kind: GitMoverErrorKind::Serde,
                 source: Some(Box::new(e)),
+                platform: None,
             }),
         }
     }
@@ -108,6 +129,7 @@ impl From<std::io::Error> for GitMoverError {
             inner: Box::new(Inner {
                 kind: GitMoverErrorKind::Platform,
                 source: Some(Box::new(e)),
+                platform: None,
             }),
         }
     }
@@ -117,8 +139,9 @@ impl From<git2::Error> for GitMoverError {
     fn from(e: git2::Error) -> Self {
         Self {
             inner: Box::new(Inner {
-                kind: GitMoverErrorKind::Platform,
+                kind: GitMoverErrorKind::Git2,
                 source: Some(Box::new(e)),
+                platform: None,
             }),
         }
     }

src/github/mod.rs

@@ -5,3 +5,12 @@ pub(crate) mod repo;
 
 /// GitHub URL
 const GITHUB_URL: &str = "github.com";
+
+/// GitHub API URL
+const GITHUB_API_URL: &str = "api.github.com";
+
+/// GitHub API Header
+const GITHUB_API_HEADER: &str = "X-GitHub-Api-Version";
+
+/// GitHub API Version
+const GITHUB_API_VERSION: &str = "2022-11-28";