feat: base directory logic

- finds git root and uses that as base dir
- prefers current directory for manifest search
- hopefully improved how some imports are done
- fix how manifest auto-selection failure is handled
- fix docs and cargo.toml

Author: mufeedali

Cargo.toml

@@ -1,7 +1,15 @@
 [package]
 name = "flatplay"
 version = "0.1.0"
+authors = ["Mufeed Ali <me@mufeed.dev>"]
+description = "Simple CLI tool to build and run Flatpak applications."
+readme = "README.md"
+license = "MIT"
 edition = "2024"
+homepage = "https://github.com/mufeedali/flatplay"
+repository = "https://github.com/mufeedali/flatplay"
+keywords = ["flatpak", "cli", "gnome"]
+categories = ["command-line-utilities"]
 
 [dependencies]
 clap = { version = "4.5.41", features = ["derive"] }

README.md

@@ -1,6 +1,19 @@
 # Flatplay
 
-Early days.
+Flatplay is a simple CLI tool to build and run Flatpak applications. It's designed to be easy to integrate into your workflows with editors like Zed or neovim.
+
+Note that this is a **work in progress** and you might encounter issues along the way.
+
+## External Dependencies
+
+Flatplay relies on the following external commands to be available on your system:
+
+- `git`
+- `gdbus`
+- `flatpak`
+- `flatpak-builder`
+
+## Installation & Usage
 
 ```bash
 # Install into ~/.local/bin (or XDG_BIN_HOME)
@@ -57,7 +70,7 @@ Add the following tasks to your `tasks.json` file (you can open it with the `zed
 }
 ```
 
-Next, add new bindings to your `keymaps.json` file (you can open it with the `zed: open keypam` action):
+Next, add new bindings to your `keymaps.json` file (you can open it with the `zed: open keymap` action):
 
 ```json
 {
@@ -74,7 +87,7 @@ Then you can run any of the tasks by pressing `Alt-Shift-T`, or use `Ctrl-Alt-B`
 
 # Some notes
 
-- A lot of the code is almost directly borrowed from [`flatpak-vscode`](https://github.com/bilelmoussaoui/flatpak-vscode).
-- Not all features are properly implemented yet. The focus so far has been just on getting something working to conveniently work on [Wordbook](https://github.com/mufeedali/Wordbook) while using anything that's not VS Code.
-- I hope to improve it over time and I hope Bilal forgives me for the sins I've committed here.
+- A lot of the logic is borrowed from [`flatpak-vscode`](https://github.com/bilelmoussaoui/flatpak-vscode).
+- There will be bugs and missing features. Please report them, or better yet, send a PR.
 - I'm not a Rust programmer.
+- I hope to improve it over time and I hope Bilal forgives me for the sins I've committed here.

src/command.rs

@@ -1,6 +1,7 @@
+use std::process::{Command, Stdio};
+
 use anyhow::Result;
 use colored::*;
-use std::process::{Command, Stdio};
 
 // Returns true if running inside a Flatpak sandbox.
 fn is_sandboxed() -> bool {
@@ -23,7 +24,11 @@ fn command_succeeds(cmd: &str, args: &[&str]) -> bool {
 }
 
 // Runs a command, handling Flatpak sandbox and container specifics.
-pub fn run_command(command: &str, args: &[&str]) -> Result<()> {
+pub fn run_command(
+    command: &str,
+    args: &[&str],
+    working_dir: Option<&std::path::Path>,
+) -> Result<()> {
     let mut command_args = args.to_vec();
 
     // Workaround for rofiles-fuse issues in containers.
@@ -59,11 +64,14 @@ pub fn run_command(command: &str, args: &[&str]) -> Result<()> {
         program.italic(),
         final_args.join(" ").italic()
     );
-    let mut command_process = Command::new(program)
-        .args(&final_args)
+    let mut cmd = Command::new(program);
+    cmd.args(&final_args)
         .stdout(Stdio::inherit())
-        .stderr(Stdio::inherit())
-        .spawn()?;
+        .stderr(Stdio::inherit());
+    if let Some(dir) = working_dir {
+        cmd.current_dir(dir);
+    }
+    let mut command_process = cmd.spawn()?;
 
     let status = command_process.wait()?;
 
@@ -78,13 +86,13 @@ pub fn run_command(command: &str, args: &[&str]) -> Result<()> {
 }
 
 // Runs flatpak-builder, preferring the native binary, then the Flatpak app.
-pub fn flatpak_builder(args: &[&str]) -> Result<()> {
+pub fn flatpak_builder(args: &[&str], working_dir: Option<&std::path::Path>) -> Result<()> {
     if command_succeeds("flatpak-builder", &["--version"]) {
-        run_command("flatpak-builder", args)
+        run_command("flatpak-builder", args, working_dir)
     } else if command_succeeds("flatpak", &["run", "org.flatpak.Builder", "--version"]) {
         let mut new_args = vec!["run", "org.flatpak.Builder"];
         new_args.extend_from_slice(args);
-        run_command("flatpak", &new_args)
+        run_command("flatpak", &new_args, working_dir)
     } else {
         Err(anyhow::anyhow!(
             "Flatpak builder not found. Please install either `flatpak-builder` from your distro repositories or `org.flatpak.Builder` through `flatpak install`."