server-default.toml

@@ -1,6 +1,6 @@
 [forge.default]
-forge_type = "forgejo"
+type = "forgejo"
-hostname = "git.example.net"
+url = "https://git.example.net"
 user = "git-next" # the user to perform actions as
 # API token for user?
 # path to private SSH key for user?

src/server/config.rs

@@ -5,8 +5,8 @@ use crate::filesystem::FileSystem;
 
 #[derive(Debug, PartialEq, Eq, Deserialize)]
 pub struct Config {
-    forge_type: ForgeType,
+    r#type: ForgeType,
-    hostname: String,
+    url: String,
     user: String,
     // API Token
     // Private SSH Key Path
@@ -26,11 +26,11 @@ impl Config {
         let str = fs.read_file("git-next-server.toml").map_err(OneOf::new)?;
         toml::from_str(&str).map_err(OneOf::new)
     }
-    pub const fn forge_type(&self) -> &ForgeType {
+    pub const fn r#type(&self) -> &ForgeType {
-        &self.forge_type
+        &self.r#type
     }
-    pub fn hostname(&self) -> &str {
+    pub fn url(&self) -> &str {
-        self.hostname.as_str()
+        self.url.as_str()
     }
     pub fn user(&self) -> &str {
         self.user.as_str()
@@ -49,15 +49,15 @@ mod tests {
         fs.write_file(
             "git-next-server.toml",
             r#"
-            forge_type = "ForgeJo"
+            type = "ForgeJo"
-            hostname = "git.example.net"
+            url = "https://forge.jo"
             user = "Bob"
         "#,
         )
         .map_err(OneOf::new)?;
         let config = Config::load(&fs)?;
-        assert_eq!(config.forge_type(), &ForgeType::ForgeJo);
+        assert_eq!(config.r#type(), &ForgeType::ForgeJo);
-        assert_eq!(config.hostname(), "git.example.net".to_string());
+        assert_eq!(config.url(), "https://forge.jo".to_string());
         assert_eq!(config.user(), "Bob".to_string());
 
         Ok(())