hiiro 0.1.134 → 0.1.136

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5c49242912889d365b5eabdfdc3adeb72ea6d55dd7311280dcc9b3f6ac40013
-  data.tar.gz: 219b6710d528233190c7bfb30465d4f3b293cea21f24c8a01561768566ce83ff
+  metadata.gz: 771ab234e04048e9c86898f2d8e2a265e7323d2876e1bdcde7a4c72653b09cae
+  data.tar.gz: 7ccfb6999f64c47f10d055aa9a0c0203695638ba0eaf7ae6c42bc2443dc515b6
 SHA512:
-  metadata.gz: 8ae90dc0c81c21b6d580ccfa3b2ba3475633f7686efdc5de97147cc3030538632e01c436a244e682d6ee7cc361cd3ed9945652c2fd1c4792da8ad98d6a160913
-  data.tar.gz: ebca695230cc51d34b926726c5514af9b6c535eb368920fca89a0dd3dbec0e37d16748612612032485819ac01419b6c1f7b87ca44fc4d5281885610dec8e3900
+  metadata.gz: 996b6711ffc8758971f864628168965fa4895599360660897e85abde7f4ea16e6bd5b752571ca5e62dc43533794fc5aae0e403c4251a5f4032b13ec4927667f4
+  data.tar.gz: 17109c5ea9c6fd28188711e2fbaf00ec953be03e42aff5d511e63b99568734f5a40f0bf88b3824941b26c014a4ded5f96a501181da1a997942525780b5b42655

data/bin/h-jumplist

@@ -37,6 +37,23 @@ def tmux_display(fmt)
   `tmux display-message -p '#{fmt}'`.strip
 end
 
+def prune_dead_entries(entries, pos)
+  new_entries = []
+  new_pos = pos
+  entries.each_with_index do |entry, i|
+    pane_id = entry.split('|', 2).first
+    if pane_exists?(pane_id)
+      new_entries << entry
+    else
+      new_pos -= 1 if i < pos
+    end
+  end
+  new_pos = new_pos.clamp(0, [new_entries.length - 1, 0].max)
+  write_entries(new_entries)
+  set_pos(new_pos)
+  [new_entries, new_pos]
+end
+
 Hiiro.run(*ARGV) do
   add_subcmd(:setup) do
     puts <<~SETUP
@@ -52,6 +69,44 @@ Hiiro.run(*ARGV) do
     SETUP
   end
 
+  add_subcmd(:path) do
+    print JUMPLIST_FILE
+  end
+
+  add_subcmd(:ls) do
+    entries, pos = prune_dead_entries(read_entries, get_pos)
+
+    if entries.empty?
+      puts "Jumplist is empty."
+      next
+    end
+
+    entries.each_with_index do |entry, i|
+      parts = entry.split('|')
+      pane_id, window_id, session_name, timestamp, pane_cmd = parts
+      time_str = Time.at(timestamp.to_i).strftime('%H:%M:%S')
+      marker = i == pos ? " <--" : ""
+      puts "%3d) %s | %s | %s | %s | %s%s" % [i, session_name, window_id, pane_id, pane_cmd, time_str, marker]
+    end
+  end
+
+  add_subcmd(:list) do
+    entries, pos = prune_dead_entries(read_entries, get_pos)
+
+    if entries.empty?
+      puts "Jumplist is empty."
+      next
+    end
+
+    entries.each_with_index do |entry, i|
+      parts = entry.split('|')
+      pane_id, window_id, session_name, timestamp, pane_cmd = parts
+      time_str = Time.at(timestamp.to_i).strftime('%H:%M:%S')
+      marker = i == pos ? " <--" : ""
+      puts "%3d) %s | %s | %s | %s | %s%s" % [i, session_name, window_id, pane_id, pane_cmd, time_str, marker]
+    end
+  end
+
   add_subcmd(:record) do
     # Check suppression flag
     suppress = `tmux show-environment TMUX_JUMPLIST_SUPPRESS 2>/dev/null`.strip
@@ -91,8 +146,7 @@ Hiiro.run(*ARGV) do
   end
 
   add_subcmd(:back) do
-    entries = read_entries
-    pos = get_pos
+    entries, pos = prune_dead_entries(read_entries, get_pos)
 
     if entries.empty?
       system('tmux', 'display-message', 'Jumplist: empty')
@@ -117,67 +171,38 @@ Hiiro.run(*ARGV) do
       end
     end
 
-    # Find next valid entry going backward
     new_pos = pos + 1
-    while new_pos < entries.length
-      entry = entries[new_pos]
-      parts = entry.split('|')
-      target_pane = parts[0]
-      target_window = parts[1]
-      target_session = parts[2]
-
-      if pane_exists?(target_pane)
-        system('tmux', 'set-environment', 'TMUX_JUMPLIST_SUPPRESS', '1')
-        system('tmux', 'switch-client', '-t', target_session)
-        system('tmux', 'select-window', '-t', target_window)
-        system('tmux', 'select-pane', '-t', target_pane)
-        set_pos(new_pos)
-        next # exit the subcmd block
-      end
-
-      new_pos += 1
+    if new_pos < entries.length
+      parts = entries[new_pos].split('|')
+      system('tmux', 'set-environment', 'TMUX_JUMPLIST_SUPPRESS', '1')
+      system('tmux', 'switch-client', '-t', parts[2])
+      system('tmux', 'select-window', '-t', parts[1])
+      system('tmux', 'select-pane', '-t', parts[0])
+      set_pos(new_pos)
+    else
+      system('tmux', 'display-message', 'Jumplist: at oldest entry')
     end
-
-    system('tmux', 'display-message', 'Jumplist: at oldest entry')
   end
 
   add_subcmd(:forward) do
-    pos = get_pos
+    entries, pos = prune_dead_entries(read_entries, get_pos)
 
     if pos <= 0
       system('tmux', 'display-message', 'Jumplist: at newest entry')
       next
     end
 
-    entries = read_entries
-
     if entries.empty?
       system('tmux', 'display-message', 'Jumplist: empty')
       next
     end
 
-    # Find next valid entry going forward (toward index 0)
     new_pos = pos - 1
-    while new_pos >= 0
-      entry = entries[new_pos]
-      parts = entry.split('|')
-      target_pane = parts[0]
-      target_window = parts[1]
-      target_session = parts[2]
-
-      if pane_exists?(target_pane)
-        system('tmux', 'set-environment', 'TMUX_JUMPLIST_SUPPRESS', '1')
-        system('tmux', 'switch-client', '-t', target_session)
-        system('tmux', 'select-window', '-t', target_window)
-        system('tmux', 'select-pane', '-t', target_pane)
-        set_pos(new_pos)
-        next # exit the subcmd block
-      end
-
-      new_pos -= 1
-    end
-
-    system('tmux', 'display-message', 'Jumplist: at newest entry')
-    set_pos(0)
+    parts = entries[new_pos].split('|')
+    system('tmux', 'set-environment', 'TMUX_JUMPLIST_SUPPRESS', '1')
+    system('tmux', 'switch-client', '-t', parts[2])
+    system('tmux', 'select-window', '-t', parts[1])
+    system('tmux', 'select-pane', '-t', parts[0])
+    set_pos(new_pos)
   end
 end

data/bin/h-notify

@@ -10,13 +10,16 @@ TYPE_PRESETS = {
   'warning' => { prefix: '[WARN]', sound: 'Purr',  title: 'Warning' },
 }
 
+NOTIFY_DIR = File.join(Dir.home, '.config', 'hiiro', 'notify')
+FileUtils.mkdir_p(NOTIFY_DIR)
+
 def session_name
   `tmux display-message -p '\#{session_name}'`.strip
 end
 
 def notify_file(session = nil)
   session ||= session_name
-  "/tmp/tmux-notifications-#{session}"
+  File.join(NOTIFY_DIR, "#{session}.log")
 end
 
 def read_notifications(session = nil)
@@ -40,11 +43,11 @@ def pane_exists?(pane_id)
 end
 
 Hiiro.run(*ARGV) do
-  opts = Hiiro::Options.parse(args) do
+  @opts = Hiiro::Options.parse(args) do
     option(:type, short: 't', desc: 'Notification type (success, error, info, warning)', default: 'info')
   end
 
-  preset = TYPE_PRESETS[opts.type] || TYPE_PRESETS['info']
+  @preset = TYPE_PRESETS[@opts.type] || TYPE_PRESETS['info']
 
   add_subcmd(:push) do |*push_args|
     message = push_args.join(' ')
@@ -66,13 +69,13 @@ Hiiro.run(*ARGV) do
     write_notifications(entries, session)
 
     # Show tmux display-message with type prefix
-    system('tmux', 'display-message', "#{preset[:prefix]} #{message}")
+    system('tmux', 'display-message', "#{@preset[:prefix]} #{message}")
 
     # Also send terminal-notifier
     system('terminal-notifier',
-      '-title', preset[:title],
+      '-title', @preset[:title],
       '-message', message,
-      '-sound', preset[:sound])
+      '-sound', @preset[:sound])
   end
 
   add_subcmd(:menu) do

data/lib/hiiro/version.rb

@@ -1,3 +1,3 @@
 class Hiiro
-  VERSION = "0.1.134"
+  VERSION = "0.1.136"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiiro
 version: !ruby/object:Gem::Version
-  version: 0.1.134
+  version: 0.1.136
 platform: ruby
 authors:
 - Joshua Toyota