rustfava 0.1.3__tar.gz → 0.1.5__tar.gz

{rustfava-0.1.3 → rustfava-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rustfava
-Version: 0.1.3
+Version: 0.1.5
 Summary: Web interface for the accounting tool rustledger.
 Author-email: Dominik Aumayr <dominik@aumayr.name>
 Maintainer-email: Jakob Schnitzer <mail@jakobschnitzer.de>

rustfava-0.1.5/RELEASING.md

@@ -0,0 +1,105 @@
+# Releasing rustfava
+
+This document describes the release process for rustfava.
+
+## Overview
+
+A release involves:
+1. Creating a git tag
+2. Automated builds (desktop apps, PyPI, Docker)
+3. Publishing the release
+4. Updating Nix flake sources
+
+## Step-by-Step Process
+
+### 1. Create and push a version tag
+
+```bash
+git checkout main
+git pull
+git tag v0.1.x
+git push origin v0.1.x
+```
+
+### 2. Wait for CI workflows
+
+The tag triggers several workflows:
+
+| Workflow | Purpose | Duration |
+|----------|---------|----------|
+| `desktop-release.yml` | Builds desktop apps for all platforms | ~10 min |
+| `build-publish.yml` | Builds and publishes to PyPI, Docker, COPR | ~60 min |
+
+Monitor at: https://github.com/rustledger/rustfava/actions
+
+### 3. Approve PyPI deployment
+
+The PyPI environment requires manual approval:
+- Go to the running `build-publish.yml` workflow
+- Click "Review deployments"
+- Approve the `pypi` environment
+
+### 4. Publish the GitHub release
+
+Once `desktop-release.yml` completes, it creates a **draft release** with:
+- `.AppImage` (Linux)
+- `.deb`, `.rpm` (Linux packages)
+- `.dmg` (macOS)
+- `.msi`, `.exe` (Windows)
+- `.tar.gz` (Linux tarball for Nix)
+
+Publish it:
+```bash
+gh release edit v0.1.x --draft=false
+```
+
+Or via GitHub UI: https://github.com/rustledger/rustfava/releases
+
+### 5. Update Nix flake sources
+
+Publishing the release triggers `update-flake-sources.yml`, which:
+1. Downloads release tarballs
+2. Computes SRI hashes
+3. Creates a PR updating `desktop-sources.json`
+
+Merge the PR when it passes CI.
+
+### 6. Verify
+
+Test the release:
+
+```bash
+# Desktop app via Nix
+nix run github:rustledger/rustfava#desktop --refresh
+
+# CLI via Nix
+nix run github:rustledger/rustfava --refresh
+
+# CLI via PyPI
+uv tool install rustfava --upgrade
+
+# Docker
+docker pull ghcr.io/rustledger/rustfava:v0.1.x
+```
+
+## Release Artifacts
+
+| Artifact | Source | Distribution |
+|----------|--------|--------------|
+| Desktop apps | `desktop-release.yml` | GitHub Releases |
+| Python package | `build-publish.yml` | PyPI |
+| Docker image | `build-publish.yml` | GHCR |
+| Nix flake | `flake.nix` + `desktop-sources.json` | GitHub |
+
+## Troubleshooting
+
+### Draft release not created
+Check that `desktop-release.yml` completed successfully. The release job only runs on tags.
+
+### Nix flake sources not updated
+The `update-flake-sources.yml` workflow only triggers on `release: published` events. Make sure the release is not still in draft.
+
+### PyPI publish failed
+Check the workflow logs. Common issues:
+- Version already exists on PyPI (can't overwrite)
+- Missing approval for the `pypi` environment

{rustfava-0.1.3 → rustfava-0.1.5}/desktop/src/main.ts

@@ -99,19 +99,41 @@ function getRecentFiles(): string[] {
   }
 }
 
-function addRecentFile(path: string) {
-  let recent = getRecentFiles().filter((p) => p !== path);
-  recent.unshift(path);
-  recent = recent.slice(0, MAX_RECENT);
-  localStorage.setItem(STORAGE_KEY, JSON.stringify(recent));
-  renderRecentFiles();
+function saveRecentFiles(paths: string[]) {
+  localStorage.setItem(STORAGE_KEY, JSON.stringify(paths.slice(0, MAX_RECENT)));
 }
 
-function renderRecentFiles() {
-  const recent = getRecentFiles();
+async function addRecentFile(path: string) {
+  // Normalize path to prevent duplicates from different representations
+  try {
+    const normalized = await invoke<string>("normalize_path", { path });
+    let recent = getRecentFiles().filter((p) => p !== normalized);
+    recent.unshift(normalized);
+    saveRecentFiles(recent);
+    renderRecentFiles();
+  } catch {
+    // File doesn't exist or can't be normalized, skip adding
+  }
+}
+
+async function renderRecentFiles() {
+  const stored = getRecentFiles();
   const sidebar = document.getElementById("sidebar")!;
   const list = document.getElementById("recentList")!;
 
+  if (stored.length === 0) {
+    sidebar.classList.add("empty");
+    return;
+  }
+
+  // Filter to only existing files
+  const recent = await invoke<string[]>("filter_existing_paths", { paths: stored });
+
+  // Update storage if some files were removed
+  if (recent.length !== stored.length) {
+    saveRecentFiles(recent);
+  }
+
   if (recent.length === 0) {
     sidebar.classList.add("empty");
     return;
@@ -267,7 +289,7 @@ async function openPath(path: string) {
   try {
     const result = await invoke<OpenFileResult>("open_file", { path });
 
-    addRecentFile(path);
+    await addRecentFile(path);
 
     if (result.already_open) {
       switchTab(result.tab_id);

{rustfava-0.1.3 → rustfava-0.1.5}/desktop/src-tauri/src/main.rs

@@ -45,6 +45,20 @@ fn get_example_file_path(app: AppHandle) -> Result<String, String> {
         return Ok(bundled_path.to_string_lossy().to_string());
     }
 
+    // Fall back to path relative to executable (for Nix flake installs)
+    // Nix layout: bin/rustfava-desktop, lib/rustfava/resources/example.beancount
+    if let Ok(exe_path) = std::env::current_exe() {
+        if let Some(bin_dir) = exe_path.parent() {
+            let nix_path = bin_dir.parent()
+                .map(|p| p.join("lib").join("rustfava").join("resources").join("example.beancount"));
+            if let Some(path) = nix_path {
+                if path.exists() {
+                    return Ok(path.to_string_lossy().to_string());
+                }
+            }
+        }
+    }
+
     // Fall back to development path (relative to desktop/src-tauri)
     let dev_path = std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
         .parent() // desktop/
@@ -64,20 +78,29 @@ fn get_example_file_path(app: AppHandle) -> Result<String, String> {
 /// Returns all inherited env vars with PATH modified to include sidecar directory
 #[tauri::command]
 fn get_terminal_env(app: AppHandle) -> Result<std::collections::HashMap<String, String>, String> {
-    // Get the sidecar directory
-    let resource_dir = app.path().resource_dir()
-        .map_err(|e| format!("Failed to get resource dir: {}", e))?;
-
     // Collect all current environment variables
     let mut env: std::collections::HashMap<String, String> = std::env::vars().collect();
-
-    // Prepend sidecar directory to PATH
     let current_path = env.get("PATH").cloned().unwrap_or_default();
-    let new_path = format!("{}:{}", resource_dir.to_string_lossy(), current_path);
-    env.insert("PATH".to_string(), new_path);
 
-    // Add marker for sidecar directory
-    env.insert("RUSTFAVA_SIDECAR_DIR".to_string(), resource_dir.to_string_lossy().to_string());
+    // Build PATH with multiple possible locations for binaries
+    let mut path_dirs = Vec::new();
+
+    // 1. Executable's directory (for Nix flake installs where binaries are siblings)
+    if let Ok(exe_path) = std::env::current_exe() {
+        if let Some(exe_dir) = exe_path.parent() {
+            path_dirs.push(exe_dir.to_string_lossy().to_string());
+        }
+    }
+
+    // 2. Resource directory (for Tauri bundled apps)
+    if let Ok(resource_dir) = app.path().resource_dir() {
+        path_dirs.push(resource_dir.to_string_lossy().to_string());
+        env.insert("RUSTFAVA_SIDECAR_DIR".to_string(), resource_dir.to_string_lossy().to_string());
+    }
+
+    // Prepend our directories to PATH
+    path_dirs.push(current_path);
+    env.insert("PATH".to_string(), path_dirs.join(":"));
 
     Ok(env)
 }
@@ -200,6 +223,30 @@ fn get_default_shell() -> serde_json::Value {
     })
 }
 
+/// Normalize a path and check if it exists
+#[tauri::command]
+fn normalize_path(path: String) -> Result<String, String> {
+    let path = std::path::Path::new(&path);
+    match path.canonicalize() {
+        Ok(canonical) => Ok(canonical.to_string_lossy().to_string()),
+        Err(_) => Err("File does not exist".to_string()),
+    }
+}
+
+/// Filter a list of paths to only those that exist, returning normalized paths
+#[tauri::command]
+fn filter_existing_paths(paths: Vec<String>) -> Vec<String> {
+    paths
+        .into_iter()
+        .filter_map(|p| {
+            std::path::Path::new(&p)
+                .canonicalize()
+                .ok()
+                .map(|c| c.to_string_lossy().to_string())
+        })
+        .collect()
+}
+
 #[cfg(any(target_os = "macos", target_os = "linux"))]
 fn get_shell_and_args() -> (String, Vec<String>) {
     // Get user's actual login shell from system (not $SHELL which may be overridden by nix/etc)
@@ -374,7 +421,9 @@ fn main() {
             get_tabs,
             get_default_shell,
             get_terminal_env,
-            get_example_file_path
+            get_example_file_path,
+            normalize_path,
+            filter_existing_paths
         ])
         .on_window_event(|window, event| {
             if let tauri::WindowEvent::CloseRequested { .. } = event {

rustfava-0.1.5/desktop-sources.json

@@ -0,0 +1,7 @@
+{
+  "version": "0.1.4",
+  "x86_64-linux": {
+    "url": "https://github.com/rustledger/rustfava/releases/download/v0.1.4/rustfava-desktop-x86_64-unknown-linux-gnu.tar.gz",
+    "hash": "sha256-T1eRZbzToFwg0h6gpMjsI2+MooHBxR+Fzlf9JED///I="
+  }
+}

{rustfava-0.1.3 → rustfava-0.1.5}/src/rustfava.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rustfava
-Version: 0.1.3
+Version: 0.1.5
 Summary: Web interface for the accounting tool rustledger.
 Author-email: Dominik Aumayr <dominik@aumayr.name>
 Maintainer-email: Jakob Schnitzer <mail@jakobschnitzer.de>

{rustfava-0.1.3 → rustfava-0.1.5}/src/rustfava.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ Dockerfile
 LICENSE
 MANIFEST.in
 README.md
+RELEASING.md
 SECURITY.md
 _build_backend.py
 biome.json

rustfava-0.1.3/desktop-sources.json

@@ -1,7 +0,0 @@
-{
-  "version": "0.1.2",
-  "x86_64-linux": {
-    "url": "https://github.com/rustledger/rustfava/releases/download/v0.1.2/rustfava-desktop-x86_64-unknown-linux-gnu.tar.gz",
-    "hash": "sha256-+ZWYhww1/XGlEh9ym+XG4nOiLP0qnZo5220zxtTTjp8="
-  }
-}