sync from internal repository

Author: lostmygithubaccount

.github/workflows/close-prs.yml

@@ -0,0 +1,27 @@
+name: Close PRs
+
+on:
+  pull_request_target:
+    types: [opened, reopened]
+
+jobs:
+  close:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - uses: actions/github-script@v7
+        with:
+          script: |
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.pull_request.number,
+              body: 'we don\'t do that here'
+            });
+            await github.rest.pulls.update({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.payload.pull_request.number,
+              state: 'closed'
+            });

README.md

@@ -1,3 +1,76 @@
-# dkdc-links
+# Bookmarks CLI
 
-***Bookmarks in your terminal.***
+Bookmarks in your terminal.
+
+## Install
+
+Recommended:
+
+```bash
+curl -LsSf https://dkdc.sh/dkdc-links/install.sh | sh
+```
+
+uv:
+
+```bash
+uv tool install dkdc-links
+```
+
+cargo:
+
+```bash
+cargo install dkdc-links
+```
+
+You can use `uvx` to run it without installing:
+
+```bash
+uvx dkdc-links
+```
+
+## Usage
+
+```
+dkdc-links [OPTIONS] [LINKS]...
+```
+
+Open links by name or alias:
+
+```bash
+# Open a link
+dkdc-links link1
+
+# Open multiple links
+dkdc-links link1 link2
+
+# Open a group
+dkdc-links dev
+```
+
+### Options
+
+| Flag | Short | Description |
+|------|-------|-------------|
+| `--config` | `-c` | Open config file in editor |
+| `--gui` | | Open graphical interface (under construction) |
+| `--help` | `-h` | Print help |
+| `--version` | `-V` | Print version |
+
+## Configuration
+
+Config lives at `~/.config/dkdc/links/config.toml`. Run `dkdc-links -c` to edit it.
+
+```toml
+[aliases]
+gh = "github"
+li = "linkedin"
+
+[links]
+github = "https://github.com/lostmygithubaccount"
+linkedin = "https://linkedin.com/in/codydkdc"
+
+[groups]
+social = ["github", "linkedin"]
+```
+
+Aliases map to links, links map to URLs, and groups expand to multiple aliases or links.

bin/setup

@@ -5,7 +5,7 @@ set -euo pipefail
 
 if ! command -v rustup &>/dev/null; then
     echo "Installing rustup..."
-    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+    curl --proto '=https' --tlsv1.2 -LsSf https://sh.rustup.rs | sh -s -- -y
     . "$HOME/.cargo/env"
 fi
 

dkdc-links-py/Cargo.lock

@@ -2,7 +2,7 @@
 
 [package]
 name = "dkdc-links-py"
-version = "2.0.1"
+version = "2.1.0"
 edition = "2024"
 authors = ["Cody <cody@dkdc.dev>"]
 license = "MIT"

dkdc-links-py/Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "dkdc-links"
-version = "2.0.1"
+version = "2.1.0"
 edition = "2024"
 authors = ["Cody <cody@dkdc.dev>"]
 description = "Bookmarks in your terminal"

dkdc-links/Cargo.lock

@@ -1,5 +1,6 @@
 use anyhow::{Context, Result};
 use serde::{Deserialize, Serialize};
+use std::borrow::Cow;
 use std::collections::HashMap;
 use std::fs;
 use std::path::PathBuf;
@@ -33,7 +34,36 @@ link2 = "https://github.com/lostmygithubaccount/dkdc-links"
 dev = ["alias1", "alias2"]
 "#;
 
+impl Config {
+    pub fn validate(&self) -> Vec<String> {
+        let mut warnings = Vec::new();
+
+        for (alias, target) in &self.aliases {
+            if !self.links.contains_key(target) {
+                warnings.push(format!(
+                    "alias '{alias}' points to '{target}' which is not in [links]"
+                ));
+            }
+        }
+
+        for (group, entries) in &self.groups {
+            for entry in entries {
+                if !self.aliases.contains_key(entry) && !self.links.contains_key(entry) {
+                    warnings.push(format!(
+                        "group '{group}' contains '{entry}' which is not in [aliases] or [links]"
+                    ));
+                }
+            }
+        }
+
+        warnings
+    }
+}
+
 pub fn config_path() -> Result<PathBuf> {
+    // Intentionally use ~/.config/ rather than dirs::config_dir(), which
+    // returns ~/Library/Application Support/ on macOS. We want a single
+    // consistent dotfile location across platforms.
     let home = dirs::home_dir().context("Failed to get home directory")?;
     Ok(home
         .join(CONFIG_DIR)
@@ -46,7 +76,9 @@ pub fn init_config() -> Result<()> {
     let config_path = config_path()?;
 
     if !config_path.exists() {
-        let config_dir = config_path.parent().unwrap();
+        let config_dir = config_path
+            .parent()
+            .context("Invalid config path: no parent directory")?;
         fs::create_dir_all(config_dir).context("Failed to create config directory")?;
         fs::write(&config_path, DEFAULT_CONFIG).context("Failed to write default config")?;
     }
@@ -58,6 +90,11 @@ pub fn load_config() -> Result<Config> {
     let config_path = config_path()?;
     let contents = fs::read_to_string(&config_path).context("Failed to read config file")?;
     let config: Config = toml::from_str(&contents).context("Failed to parse config file")?;
+
+    for warning in config.validate() {
+        eprintln!("[dkdc-links] warning: {warning}");
+    }
+
     Ok(config)
 }
 
@@ -79,35 +116,36 @@ pub fn edit_config() -> Result<()> {
     Ok(())
 }
 
-fn print_section<V, F>(name: &str, map: &HashMap<String, V>, format_value: F)
-where
-    F: Fn(&V) -> String,
-{
+fn print_section<V>(
+    name: &str,
+    map: &HashMap<String, V>,
+    format_value: impl Fn(&V) -> Cow<'_, str>,
+) {
     if map.is_empty() {
         return;
     }
 
     println!("{name}:");
     println!();
 
-    let mut keys: Vec<_> = map.keys().collect();
-    keys.sort_unstable();
+    let mut entries: Vec<_> = map.iter().collect();
+    entries.sort_unstable_by_key(|(k, _)| k.as_str());
 
-    let max_key_len = keys.iter().map(|k| k.len()).max().unwrap_or(0);
+    let max_key_len = entries.iter().map(|(k, _)| k.len()).max().unwrap_or(0);
 
-    for key in keys {
-        if let Some(value) = map.get(key) {
-            println!("• {key:<max_key_len$} | {}", format_value(value));
-        }
+    for (key, value) in entries {
+        println!("• {key:<max_key_len$} | {}", format_value(value));
     }
 
     println!();
 }
 
 pub fn print_config(config: &Config) {
-    print_section("aliases", &config.aliases, |v| v.clone());
-    print_section("links", &config.links, |v| v.clone());
-    print_section("groups", &config.groups, |v| format!("[{}]", v.join(", ")));
+    print_section("aliases", &config.aliases, |v| Cow::Borrowed(v));
+    print_section("links", &config.links, |v| Cow::Borrowed(v));
+    print_section("groups", &config.groups, |v| {
+        Cow::Owned(format!("[{}]", v.join(", ")))
+    });
 }
 
 #[cfg(test)]
@@ -183,4 +221,40 @@ rust = "https://rust-lang.org"
         assert!(!config.links.is_empty());
         assert!(!config.groups.is_empty());
     }
+
+    #[test]
+    fn test_valid_config_has_no_warnings() {
+        let config: Config = toml::from_str(DEFAULT_CONFIG).unwrap();
+        assert!(config.validate().is_empty());
+    }
+
+    #[test]
+    fn test_broken_alias_target_warns() {
+        let toml = r#"
+[aliases]
+broken = "nonexistent"
+
+[links]
+real = "https://example.com"
+"#;
+        let config: Config = toml::from_str(toml).unwrap();
+        let warnings = config.validate();
+        assert_eq!(warnings.len(), 1);
+        assert!(warnings[0].contains("nonexistent"));
+    }
+
+    #[test]
+    fn test_broken_group_entry_warns() {
+        let toml = r#"
+[links]
+real = "https://example.com"
+
+[groups]
+dev = ["real", "ghost"]
+"#;
+        let config: Config = toml::from_str(toml).unwrap();
+        let warnings = config.validate();
+        assert_eq!(warnings.len(), 1);
+        assert!(warnings[0].contains("ghost"));
+    }
 }

dkdc-links/Cargo.toml

@@ -13,7 +13,7 @@ mod colors {
 
 struct Links;
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
 enum Message {}
 
 impl Links {