janezicmatej
/
ahab
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: don't read DJANGO_SETTINGS_MODULE

This commit is contained in:
Matej Janezic 2025-02-12 16:52:50 +01:00
parent c8b3a817f0
commit 36fcc84881
Signed by: janezicmatej
GPG Key ID: 4298E230ED37B2C0
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.rs
View File

@ -7,9 +7,6 @@ fn main() -> Result<()> {
// always load dotenv on start // always load dotenv on start
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
// TODO: (matej) some prints about project
// eg: DJANGO_SETTINGS_MODULE for django projects, used docker-compose, etc.
let args = cli::Ahab::parse(); let args = cli::Ahab::parse();
match args.command { match args.command {

10
src/scripts/django.rs
View File

@ -8,13 +8,6 @@ use anyhow::{anyhow, Result};
use crate::command_builder::CommandBuilder; use crate::command_builder::CommandBuilder;
use crate::{create_file, safe_create_file}; use crate::{create_file, safe_create_file};
fn get_django_settings_module() -> Result<String> {
let dsm = env::var("DJANGO_SETTINGS_MODULE")?;
eprintln!("USING: {dsm}");
Ok(dsm)
}
const DEBUG_TEMPLATE: &str = r#"from django.core.management.base import BaseCommand const DEBUG_TEMPLATE: &str = r#"from django.core.management.base import BaseCommand
class Command(BaseCommand): class Command(BaseCommand):
@ -62,10 +55,9 @@ pub fn make_command(app: &PathBuf, name: &str) -> Result<()> {
} }
pub fn manage(rest: &[String]) -> Result<()> { pub fn manage(rest: &[String]) -> Result<()> {
let dsm = get_django_settings_module()?;
let container = env::var("AHAB_DJANGO_CONTAINER").unwrap_or("appserver".to_string()); let container = env::var("AHAB_DJANGO_CONTAINER").unwrap_or("appserver".to_string());
let joined = rest.join(" "); let joined = rest.join(" ");
let command = format!("run --rm {container} python manage.py {joined} --settings={dsm}"); let command = format!("run --rm {container} python manage.py {joined}");
CommandBuilder::docker_compose().args(&command).exec() CommandBuilder::docker_compose().args(&command).exec()
} }