11 Commits

17 changed files with 389 additions and 130 deletions

View File

@@ -1,6 +1,13 @@
# Changelog # Changelog
## [0.2.0](https://github.com/sbrow/envr/compare/v0.1.1...v0.2.0) (2025-11-07) ## [0.2.1](https://github.com/sbrow/envr/compare/v0.2.0...v0.2.1) (2026-01-12)
### Bug Fixes
* Added `add` as an alias for backup. ([cf363ab](https://github.com/sbrow/envr/commit/cf363abc4d8cec208d23c6acedbb7e0dd6900332))
## [0.2.0](https://github.com/sbrow/envr/compare/v0.1.1...v0.2.0) (2025-11-10)
### ⚠ BREAKING CHANGES ### ⚠ BREAKING CHANGES
@@ -17,6 +24,7 @@
* **init:** Added a `--force` flag for overwriting an existing config. ([169653d](https://github.com/sbrow/envr/commit/169653d7566f63730fb9da80a18330a566223be9)) * **init:** Added a `--force` flag for overwriting an existing config. ([169653d](https://github.com/sbrow/envr/commit/169653d7566f63730fb9da80a18330a566223be9))
* Multiple scan includes are now supported. ([4273fa5](https://github.com/sbrow/envr/commit/4273fa58956d8736271a0af66202dca481126fe4)) * Multiple scan includes are now supported. ([4273fa5](https://github.com/sbrow/envr/commit/4273fa58956d8736271a0af66202dca481126fe4))
* **scan:** Added support for multiple exports. ([f43705c](https://github.com/sbrow/envr/commit/f43705cd53c6d87aef1f69df4e474441f25c1dc7)) * **scan:** Added support for multiple exports. ([f43705c](https://github.com/sbrow/envr/commit/f43705cd53c6d87aef1f69df4e474441f25c1dc7))
* **sync:** envr can now detect if directories have moved. ([4db0a4d](https://github.com/sbrow/envr/commit/4db0a4d33d2b6a79d13b36a8e8631f895e8fef8d))
* **sync:** Now checks files for mismatched hashes before replacing. ([8074f7a](https://github.com/sbrow/envr/commit/8074f7ae6dfa54e931a198257f3f8e6d0cfe353a)) * **sync:** Now checks files for mismatched hashes before replacing. ([8074f7a](https://github.com/sbrow/envr/commit/8074f7ae6dfa54e931a198257f3f8e6d0cfe353a))

View File

@@ -19,10 +19,11 @@ be run on a cron.
- 🔍 **Smart Scanning**: Automatically discover and import `.env` files in your - 🔍 **Smart Scanning**: Automatically discover and import `.env` files in your
home directory. home directory.
-**Interactive CLI**: User-friendly prompts for file selection and management. -**Interactive CLI**: User-friendly prompts for file selection and management.
- 🗂️ **Rename Detection**: Automatically finds and updates renamed/moved
repositories.
## TODOS ## TODOS
- [x] Rename Detection: automatically update moved files.
- [ ] 🗂️ **Rename Detection**: Automatically handle renamed repositories.
- [ ] Allow use of keys from `ssh-agent` - [ ] Allow use of keys from `ssh-agent`
- [x] Allow configuration of ssh key. - [x] Allow configuration of ssh key.
- [x] Allow multiple ssh keys. - [x] Allow multiple ssh keys.

92
WINDOWS.md Normal file
View File

@@ -0,0 +1,92 @@
# Windows Compatibility Guide
This document outlines Windows compatibility issues and solutions for the envr project.
## Critical Issues
### 1. Path Handling Bug (MUST FIX)
**File:** `app/env_file.go:209`
**Issue:** Uses `path.Join` instead of `filepath.Join`, which won't work correctly on Windows due to different path separators.
**Current code:**
```go
f.Path = path.Join(newDir, path.Base(f.Path))
```
**Fixed code:**
```go
f.Path = filepath.Join(newDir, filepath.Base(f.Path))
```
## External Dependencies
The application relies on external tools that need to be installed separately on Windows:
### Required Tools
1. **fd** - Fast file finder
- Install via: `winget install sharkdp.fd` or `choco install fd`
- Alternative: `scoop install fd`
2. **git** - Version control system
- Install via: `winget install Git.Git` or download from git-scm.com
- Usually already available on most development machines
## Minor Compatibility Notes
### File Permissions
- Unix file permissions (`0755`, `0644`) are used throughout the codebase
- These are safely ignored on Windows - no changes needed
### Editor Configuration
**File:** `cmd/edit_config.go:20-24`
**Issue:** Relies on `$EDITOR` environment variable which is less common on Windows.
**Current behavior:** Fails if `$EDITOR` is not set
**Recommended improvement:** Add fallback detection for Windows editors:
```go
editor := os.Getenv("EDITOR")
if editor == "" {
if runtime.GOOS == "windows" {
editor = "notepad.exe" // or "code.exe" for VS Code
} else {
fmt.Println("Error: $EDITOR environment variable is not set")
return
}
}
```
## Installation Instructions for Windows
1. Install required dependencies:
```powershell
winget install sharkdp.fd
winget install Git.Git
```
2. Fix the path handling bug in `app/env_file.go:209`
3. Build and run as normal:
```powershell
go build
.\envr.exe init
```
## Testing on Windows
After applying the critical path fix, the core functionality should work correctly on Windows. The application has been designed with cross-platform compatibility in mind, using:
- `filepath` package for path operations (mostly)
- `os.UserHomeDir()` for home directory detection
- Standard Go file operations
## Summary
- **1 critical bug** must be fixed for Windows compatibility
- **2 external tools** need to be installed
- **1 minor enhancement** recommended for better Windows UX
- Overall architecture is Windows-compatible

View File

@@ -6,6 +6,7 @@ import (
"fmt" "fmt"
"os" "os"
"os/exec" "os/exec"
"path"
"path/filepath" "path/filepath"
"strings" "strings"
@@ -18,6 +19,7 @@ type Config struct {
ScanConfig scanConfig `json:"scan"` ScanConfig scanConfig `json:"scan"`
} }
// Used by age to encrypt and decrypt the database.
type SshKeyPair struct { type SshKeyPair struct {
Private string `json:"private"` // Path to the private key file Private string `json:"private"` // Path to the private key file
Public string `json:"public"` // Path to the public key file Public string `json:"public"` // Path to the public key file
@@ -207,8 +209,7 @@ func (c Config) searchPaths() (paths []string, err error) {
return paths, nil return paths, nil
} }
// TODO: Should this be private? func (s SshKeyPair) identity() (age.Identity, error) {
func (s SshKeyPair) Identity() (age.Identity, error) {
sshKey, err := os.ReadFile(s.Private) sshKey, err := os.ReadFile(s.Private)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to read SSH key: %w", err) return nil, fmt.Errorf("failed to read SSH key: %w", err)
@@ -222,8 +223,7 @@ func (s SshKeyPair) Identity() (age.Identity, error) {
return id, nil return id, nil
} }
// TODO: Should this be private? func (s SshKeyPair) recipient() (age.Recipient, error) {
func (s SshKeyPair) Recipient() (age.Recipient, error) {
sshKey, err := os.ReadFile(s.Public) sshKey, err := os.ReadFile(s.Public)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to read SSH key: %w", err) return nil, fmt.Errorf("failed to read SSH key: %w", err)
@@ -236,3 +236,32 @@ func (s SshKeyPair) Recipient() (age.Recipient, error) {
return id, nil return id, nil
} }
// Use fd to find all git roots in the config's search paths
func (c Config) findGitRoots() (paths []string, err error) {
searchPaths, err := c.searchPaths()
if err != nil {
return []string{}, err
}
for _, searchPath := range searchPaths {
allCmd := exec.Command("fd", "-H", "-t", "d", "^\\.git$", searchPath)
allOutput, err := allCmd.Output()
if err != nil {
return paths, err
}
allFiles := strings.Split(strings.TrimSpace(string(allOutput)), "\n")
if len(allFiles) == 1 && allFiles[0] == "" {
allFiles = []string{}
}
for i, file := range allFiles {
allFiles[i] = path.Dir(path.Clean(file))
}
paths = append(paths, allFiles...)
}
return paths, nil
}

View File

@@ -1,5 +1,6 @@
package app package app
// TODO: app/db.go should be reviewed.
import ( import (
"database/sql" "database/sql"
"encoding/json" "encoding/json"
@@ -13,19 +14,12 @@ import (
_ "modernc.org/sqlite" _ "modernc.org/sqlite"
) )
// CloseMode determines whether or not the in-memory DB should be saved to disk
// before closing the connection.
type CloseMode int
const (
ReadOnly CloseMode = iota
Write
)
type Db struct { type Db struct {
db *sql.DB db *sql.DB
cfg Config cfg Config
features *AvailableFeatures features *AvailableFeatures
// If true, the database will be saved to disk before closing
changed bool
} }
func Open() (*Db, error) { func Open() (*Db, error) {
@@ -37,7 +31,7 @@ func Open() (*Db, error) {
if _, err := os.Stat("/home/spencer/.envr/data.age"); err != nil { if _, err := os.Stat("/home/spencer/.envr/data.age"); err != nil {
// Create a new DB // Create a new DB
db, err := newDb() db, err := newDb()
return &Db{db, *cfg, nil}, err return &Db{db, *cfg, nil, true}, err
} else { } else {
// Open the existing DB // Open the existing DB
tmpFile, err := os.CreateTemp("", "envr-*.db") tmpFile, err := os.CreateTemp("", "envr-*.db")
@@ -59,7 +53,7 @@ func Open() (*Db, error) {
restoreDB(tmpFile.Name(), memDb) restoreDB(tmpFile.Name(), memDb)
return &Db{memDb, *cfg, nil}, nil return &Db{memDb, *cfg, nil, false}, nil
} }
} }
@@ -107,7 +101,7 @@ func decryptDb(tmpFilePath string, keys []SshKeyPair) error {
identities := make([]age.Identity, 0, len(keys)) identities := make([]age.Identity, 0, len(keys))
for _, key := range keys { for _, key := range keys {
id, err := key.Identity() id, err := key.identity()
if err != nil { if err != nil {
return err return err
@@ -156,9 +150,9 @@ func (db *Db) List() (results []EnvFile, err error) {
} }
defer rows.Close() defer rows.Close()
for rows.Next() {
var envFile EnvFile var envFile EnvFile
var remotesJson []byte var remotesJson []byte
for rows.Next() {
err := rows.Scan(&envFile.Path, &remotesJson, &envFile.Sha256, &envFile.contents) err := rows.Scan(&envFile.Path, &remotesJson, &envFile.Sha256, &envFile.contents)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -181,10 +175,10 @@ func (db *Db) List() (results []EnvFile, err error) {
return results, nil return results, nil
} }
func (db *Db) Close(mode CloseMode) error { func (db *Db) Close() error {
defer db.db.Close() defer db.db.Close()
if mode == Write { if db.changed {
// Create tmp file // Create tmp file
tmpFile, err := os.CreateTemp("", "envr-*.db") tmpFile, err := os.CreateTemp("", "envr-*.db")
if err != nil { if err != nil {
@@ -200,6 +194,8 @@ func (db *Db) Close(mode CloseMode) error {
if err := encryptDb(tmpFile.Name(), db.cfg.Keys); err != nil { if err := encryptDb(tmpFile.Name(), db.cfg.Keys); err != nil {
return err return err
} }
db.changed = false
} }
return nil return nil
@@ -245,7 +241,7 @@ func encryptDb(tmpFilePath string, keys []SshKeyPair) error {
recipients := make([]age.Recipient, 0, len(keys)) recipients := make([]age.Recipient, 0, len(keys))
for _, key := range keys { for _, key := range keys {
recipient, err := key.Recipient() recipient, err := key.recipient()
if err != nil { if err != nil {
return err return err
@@ -289,6 +285,8 @@ func (db *Db) Insert(file EnvFile) error {
return fmt.Errorf("failed to insert env file: %w", err) return fmt.Errorf("failed to insert env file: %w", err)
} }
db.changed = true
return nil return nil
} }
@@ -328,6 +326,8 @@ func (db *Db) Delete(path string) error {
return fmt.Errorf("no file found with path: %s", path) return fmt.Errorf("no file found with path: %s", path)
} }
db.changed = true
return nil return nil
} }
@@ -387,3 +387,35 @@ func (db *Db) CanScan() error {
return nil return nil
} }
} }
// If true, [Db.Insert] should be called on the [EnvFile] that generated
// the given result
func (db Db) UpdateRequired(status EnvFileSyncResult) bool {
return status&(BackedUp|DirUpdated) != 0
}
func (db *Db) Sync(file *EnvFile) (result EnvFileSyncResult, err error) {
// TODO: This results in findMovedDirs being called multiple times.
return file.sync(TrustFilesystem, db)
}
// Looks for git directories that share one or more git remotes with
// the given file.
func (db Db) findMovedDirs(file *EnvFile) (movedDirs []string, err error) {
if err = db.Features().validateFeatures(Fd, Git); err != nil {
return movedDirs, err
}
gitRoots, err := db.cfg.findGitRoots()
if err != nil {
return movedDirs, err
} else {
for _, dir := range gitRoots {
if file.sharesRemote(getGitRemotes(dir)) {
movedDirs = append(movedDirs, dir)
}
}
return movedDirs, nil
}
}

View File

@@ -2,14 +2,17 @@ package app
import ( import (
"crypto/sha256" "crypto/sha256"
"errors"
"fmt" "fmt"
"os" "os"
"os/exec" "os/exec"
"path"
"path/filepath" "path/filepath"
"strings" "strings"
) )
type EnvFile struct { type EnvFile struct {
// TODO: Should use FileName in the struct and derive from the path.
Path string Path string
// Dir is derived from Path, and is not stored in the database. // Dir is derived from Path, and is not stored in the database.
Dir string Dir string
@@ -22,16 +25,30 @@ type EnvFile struct {
type EnvFileSyncResult int type EnvFileSyncResult int
const ( const (
// The struct has been updated from the filesystem
// and should be updated in the database.
Updated EnvFileSyncResult = iota
// The filesystem has been restored to match the struct
// no further action is required.
Restored
Error
// The filesystem contents matches the struct // The filesystem contents matches the struct
// no further action is required. // no further action is required.
Noop Noop EnvFileSyncResult = 0
// The directory changed, but the file contents matched.
// The database must be updated.
DirUpdated EnvFileSyncResult = 1
// The filesystem has been restored to match the struct
// no further action is required.
Restored EnvFileSyncResult = 1 << 1
// The filesystem has been restored to match the struct.
// The directory changed, so the database must be updated
RestoredAndDirUpdated EnvFileSyncResult = Restored | DirUpdated
// The struct has been updated from the filesystem
// and should be updated in the database.
BackedUp EnvFileSyncResult = 1 << 2
Error EnvFileSyncResult = 1 << 3
)
// Determines the source of truth when calling [EnvFile.Sync] or [EnvFile.Restore]
type syncDirection int
const (
TrustDatabase syncDirection = iota
TrustFilesystem
) )
func NewEnvFile(path string) EnvFile { func NewEnvFile(path string) EnvFile {
@@ -96,81 +113,116 @@ func getGitRemotes(dir string) []string {
return remotes return remotes
} }
// Install the file into the file system. If the file already exists, // Reconcile the state of the database with the state of the filesystem, using
// it will be overwritten. // dir to determine which side to use a the source of truth.
func (file EnvFile) Restore() error { func (f *EnvFile) sync(dir syncDirection, db *Db) (result EnvFileSyncResult, err error) {
// TODO: Duplicate work is being done when called from the Sync function. if result != Noop {
if _, err := os.Stat(file.Path); err == nil { panic("Invalid state")
// file already exists }
// Read existing file and calculate its hash if _, err := os.Stat(f.Dir); err != nil {
existingContents, err := os.ReadFile(file.Path) // Directory doesn't exist
var movedDirs []string
if db != nil {
movedDirs, err = db.findMovedDirs(f)
}
if err != nil { if err != nil {
return fmt.Errorf("failed to read existing file for hash comparison: %w", err) return Error, err
}
hash := sha256.Sum256(existingContents)
existingSha := fmt.Sprintf("%x", hash)
if existingSha == file.Sha256 {
return fmt.Errorf("file already exists: %s", file.Path)
} else { } else {
if err := os.WriteFile(file.Path, []byte(file.contents), 0644); err != nil { switch len(movedDirs) {
return fmt.Errorf("failed to write file: %w", err) case 0:
return Error, fmt.Errorf("directory missing")
case 1:
f.updateDir(movedDirs[0])
result |= DirUpdated
default:
return Error, fmt.Errorf("multiple directories found")
}
}
} }
return nil if _, err := os.Stat(f.Path); err != nil {
if errors.Is(err, os.ErrNotExist) {
if err := os.WriteFile(f.Path, []byte(f.contents), 0644); err != nil {
return Error, fmt.Errorf("failed to write file: %w", err)
}
return result | Restored, nil
} else {
return Error, err
} }
} else { } else {
// file doesn't exist // File exists, check its hash
contents, err := os.ReadFile(f.Path)
// Ensure the directory exists if err != nil {
if _, err := os.Stat(file.Dir); err != nil { return Error, fmt.Errorf("failed to read file for SHA comparison: %w", err)
return fmt.Errorf("directory missing")
} }
// Write the contents to the file hash := sha256.Sum256(contents)
if err := os.WriteFile(file.Path, []byte(file.contents), 0644); err != nil { currentSha := fmt.Sprintf("%x", hash)
return fmt.Errorf("failed to write file: %w", err)
// Compare the hashes
if currentSha == f.Sha256 {
// No op, or DirUpdated
return result, nil
} else {
switch dir {
case TrustDatabase:
if err := os.WriteFile(f.Path, []byte(f.contents), 0644); err != nil {
return Error, fmt.Errorf("failed to write file: %w", err)
} }
return nil return result | Restored, nil
case TrustFilesystem:
// Overwrite the database
if err = f.Backup(); err != nil {
return Error, err
} else {
return BackedUp, nil
}
default:
panic("unknown sync direction")
}
}
}
}
func (f *EnvFile) sharesRemote(remotes []string) bool {
rMap := make(map[string]bool)
for _, remote := range f.Remotes {
rMap[remote] = true
} }
for _, remote := range remotes {
if rMap[remote] {
return true
}
}
return false
}
func (f *EnvFile) updateDir(newDir string) {
f.Dir = newDir
f.Path = path.Join(newDir, path.Base(f.Path))
f.Remotes = getGitRemotes(newDir)
} }
// Try to reconcile the EnvFile with the filesystem. // Try to reconcile the EnvFile with the filesystem.
// //
// If Updated is returned, [Db.Insert] should be called on file. // If Updated is returned, [Db.Insert] should be called on file.
func (file *EnvFile) Sync() (result EnvFileSyncResult, err error) { func (file *EnvFile) Sync() (result EnvFileSyncResult, err error) {
// Check if the path exists in the file system return file.sync(TrustFilesystem, nil)
_, err = os.Stat(file.Path) }
if err == nil {
contents, err := os.ReadFile(file.Path)
if err != nil {
return Error, fmt.Errorf("failed to read file for SHA comparison: %w", err)
}
// Check if sha matches by reading the current file and calculating its hash // Install the file into the file system. If the file already exists,
hash := sha256.Sum256(contents) // it will be overwritten.
currentSha := fmt.Sprintf("%x", hash) func (file EnvFile) Restore() error {
if file.Sha256 == currentSha { _, err := file.sync(TrustDatabase, nil)
// Nothing to do
return Noop, nil return err
} else {
if err = file.Backup(); err != nil {
return Error, err
} else {
return Updated, nil
}
}
} else {
if err = file.Restore(); err != nil {
return Error, err
} else {
return Restored, nil
}
}
} }
// Update the EnvFile using the file system. // Update the EnvFile using the file system.

View File

@@ -1,9 +1,20 @@
package app package app
import ( import (
"fmt"
"os/exec" "os/exec"
) )
type MissingFeatureError struct {
feature AvailableFeatures
}
func (m *MissingFeatureError) Error() string {
return fmt.Sprintf("Missing \"%s\" feature", m.feature)
}
// TODO: Features should really be renamed to Binaries
// Represents which binaries are present in $PATH. // Represents which binaries are present in $PATH.
// Used to fail safely when required features are unavailable // Used to fail safely when required features are unavailable
type AvailableFeatures int type AvailableFeatures int
@@ -30,3 +41,20 @@ func checkFeatures() (feats AvailableFeatures) {
return feats return feats
} }
// Returns a MissingFeature error if the given features aren't present.
func (a AvailableFeatures) validateFeatures(features ...AvailableFeatures) error {
var missing AvailableFeatures
for _, feat := range features {
if a&feat == 0 {
missing |= feat
}
}
if missing == 0 {
return nil
} else {
return &MissingFeatureError{missing}
}
}

View File

@@ -15,6 +15,7 @@ import (
var backupCmd = &cobra.Command{ var backupCmd = &cobra.Command{
Use: "backup <path>", Use: "backup <path>",
Short: "Import a .env file into envr", Short: "Import a .env file into envr",
Aliases: []string{"add"},
Args: cobra.ExactArgs(1), Args: cobra.ExactArgs(1),
// Long: `Long desc` // Long: `Long desc`
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
@@ -27,11 +28,11 @@ var backupCmd = &cobra.Command{
if err != nil { if err != nil {
return err return err
} else { } else {
defer db.Close(app.Write) defer db.Close()
record := app.NewEnvFile(path) record := app.NewEnvFile(path)
if err := db.Insert(record); err != nil { if err := db.Insert(record); err != nil {
panic(err) return err
} else { } else {
fmt.Printf("Saved %s into the database", path) fmt.Printf("Saved %s into the database", path)
return nil return nil

View File

@@ -38,7 +38,7 @@ var checkCmd = &cobra.Command{
if err != nil { if err != nil {
return fmt.Errorf("failed to open database: %w", err) return fmt.Errorf("failed to open database: %w", err)
} }
defer db.Close(app.ReadOnly) defer db.Close()
// Check if the path is a file or directory // Check if the path is a file or directory
info, err := os.Stat(absPath) info, err := os.Stat(absPath)

View File

@@ -19,7 +19,7 @@ The check command reports on which binaries are available and which are not.`,
if err != nil { if err != nil {
return err return err
} else { } else {
defer db.Close(app.ReadOnly) defer db.Close()
features := db.Features() features := db.Features()
table := tablewriter.NewWriter(os.Stdout) table := tablewriter.NewWriter(os.Stdout)

View File

@@ -24,7 +24,7 @@ var listCmd = &cobra.Command{
if err != nil { if err != nil {
return err return err
} }
defer db.Close(app.ReadOnly) defer db.Close()
rows, err := db.List() rows, err := db.List()
if err != nil { if err != nil {

View File

@@ -25,7 +25,7 @@ var removeCmd = &cobra.Command{
if err != nil { if err != nil {
return err return err
} else { } else {
defer db.Close(app.Write) defer db.Close()
if err := db.Delete(path); err != nil { if err := db.Delete(path); err != nil {
return err return err
} else { } else {

View File

@@ -27,7 +27,7 @@ var restoreCmd = &cobra.Command{
if err != nil { if err != nil {
return err return err
} else { } else {
defer db.Close(app.ReadOnly) defer db.Close()
record, err := db.Fetch(path) record, err := db.Fetch(path)
if err != nil { if err != nil {

View File

@@ -57,7 +57,7 @@ var scanCmd = &cobra.Command{
// Close database with write mode to persist changes // Close database with write mode to persist changes
if addedCount > 0 { if addedCount > 0 {
err = db.Close(app.Write) err = db.Close()
if err != nil { if err != nil {
return fmt.Errorf("Error saving changes: %v\n", err) return fmt.Errorf("Error saving changes: %v\n", err)
} else { } else {
@@ -65,7 +65,7 @@ var scanCmd = &cobra.Command{
return nil return nil
} }
} else { } else {
err = db.Close(app.ReadOnly) err = db.Close()
if err != nil { if err != nil {
return fmt.Errorf("Error closing database: %v\n", err) return fmt.Errorf("Error closing database: %v\n", err)
} }

View File

@@ -10,16 +10,16 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
// TODO: Detect when file paths have moved and update accordingly.
var syncCmd = &cobra.Command{ var syncCmd = &cobra.Command{
Use: "sync", Use: "sync",
Short: "Update or restore your env backups", Short: "Update or restore your env backups",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
db, err := app.Open() db, err := app.Open()
if err != nil { if err != nil {
return err return err
} else { } else {
defer db.Close(app.Write) defer db.Close()
files, err := db.List() files, err := db.List()
if err != nil { if err != nil {
@@ -33,16 +33,19 @@ var syncCmd = &cobra.Command{
for _, file := range files { for _, file := range files {
// Syncronize the filesystem with the database. // Syncronize the filesystem with the database.
changed, err := file.Sync() oldPath := file.Path
changed, err := db.Sync(&file)
var status string var status string
switch changed { switch changed {
case app.Updated: case app.BackedUp:
status = "Backed Up" status = "Backed Up"
if err := db.Insert(file); err != nil { if err := db.Insert(file); err != nil {
return err return err
} }
case app.Restored: case app.Restored:
fallthrough
case app.RestoredAndDirUpdated:
status = "Restored" status = "Restored"
case app.Error: case app.Error:
if err == nil { if err == nil {
@@ -51,10 +54,23 @@ var syncCmd = &cobra.Command{
status = err.Error() status = err.Error()
case app.Noop: case app.Noop:
status = "OK" status = "OK"
case app.DirUpdated:
status = "Moved"
default: default:
panic("Unknown result") panic("Unknown result")
} }
if changed&app.DirUpdated == app.DirUpdated {
if err := db.Delete(oldPath); err != nil {
return err
}
}
if db.UpdateRequired(changed) {
if err := db.Insert(file); err != nil {
return err
}
}
results = append(results, syncResult{ results = append(results, syncResult{
Path: file.Path, Path: file.Path,
Status: status, Status: status,

30
flake.lock generated
View File

@@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1751413152, "lastModified": 1768135262,
"narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1761597516, "lastModified": 1767313136,
"narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -36,11 +36,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1751159883, "lastModified": 1765674936,
"narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -51,11 +51,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1751949589, "lastModified": 1768178648,
"narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", "narHash": "sha256-kz/F6mhESPvU1diB7tOM3nLcBfQe7GU7GQCymRlTi/s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9b008d60392981ad674e04016d25619281550a9d", "rev": "3fbab70c6e69c87ea2b6e48aa6629da2aa6a23b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -80,11 +80,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752055615, "lastModified": 1768158989,
"narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -61,7 +61,7 @@
packages.default = pkgs.buildGoModule rec { packages.default = pkgs.buildGoModule rec {
pname = "envr"; pname = "envr";
version = "0.1.1"; version = "0.2.0";
src = ./.; src = ./.;
# If the build complains, uncomment this line # If the build complains, uncomment this line
# vendorHash = "sha256:0000000000000000000000000000000000000000000000000000"; # vendorHash = "sha256:0000000000000000000000000000000000000000000000000000";