improve export script, add todo.md

.github/workflows/publish.yml

@@ -1,20 +0,0 @@
-name: publish
-
-on:
-  workflow_dispatch:
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write # Required for OIDC token exchange
-    steps:
-    - uses: actions/checkout@v6
-    - name: check version
-      # cut off the v part of the tag to only search for the number
-      run: grep -q "$(echo "${{ github.ref_name }}" | cut -c2-)" Cargo.toml 
-    - uses: rust-lang/crates-io-auth-action@v1
-      id: auth
-    - run: cargo publish
-      env:
-        CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }}

.github/workflows/release.yml

@@ -6,40 +6,87 @@ on:
     tags:
       - "v*"
 
-permissions:
-  contents: write
-
 jobs:
   release:
     runs-on: ${{ matrix.info.runs-on }}
+    permissions:
+      contents: write
     strategy:
       matrix:
         info:
-          - os: "macOS"
+          - os: "macOS-arm"
             runs-on: "macos-latest"
+            package-extension: "tar.gz"
             executable-extension: ""
-          - os: "linux-x86"
+          - os: "macOS-intel"
+            runs-on: "macos-26-intel"
+            package-extension: "tar.gz"
+            executable-extension: ""
+          - os: "linux-x86_64"
             runs-on: "ubuntu-latest"
+            package-extension: "tar.gz"
             executable-extension: ""
           - os: "linux-arm"
             runs-on: "ubuntu-24.04-arm"
+            package-extension: "tar.gz"
             executable-extension: ""
-          - os: "Windows"
+          - os: "Windows-x86_64"
             runs-on: "windows-latest"
+            package-extension: "zip"
+            executable-extension: ".exe"
+          - os: "Windows-arm"
+            runs-on: "windows-11-arm"
+            package-extension: "zip"
             executable-extension: ".exe"
     steps:
-    - uses: actions/checkout@v6
+    - name: checkout
+      uses: actions/checkout@v6
     - name: check version
       # cut off the v part of the tag to only search for the number
-      run: grep -q "$(echo "${{ github.ref_name }}" | cut -c2-)" Cargo.toml 
+      run: grep --quiet "$(echo "${{ github.ref_name }}" | cut -c2-)" Cargo.toml 
-    - run: cargo test --release
+    - name: cache
-    - run: cargo build --release --locked
+      uses: actions/cache@v4
-    - name: package
+      with:
-      # TODO: include completions/man page
+        path: |
-      run: tar -azcf "hexapoda-${{ matrix.info.os }}-${{ github.ref_name }}.zip" -C "target/release/" "hexapoda${{ matrix.info.executable-extension }}"
+          ~/.cargo/registry
+          ~/.cargo/git
+          target
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+    - name: test
+      run: cargo test --release
+    - name: make completion/manpage folders
+      run: mkdir completions; mkdir manpage
+    - name: build
+      run: cargo build --release --locked
+      env:
+        HEXAPODA_COMPLETIONS: completions
+        HEXAPODA_MANPAGE: manpage
+    - name: package-tar-gz
+      if: ${{ matrix.info.package-extension == 'tar.gz' }}
+      run: tar --create --gzip --file "hexapoda-${{ matrix.info.os }}-${{ github.ref_name }}.tar.gz" "completions" "manpage" -C "target/release/" "hexapoda${{ matrix.info.executable-extension }}"
+    - name: package-zip
+      if: ${{ matrix.info.package-extension == 'zip' }}
+      run: tar --create --auto-compress --file "hexapoda-${{ matrix.info.os }}-${{ github.ref_name }}.zip" "completions" "manpage" -C "target/release/" "hexapoda${{ matrix.info.executable-extension }}"
     - name: release
       uses: softprops/action-gh-release@v2
       with:
         draft: true
         name: "${{ github.ref_name }}"
-        files: hexapoda-${{ matrix.info.os }}-${{ github.ref_name }}.zip
+        files: "hexapoda-${{ matrix.info.os }}-${{ github.ref_name }}.${{ matrix.info.package-extension }}"
+
+  publish:
+    runs-on: ubuntu-latest
+    needs: release
+    permissions:
+      id-token: write # Required for OIDC token exchange
+    steps:
+    - uses: actions/checkout@v6
+    - name: check version
+      # cut off the v part of the tag to only search for the number
+      # include the " = " to not match on main, only v* tags
+      run: grep -q " = \"$(echo "${{ github.ref_name }}" | cut -c2-)\"" Cargo.toml 
+    - uses: rust-lang/crates-io-auth-action@v1
+      id: auth
+    - run: cargo publish
+      env:
+        CARGO_REGISTRY_TOKEN: ${{ steps.auth.outputs.token }}

Cargo.lock

@@ -568,7 +568,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hexapoda"
-version = "0.2.0"
+version = "0.2.3"
 dependencies = [
  "clap",
  "clap_complete",

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "hexapoda"
 # if run manually, CI will check for the string "ain" (lol), so here you go :)
-version = "0.2.0"
+version = "0.2.3"
 description = "a colorful modal hex editor"
 repository = "https://github.com/simonomi/hexapoda"
 keywords = ["cli", "tui", "hex", "tool", "editor"]
@@ -23,3 +23,27 @@ clap = { version = "4.6.0", features = ["derive"] }
 clap_complete = "4.6.3"
 clap_complete_nushell = "4.6.0"
 clap_mangen = "0.3.0"
+
+[package.metadata.binstall.overrides.'cfg(all(target_os = "macos", target_arch = "aarch64" ))']
+pkg-url = "{ repo }/releases/download/v{ version }/{ name }-macOS-arm-v{ version }{ archive-suffix }"
+pkg-fmt = "tgz"
+
+[package.metadata.binstall.overrides.'cfg(all(target_os = "macos", target_arch = "x86_64" ))']
+pkg-url = "{ repo }/releases/download/v{ version }/{ name }-macOS-intel-v{ version }{ archive-suffix }"
+pkg-fmt = "tgz"
+
+[package.metadata.binstall.overrides.'cfg(all(target_os = "linux", target_arch = "x86_64" ))']
+pkg-url = "{ repo }/releases/download/v{ version }/{ name }-linux-x86_64-v{ version }{ archive-suffix }"
+pkg-fmt = "tgz"
+
+[package.metadata.binstall.overrides.'cfg(all(target_os = "linux", target_arch = "aarch64" ))']
+pkg-url = "{ repo }/releases/download/v{ version }/{ name }-linux-arm-v{ version }{ archive-suffix }"
+pkg-fmt = "tgz"
+
+[package.metadata.binstall.overrides.'cfg(all(target_os = "windows", target_arch = "x86_64" ))']
+pkg-url = "{ repo }/releases/download/v{ version }/{ name }-Windows-x86_64-v{ version }{ archive-suffix }"
+pkg-fmt = "zip"
+
+[package.metadata.binstall.overrides.'cfg(all(target_os = "windows", target_arch = "aarch64" ))']
+pkg-url = "{ repo }/releases/download/v{ version }/{ name }-Windows-arm-v{ version }{ archive-suffix }"
+pkg-fmt = "zip"

build.rs

@@ -7,20 +7,26 @@ use std::io::Error;
 include!("src/arguments.rs");
 
 fn main() -> Result<(), Error> {
-	let output_folder = match env::var_os("OUT_DIR") {
+	let completions_folder = match env::var_os("HEXAPODA_COMPLETIONS") {
-		None => return Ok(()),
+		Some(folder) if !folder.is_empty() => folder,
-		Some(output_folder) => output_folder,
+		_ => return Ok(()),
+	};
+	
+	let manpage_folder = match env::var_os("HEXAPODA_MANPAGE") {
+		Some(folder) if !folder.is_empty() => folder,
+		_ => return Ok(()),
 	};
 	
 	let mut command = Arguments::command();
 	for &shell in Shell::value_variants() {
-		generate_to(shell, &mut command, "hexapoda", &output_folder)?;
+		generate_to(shell, &mut command, "hexapoda", &completions_folder)?;
 	}
-	generate_to(Nushell, &mut command, "hexapoda", &output_folder)?;
+	generate_to(Nushell, &mut command, "hexapoda", &completions_folder)?;
 	
-	clap_mangen::generate_to(command, &output_folder)?;
+	clap_mangen::generate_to(command, &manpage_folder)?;
 	
-	println!("cargo:warning=completions and manpage generated in {output_folder:?}");
+	println!("cargo:warning=completions generated in {completions_folder:?}");
+	println!("cargo:warning=manpage generated in {manpage_folder:?}");
 	println!("cargo:rerun-if-changed=src/arguments.rs");
 	
 	Ok(())

export config.swift

@@ -29,6 +29,11 @@ func camelCaseToSnakeCase(_ string: Substring) -> String {
 	return output
 }
 
+let cargoTOMLPath = URL(filePath: "Cargo.toml")
+let cargoTOML = try String(contentsOf: cargoTOMLPath, encoding: .utf8)
+
+let versionNumber = cargoTOML.matches(of: #/version = "(?'number'[\d\.]+)"/#).first!.output.number
+
 let defaultConfigPath = URL(filePath: "src/config/default.rs")
 
 let lines = try String(contentsOf: defaultConfigPath, encoding: .utf8)
@@ -38,31 +43,35 @@ let lines = try String(contentsOf: defaultConfigPath, encoding: .utf8)
 
 precondition(lines.first!.contains("Mode::Normal"))
 
+var output = """
+	{%- highlight toml -%}
+	#:schema https://simonomi.dev/hexapoda/config/schema-v\(versionNumber).json
+	
+	
+	"""
 var mode: String?
 
 for line in lines {
 	if let match = line.wholeMatch(of: #/.*Mode::(?'mode'\w*),.*/#) {
 		mode = match.output.mode.lowercased()
 	} else if line.contains("None") {
-		print("[\(mode!)]")
+		output += "[\(mode!)]\n"
 	} else if let match = line.wholeMatch(of: #/.*PartialAction::(?'partialAction'\w*).*/#) {
 		let partialAction = match.output.partialAction.lowercased()
-		print("[\(mode!).\(partialAction)]")
+		output += "[\(mode!).\(partialAction)]\n"
 	} else if let match = line.wholeMatch(of: #/.*\(keypress\("(?'keypress'.*?)"\), (?'action'.*?)\.into\(\)\).*/#) {
 		if match.output.keypress.contains(where: { !($0.isLetter || $0.isNumber) }) {
-			print(
+			output += "\"\(match.output.keypress)\" = \"\(camelCaseToSnakeCase(match.output.action))\"\n"
-				"\"\(match.output.keypress)\"",
-				"=",
-				"\"\(camelCaseToSnakeCase(match.output.action))\""
-			)
 		} else {
-			print(
+			output += "\(match.output.keypress) = \"\(camelCaseToSnakeCase(match.output.action))\"\n"
-				match.output.keypress,
-				"=",
-				"\"\(camelCaseToSnakeCase(match.output.action))\""
-			)
 		}
 	} else {
-		print()
+		output += "\n"
 	}
 }
+output += "{%- endhighlight -%}\n"
+
+let outputPath = URL(filePath: "~/Documents/programming/websites/simonomi.dev/_includes/hexapoda/hexapoda v\(versionNumber).toml")
+try Data(output.utf8).write(to: outputPath)
+
+print("wrote config to \(outputPath.path(percentEncoded: false))")

src/app.rs

@@ -250,7 +250,8 @@ impl App {
 	fn mouse_event_position(&self, mouse_event: MouseEvent) -> Option<usize> {
 		let tab_bar_rows = usize::from(self.buffers.len() > 1);
 		
-		if usize::from(mouse_event.row) - tab_bar_rows >= self.window_size.hex_rows() {
+		if usize::from(mouse_event.row) < tab_bar_rows ||
+		   usize::from(mouse_event.row) - tab_bar_rows >= self.window_size.hex_rows() {
 			return None;
 		}
 		

src/app/actions.rs

@@ -8,7 +8,7 @@ impl App {
 			self.quit();
 		} else {
 			self.buffers[self.current_buffer_index].alert_message = Span::from(
-				"there are unsaved changes, use Q to override"
+				"unsaved changes, use <space>w to save or Q to override"
 			).red();
 		}
 	}

src/buffer/widget/status_line.rs

@@ -1,18 +1,16 @@
 use crate::{buffer::{Buffer, Mode}, utilities::CustomGreys};
-use ratatui::{style::{Color, Stylize}, text::{Line, Span, Text}};
+use ratatui::{style::{Color, Stylize}, text::{Line, Span}};
 
 impl Buffer {
-	pub fn render_status_line(&self) -> Text<'_> {
+	pub fn render_status_line(&self) -> Line<'_> {
-		Text::from(
+		Line::from_iter([
-			Line::from_iter([
+			self.render_mode(),
-				self.render_mode(),
+			" ".into(),
-				" ".into(),
+			self.render_file_name(),
-				self.render_file_name(),
+			self.modified_indicator(),
-				self.modified_indicator(),
+			"  ".into(),
-				"  ".into(),
+			self.alert_message.clone()
-				self.alert_message.clone()
+		])
-			])
-		)
 		.bg(Color::ui_grey())
 	}
 	

src/config/default.rs

@@ -98,6 +98,11 @@ impl Default for Config {
 					(keypress("l"), GotoLineEnd.into()),
 					
 					(keypress("g"), GotoFileStart.into()),
+					(keypress("i"), GotoFileStart.into()),
+					(keypress("k"), GotoFileEnd.into()),
+					
+					(keypress("p"), PreviousBuffer.into()),
+					(keypress("n"), NextBuffer.into()),
 				].into()),
 				(Some(PartialAction::View), [
 					(keypress("z"), AlignViewCenter.into()),
@@ -153,6 +158,7 @@ impl Default for Config {
 					(keypress("Q"), Quit.into()),
 					
 					(keypress("v"), NormalMode.into()),
+					(keypress("escape"), NormalMode.into()),
 					
 					(keypress("g"), Goto.into()),
 					(keypress("z"), View.into()),
@@ -230,6 +236,11 @@ impl Default for Config {
 					(keypress("l"), ExtendLineEnd.into()),
 					
 					(keypress("g"), ExtendFileStart.into()),
+					(keypress("i"), ExtendFileStart.into()),
+					(keypress("k"), ExtendFileEnd.into()),
+					
+					(keypress("p"), PreviousBuffer.into()),
+					(keypress("n"), NextBuffer.into()),
 				].into()),
 				(Some(PartialAction::View), [
 					(keypress("z"), AlignViewCenter.into()),

src/main.rs

@@ -25,34 +25,6 @@ const CHUNKS_PER_LINE: usize = BYTES_PER_LINE / BYTES_PER_CHUNK;
 const LINES_OF_PADDING: usize = 5;
 const BYTES_OF_PADDING: usize = LINES_OF_PADDING * BYTES_PER_LINE;
 
-// TODO:
-// - `go` goto entered offset
-// - search
-//   - `/` hex, `A-/` ascii
-//   - if non-hex-digit typed, search ascii
-// - inspector translations for varint
-// - M mark at selected offset? (like Jm)
-// - diffing
-//   - doesn't have to be anything fancy, just compare each byte 1:1
-//   - sync scroll ? sync selections ??
-// - s/A-k/A-K
-//   - sm select marks
-// - C-a/C-x
-// - +/- to edit selected bytes by amount ?
-//   - operate on entire selection (u16/u32/etc)
-//   - hex or decimal ?
-// - modifications
-//   - insert/append
-//     - mode
-//     - add to edit history when *leaving* insert mode
-//   - replace-and-keep-going
-//     - mode
-//   - change
-// - A-r replaces with ASCII
-// - jumplist
-// - p
-// - [/] to cycle view offset?
-
 fn main() {
 	let arguments = Arguments::parse();
 	

todo.md

@@ -0,0 +1,31 @@
+# todo
+- v1.0
+	- `<escape>` dismiss inspectors
+	- `T` Till
+	- click on tab to go to buffer
+	- `go` goto entered offset
+	- search
+		- `/` hex, `A-/` ASCII
+		- if non-hex-digit typed, search ASCII
+- inspector translations for varint [#1](https://github.com/simonomi/hexapoda/issues/1#issue-4232822634)
+- `M` mark at selected offset? (like `Jm`)
+- diffing
+	- doesn't have to be anything fancy, just compare each byte 1:1
+	- sync scroll ? sync selections ??
+- `s`/`A-k`/`A-K`
+	- sm select marks
+- `C-a`/`C-x`
+- `+`/`-` to edit selected bytes by amount ?
+	- operate on entire selection (u16/u32/etc)
+	- hex or decimal ?
+- modifications
+	- insert/append
+		- mode
+		- add to edit history when *leaving* insert mode
+	- replace-and-keep-going
+		- mode
+	- change (basically `dh`)
+	- `p` put
+- `A-r` replaces with ASCII
+- jumplist (`C-o`/`C-i`)
+- `[`/`]` to cycle view offset?