split generation into method and struct files

generator/src/main.rs

@@ -1,4 +1,4 @@
-use std::ffi::{OsStr, OsString};
+use std::{ffi::OsString, path::PathBuf};
 
 mod methods;
 mod openapi;
@@ -9,10 +9,12 @@ use openapi::*;
 
 fn main() -> eyre::Result<()> {
     let spec = get_spec()?;
-    let mut s = String::new();
+    let files = [
-    s.push_str(&methods::create_methods(&spec)?);
+        ("mod.rs".into(), "pub mod structs;\npub mod methods;".into()),
-    s.push_str(&structs::create_structs(&spec)?);
+        ("methods.rs".into(), methods::create_methods(&spec)?),
-    save_generated(&s)?;
+        ("structs.rs".into(), structs::create_structs(&spec)?),
+    ];
+    save_generated(&files)?;
     Ok(())
 }
 
@@ -25,15 +27,21 @@ fn get_spec() -> eyre::Result<OpenApiV2> {
     Ok(spec)
 }
 
-fn save_generated(contents: &str) -> eyre::Result<()> {
+fn save_generated(files: &[(String, String)]) -> eyre::Result<()> {
-    let path = std::env::var_os("FORGEJO_API_GENERATED_PATH")
+    let root_path = PathBuf::from(
-        .unwrap_or_else(|| OsString::from("./src/generated.rs"));
+        std::env::var_os("FORGEJO_API_GENERATED_PATH")
-    std::fs::write(path.as_os_str(), contents)?;
+            .unwrap_or_else(|| OsString::from("./src/generated/")),
-    run_rustfmt_on(path.as_os_str());
+    );
+    for (path, file) in files {
+        let path = root_path.join(path);
+        std::fs::create_dir_all(path.parent().ok_or_else(|| eyre::eyre!("no parent dir"))?)?;
+        std::fs::write(&path, file)?;
+        run_rustfmt_on(&path);
+    }
     Ok(())
 }
 
-fn run_rustfmt_on(path: &OsStr) {
+fn run_rustfmt_on(path: &std::path::Path) {
     let mut rustfmt = std::process::Command::new("rustfmt");
 
     rustfmt.arg(path);

generator/src/methods.rs

@@ -6,6 +6,8 @@ use std::fmt::Write;
 pub fn create_methods(spec: &OpenApiV2) -> eyre::Result<String> {
     let mut s = String::new();
     s.push_str("use crate::ForgejoError;\n");
+    s.push_str("use super::structs::*;\n");
+    s.push_str("\n");
     s.push_str("impl crate::Forgejo {\n");
     for (path, item) in &spec.paths {
         s.push_str(&create_methods_for_path(&spec, path, item).wrap_err_with(|| path.clone())?);

generator/src/structs.rs

@@ -5,8 +5,6 @@ use std::fmt::Write;
 
 pub fn create_structs(spec: &OpenApiV2) -> eyre::Result<String> {
     let mut s = String::new();
-    s.push_str("use structs::*;\n");
-    s.push_str("pub mod structs {\n");
     s.push_str("use crate::StructureError;");
     if let Some(definitions) = &spec.definitions {
         for (name, schema) in definitions {
@@ -32,7 +30,6 @@ pub fn create_structs(spec: &OpenApiV2) -> eyre::Result<String> {
         let strukt = create_response_structs(spec, item)?;
         s.push_str(&strukt);
     }
-    s.push_str("\n}");
     Ok(s)
 }
 

src/generated/mod.rs

@@ -0,0 +1,2 @@
+pub mod methods;
+pub mod structs;