From 94fe4b8ac099917ec9265f9c6d5ddf65ca3cdca3 Mon Sep 17 00:00:00 2001
From: Erica Marigold <hi@devcomp.xyz>
Date: Mon, 9 Oct 2023 07:54:47 -0700
Subject: [PATCH 1/4] feat: support directories with init file for lune scripts

---
 .lune/other_dir_script/init.lua |  3 ++
 .lune/some_dir_script/init.luau |  3 ++
 src/cli/mod.rs                  |  1 +
 src/cli/utils/files.rs          | 50 ++++++++++++++++++++++++++++++++-
 src/cli/utils/listing.rs        | 40 ++++++++++++++++++++++++--
 5 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 .lune/other_dir_script/init.lua
 create mode 100644 .lune/some_dir_script/init.luau

diff --git a/.lune/other_dir_script/init.lua b/.lune/other_dir_script/init.lua
new file mode 100644
index 00000000..e5112134
--- /dev/null
+++ b/.lune/other_dir_script/init.lua
@@ -0,0 +1,3 @@
+--> Hello, there?
+
+print("Hello, world! -- from init.lua")
diff --git a/.lune/some_dir_script/init.luau b/.lune/some_dir_script/init.luau
new file mode 100644
index 00000000..2c645c74
--- /dev/null
+++ b/.lune/some_dir_script/init.luau
@@ -0,0 +1,3 @@
+--> Hello, there!
+
+print("Hello, world! -- from init.luau")
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 9a80c9d5..cb7daeeb 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -84,6 +84,7 @@ impl Cli {
         // This will also exit early and not run anything else
         if self.list {
             let sorted_relative = find_lune_scripts(false).await.map(sort_lune_scripts);
+
             let sorted_home_dir = find_lune_scripts(true).await.map(sort_lune_scripts);
             if sorted_relative.is_err() && sorted_home_dir.is_err() {
                 eprintln!("{}", sorted_relative.unwrap_err());
diff --git a/src/cli/utils/files.rs b/src/cli/utils/files.rs
index 3bbf4a02..09e8a0d4 100644
--- a/src/cli/utils/files.rs
+++ b/src/cli/utils/files.rs
@@ -149,8 +149,56 @@ pub fn discover_script_path_including_lune_dirs(path: &str) -> Result<PathBuf> {
             // directories + the home directory for the current user
             let res = discover_script_path(format!("lune{MAIN_SEPARATOR}{path}"), false)
                 .or_else(|_| discover_script_path(format!(".lune{MAIN_SEPARATOR}{path}"), false))
+                .or_else(|_| {
+                    discover_script_path(
+                        format!("lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.lua"),
+                        false,
+                    )
+                })
+                .or_else(|_| {
+                    discover_script_path(
+                        format!(".lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.lua"),
+                        false,
+                    )
+                })
+                .or_else(|_| {
+                    discover_script_path(
+                        format!("lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.luau"),
+                        false,
+                    )
+                })
+                .or_else(|_| {
+                    discover_script_path(
+                        format!(".lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.luau"),
+                        false,
+                    )
+                })
                 .or_else(|_| discover_script_path(format!("lune{MAIN_SEPARATOR}{path}"), true))
-                .or_else(|_| discover_script_path(format!(".lune{MAIN_SEPARATOR}{path}"), true));
+                .or_else(|_| discover_script_path(format!(".lune{MAIN_SEPARATOR}{path}"), true))
+                .or_else(|_| {
+                    discover_script_path(
+                        format!("lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.lua"),
+                        true,
+                    )
+                })
+                .or_else(|_| {
+                    discover_script_path(
+                        format!(".lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.lua"),
+                        true,
+                    )
+                })
+                .or_else(|_| {
+                    discover_script_path(
+                        format!("lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.luau"),
+                        true,
+                    )
+                })
+                .or_else(|_| {
+                    discover_script_path(
+                        format!(".lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.luau"),
+                        true,
+                    )
+                });
             match res {
                 // NOTE: The first error message is generally more
                 // descriptive than the ones for the lune subfolders
diff --git a/src/cli/utils/listing.rs b/src/cli/utils/listing.rs
index 63fd3a08..d3bd720a 100644
--- a/src/cli/utils/listing.rs
+++ b/src/cli/utils/listing.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::match_same_arms)]
+
 use std::{cmp::Ordering, ffi::OsStr, fmt::Write as _, path::PathBuf};
 
 use anyhow::{bail, Result};
@@ -6,7 +8,7 @@ use directories::UserDirs;
 use once_cell::sync::Lazy;
 use tokio::{fs, io};
 
-use super::files::parse_lune_description_from_file;
+use super::files::{discover_script_path, parse_lune_description_from_file};
 
 pub static COLOR_BLUE: Lazy<Style> = Lazy::new(|| Style::new().blue());
 pub static STYLE_DIM: Lazy<Style> = Lazy::new(|| Style::new().dim());
@@ -28,16 +30,48 @@ pub async fn find_lune_scripts(in_home_dir: bool) -> Result<Vec<(String, String)
                 let meta = entry.metadata().await?;
                 if meta.is_file() {
                     let contents = fs::read(entry.path()).await?;
+                    files.push((entry, meta, contents));
+                } else if meta.is_dir() {
+                    let entry_path_os = entry.path();
+
+                    let Some(dir_path) = entry_path_os.to_str() else {
+                        bail!("Failed to cast path to string slice.")
+                    };
+
+                    let init_file_path = match (
+                        discover_script_path(dir_path, in_home_dir),
+                        discover_script_path(dir_path, in_home_dir),
+                    ) {
+                        (Ok(lune_init), _) => lune_init,
+                        (_, Ok(dotlune_init)) => dotlune_init,
+                        _ => continue,
+                    };
+
+                    let contents = fs::read(init_file_path).await?;
+
                     files.push((entry, meta, contents));
                 }
             }
             let parsed: Vec<_> = files
                 .iter()
                 .filter(|(entry, _, _)| {
-                    matches!(
+                    let mut is_match = matches!(
                         entry.path().extension().and_then(OsStr::to_str),
                         Some("lua" | "luau")
-                    )
+                    );
+
+                    // If the entry is not a lua or luau file, and is a directory,
+                    // then we check if it contains a init.lua(u), and if it does,
+                    // we include it in our Vec
+                    if !is_match
+                        && entry.path().is_dir()
+                        && (entry.path().join("init.lua").exists()
+                            || entry.path().join("init.luau").exists())
+                    {
+                        is_match = true;
+                    }
+
+                    is_match
                 })
                 .map(|(entry, _, contents)| {
                     let contents_str = String::from_utf8_lossy(contents);

From 60098d519ae25d3722f76a889e7daea3a46b4b03 Mon Sep 17 00:00:00 2001
From: Erica Marigold <hi@devcomp.xyz>
Date: Mon, 9 Oct 2023 08:03:13 -0700
Subject: [PATCH 2/4] chore: remove testing scripts

---
 .lune/other_dir_script/init.lua | 3 ---
 .lune/some_dir_script/init.luau | 3 ---
 2 files changed, 6 deletions(-)
 delete mode 100644 .lune/other_dir_script/init.lua
 delete mode 100644 .lune/some_dir_script/init.luau

diff --git a/.lune/other_dir_script/init.lua b/.lune/other_dir_script/init.lua
deleted file mode 100644
index e5112134..00000000
--- a/.lune/other_dir_script/init.lua
+++ /dev/null
@@ -1,3 +0,0 @@
---> Hello, there?
-
-print("Hello, world! -- from init.lua")
diff --git a/.lune/some_dir_script/init.luau b/.lune/some_dir_script/init.luau
deleted file mode 100644
index 2c645c74..00000000
--- a/.lune/some_dir_script/init.luau
+++ /dev/null
@@ -1,3 +0,0 @@
---> Hello, there!
-
-print("Hello, world! -- from init.luau")

From 299a80a2e8b65a4ec739e3f125f9f2e318803b35 Mon Sep 17 00:00:00 2001
From: Erica Marigold <hi@devcomp.xyz>
Date: Wed, 11 Oct 2023 08:30:51 -0700
Subject: [PATCH 3/4] fix: double lookup with same values

---
 src/cli/utils/listing.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/cli/utils/listing.rs b/src/cli/utils/listing.rs
index d3bd720a..84d7e13b 100644
--- a/src/cli/utils/listing.rs
+++ b/src/cli/utils/listing.rs
@@ -38,12 +38,8 @@ pub async fn find_lune_scripts(in_home_dir: bool) -> Result<Vec<(String, String)
                         bail!("Failed to cast path to string slice.")
                     };
 
-                    let init_file_path = match (
-                        discover_script_path(dir_path, in_home_dir),
-                        discover_script_path(dir_path, in_home_dir),
-                    ) {
-                        (Ok(lune_init), _) => lune_init,
-                        (_, Ok(dotlune_init)) => dotlune_init,
+                    let init_file_path = match discover_script_path(dir_path, in_home_dir) {
+                        Ok(init_file) => init_file,
                         _ => continue,
                     };
 

From 04b43fe44d5f668f0bd0f6530694fdc6d943ec96 Mon Sep 17 00:00:00 2001
From: Erica Marigold <hi@devcomp.xyz>
Date: Thu, 12 Oct 2023 04:02:15 -0700
Subject: [PATCH 4/4] fix: remove unneeded or_else cases

---
 src/cli/utils/files.rs | 51 ++----------------------------------------
 1 file changed, 2 insertions(+), 49 deletions(-)

diff --git a/src/cli/utils/files.rs b/src/cli/utils/files.rs
index 09e8a0d4..9b9b1caf 100644
--- a/src/cli/utils/files.rs
+++ b/src/cli/utils/files.rs
@@ -149,56 +149,9 @@ pub fn discover_script_path_including_lune_dirs(path: &str) -> Result<PathBuf> {
             // directories + the home directory for the current user
             let res = discover_script_path(format!("lune{MAIN_SEPARATOR}{path}"), false)
                 .or_else(|_| discover_script_path(format!(".lune{MAIN_SEPARATOR}{path}"), false))
-                .or_else(|_| {
-                    discover_script_path(
-                        format!("lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.lua"),
-                        false,
-                    )
-                })
-                .or_else(|_| {
-                    discover_script_path(
-                        format!(".lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.lua"),
-                        false,
-                    )
-                })
-                .or_else(|_| {
-                    discover_script_path(
-                        format!("lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.luau"),
-                        false,
-                    )
-                })
-                .or_else(|_| {
-                    discover_script_path(
-                        format!(".lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.luau"),
-                        false,
-                    )
-                })
                 .or_else(|_| discover_script_path(format!("lune{MAIN_SEPARATOR}{path}"), true))
-                .or_else(|_| discover_script_path(format!(".lune{MAIN_SEPARATOR}{path}"), true))
-                .or_else(|_| {
-                    discover_script_path(
-                        format!("lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.lua"),
-                        true,
-                    )
-                })
-                .or_else(|_| {
-                    discover_script_path(
-                        format!(".lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.lua"),
-                        true,
-                    )
-                })
-                .or_else(|_| {
-                    discover_script_path(
-                        format!("lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.luau"),
-                        true,
-                    )
-                })
-                .or_else(|_| {
-                    discover_script_path(
-                        format!(".lune{MAIN_SEPARATOR}{path}{MAIN_SEPARATOR}init.luau"),
-                        true,
-                    )
-                });
+                .or_else(|_| discover_script_path(format!(".lune{MAIN_SEPARATOR}{path}"), true));
+
             match res {
                 // NOTE: The first error message is generally more
                 // descriptive than the ones for the lune subfolders