From bc874c9d1363d3bf8865ea7a629eb976e23386b3 Mon Sep 17 00:00:00 2001
From: Melody Horn <melody@boringcactus.com>
Date: Wed, 30 Jun 2021 16:31:21 -0600
Subject: use the actual path to the app dir for make_migrations

---
 src/cli/make_migrations.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/cli/make_migrations.rs')

diff --git a/src/cli/make_migrations.rs b/src/cli/make_migrations.rs
index e0653b6..d4ddcbf 100644
--- a/src/cli/make_migrations.rs
+++ b/src/cli/make_migrations.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 use std::fs;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 use quote::{quote, ToTokens};
 use structopt::StructOpt;
@@ -131,12 +131,11 @@ impl MakeMigrations {
             };
             let file_name = format!("m_{:04}_{}.rs", next_id, name);
             let file_text = file.into_token_stream().to_string();
-            let app_folder = app.name.split("::").skip(1).collect::<PathBuf>();
-            // TODO don't explode if running in a weird place
-            let file_path = PathBuf::from("src")
-                .join(app_folder)
-                .join("migrations")
-                .join(file_name);
+            let app_mod_rs = Path::new(app.mod_rs_path);
+            let app_folder = app_mod_rs
+                .parent()
+                .expect("app mod.rs lives at filesystem root???");
+            let file_path = app_folder.join("migrations").join(file_name);
             println!("Saving migration to {}...", file_path.display());
             fs::write(file_path, file_text).unwrap();
             // TODO cargo fmt
-- 
cgit v1.2.3