gemba 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b7478522afdccb445e067ff5e812f499cf7e8aec5f0708d4d12c9ee81224f4a
-  data.tar.gz: 83ae429789c3beb4c6cb173a8bffdfd5d5a70c7a3451621e21507ef040ccb484
+  metadata.gz: 0244df20f8115eff6f521e2294f607a724c9612593fb5602517265b5a3ca3251
+  data.tar.gz: 1c29a7ce92023f3efa2ff72c29073e28baa2e620f97caf456adc0e92e3c56447
 SHA512:
-  metadata.gz: dbe2fdbf8ce938a595df9c071aeae5f61d15be4cf18a5e3d2cf1331ca3d4a65ac2af931b2828f777c2fa9661de73b2ea7b5f135e35732a040ddf420ef7d4a4d5
-  data.tar.gz: ff4e86a1702acf27651991fe7f43a66272287dcf801fe58baab3bf0ebb76e8cc0988168ff6c6ae281f67006d611232319bdcbdad583cae95de3d0365562ce152
+  metadata.gz: 74cf0852173d9ee5c8606e81af756fc2ea65baf6fc222d89f78541ae985023db80b1b14e20954b5c7f7b48da0ff769fe95a30124362c68b3a086ec0e2fc87103
+  data.tar.gz: f995335c304686b32c62d67ef4d0f7ee0320961bf935d560dfab087fd78ce64c245a86a244f500be6888610afaf067e03ccb0a472d12adb5682e273f78892c83

data/lib/gemba/achievements/backend.rb

@@ -138,6 +138,10 @@ module Gemba
       # completion.
       def sync_unlocks; end
 
+      # Called on app exit. Backends with pending network state should flush
+      # or log anything that couldn't be delivered.
+      def shutdown; end
+
       # Fetch the full achievement list for a given ROM (by RomInfo) purely for
       # display — does not affect live game state. Calls the block with
       # Array<Achievement> on success, or nil on failure/unsupported.

data/lib/gemba/achievements/retro_achievements/backend.rb

@@ -48,13 +48,17 @@ module Gemba
         include Achievements::Backend
 
         RA_HOST      = "retroachievements.org"
+        RA_USER_AGENT = "gemba/#{Gemba::VERSION} (https://github.com/jamescook/gemba)"
         RA_PATH      = "/dorequest.php"
-        PING_BG_MODE = (RUBY_VERSION >= "4.0" ? :ractor : :thread).freeze
+        PING_BG_MODE         = (RUBY_VERSION >= "4.0" ? :ractor : :thread).freeze
+        UNLOCK_RETRY_BG_MODE = (RUBY_VERSION >= "4.0" ? :ractor : :thread).freeze
 
         # Frames between Rich Presence evaluations (~4 s at 60 fps).
         RP_EVAL_INTERVAL  = 240
         # Seconds between session ping heartbeats.
         PING_INTERVAL_SEC = 120
+        # Seconds between unlock retry sweeps.
+        UNLOCK_RETRY_INTERVAL_SEC = 30
 
         # Default requester: delegates to Teek::BackgroundWork.
         # Extracted so tests can inject a synchronous fake with the same interface.
@@ -76,12 +80,15 @@ module Gemba
           @rich_presence_message = nil
           @rp_eval_frame         = 0
           @ping_last_at          = nil
-          @ra_runtime       = runtime || Gemba::RARuntime.new
+          @ra_runtime          = runtime || Gemba::RARuntime.new
+          @unlock_queue        = []
+          @unlock_retry_last_at = nil
         end
 
         attr_writer :include_unofficial
         attr_writer :rich_presence_enabled
         attr_reader :rich_presence_message
+        attr_reader :unlock_queue
 
         # -- Authentication -------------------------------------------------------
 
@@ -111,7 +118,7 @@ module Gemba
               fire_auth_change(:ok, nil)
             else
               @authenticated = false
-              msg = json&.dig("Error") || "Token invalid"
+              msg = json ? (json.dig("Error") || "Token invalid") : "Could not connect to RetroAchievements"
               Gemba.log(:warn) { "RA: token verification failed for #{username}: #{msg}" }
               fire_auth_change(:error, msg)
             end
@@ -124,7 +131,8 @@ module Gemba
               fire_auth_change(:ok, nil)
             else
               @authenticated = false
-              fire_auth_change(:error, json&.dig("Error") || "Token invalid")
+              msg = json ? (json.dig("Error") || "Token invalid") : "Could not connect to RetroAchievements"
+              fire_auth_change(:error, msg)
             end
           end
         end
@@ -218,6 +226,14 @@ module Gemba
             submit_unlock(id)
           end
 
+          if @unlock_queue.any?
+            now = Time.now
+            if @unlock_retry_last_at.nil? || now - @unlock_retry_last_at >= UNLOCK_RETRY_INTERVAL_SEC
+              @unlock_retry_last_at = now
+              drain_unlock_queue
+            end
+          end
+
           return unless @rich_presence_enabled
 
           @rp_eval_frame = (@rp_eval_frame + 1) % RP_EVAL_INTERVAL
@@ -301,6 +317,41 @@ module Gemba
           end
         end
 
+        def drain_unlock_queue
+          Gemba.log(:info) { "RA: retrying #{@unlock_queue.size} queued unlock(s)" }
+          @unlock_queue.dup.each do |entry|
+            data = {
+              r: "awardachievement", u: @username, t: @token,
+              a: entry[:id], h: entry[:hardcore] ? 1 : 0,
+            }
+            data = Ractor.make_shareable(data) if UNLOCK_RETRY_BG_MODE == :ractor
+            @requester.call(@app, data, mode: UNLOCK_RETRY_BG_MODE, worker: UnlockRetryWorker)
+              .on_progress do |result|
+                ok, id = result
+                if ok
+                  Gemba.log(:info) { "RA: retry succeeded for achievement #{id}" }
+                  @unlock_queue.delete_if { |e| e[:id] == id }
+                else
+                  Gemba.log(:warn) { "RA: retry failed for achievement #{id}" }
+                end
+              end
+          end
+        end
+
+        # Submit an unlock to RA. On failure, queues for background retry.
+        def submit_unlock(achievement_id, hardcore: false)
+          do_unlock_request(achievement_id, hardcore: hardcore) do |ok|
+            enqueue_for_retry(achievement_id, hardcore: hardcore) unless ok
+          end
+        end
+
+        # Call on app exit — logs any unconfirmed unlocks that never drained.
+        def shutdown
+          return if @unlock_queue.empty?
+          ids = @unlock_queue.map { |e| e[:id] }.join(", ")
+          Gemba.log(:warn) { "RA: #{@unlock_queue.size} unlock(s) never confirmed — dropped on exit: #{ids}" }
+        end
+
         private
 
         # Fetch patch data (achievement definitions). Does NOT activate the runtime
@@ -407,18 +458,24 @@ module Gemba
             .on_progress { |ok| Gemba.log(ok ? :info : :warn) { "RA: ping g=#{game_id} ok=#{ok}" } }
         end
 
-        # Best-effort unlock submission — fires and forgets, result only logged.
-        def submit_unlock(achievement_id, hardcore: false)
+        # Fire the awardachievement HTTP request and yield ok (true/false) to block.
+        def do_unlock_request(achievement_id, hardcore:, &on_complete)
           ra_request(r: "awardachievement", u: @username, t: @token,
                      a: achievement_id, h: hardcore ? 1 : 0) do |json, ok|
-            if ok && json&.dig("Success")
-              Gemba.log(:info) { "RA: submitted unlock for achievement #{achievement_id}" }
-            else
-              Gemba.log(:warn) { "RA: unlock submission failed for #{achievement_id}: #{json&.dig("Error")}" }
-            end
+            success = ok && json&.dig("Success")
+            Gemba.log(success ? :info : :warn) {
+              success ? "RA: submitted unlock for achievement #{achievement_id}" \
+                      : "RA: unlock submission failed for #{achievement_id}: #{json&.dig("Error")}"
+            }
+            on_complete.call(success)
           end
         end
 
+        def enqueue_for_retry(achievement_id, hardcore:)
+          @unlock_queue << { id: achievement_id, hardcore: hardcore }
+          Gemba.log(:info) { "RA: queued achievement #{achievement_id} for retry" }
+        end
+
         # POST to dorequest.php via @requester (BackgroundWork in production,
         # a synchronous fake in tests). Calls on_done with (json_or_nil, ok_bool).
         def ra_request(params, &on_done)
@@ -428,6 +485,7 @@ module Gemba
             http.use_ssl      = true
             http.read_timeout = 15
             req  = Net::HTTP::Post.new(uri.path)
+            req['User-Agent'] = RA_USER_AGENT
             safe = req_params.reject { |k, _| [:t, :p, "t", "p"].include?(k) }
             Gemba.log(:info) { "RA request: r=#{params[:r]} #{safe.map { |k, v| "#{k}=#{v}" }.join(" ")}" }
             req.set_form_data(req_params.transform_keys(&:to_s).transform_values(&:to_s))

data/lib/gemba/achievements/retro_achievements/ping_worker.rb

@@ -16,6 +16,7 @@ module Gemba
           http.use_ssl      = true
           http.read_timeout = 10
           req  = Net::HTTP::Post.new(uri.path)
+          req['User-Agent'] = "gemba/#{Gemba::VERSION} (https://github.com/jamescook/gemba)"
           req.set_form_data(data[:params])
           t.yield(http.request(req).is_a?(Net::HTTPSuccess))
         rescue

data/lib/gemba/achievements/retro_achievements/unlock_retry_worker.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Gemba
+  module Achievements
+    module RetroAchievements
+      # Background worker for retrying failed achievement unlock submissions.
+      #
+      # Defined as a named class (not a closure) so it is Ractor-safe on
+      # Ruby 4+.  Receives the same flat params hash used by ra_request
+      # (keys: :r, :u, :t, :a, :h).  Yields [ok, achievement_id] back to
+      # the main thread via on_progress.
+      class UnlockRetryWorker
+        RA_HOST = "retroachievements.org"
+        RA_PATH = "/dorequest.php"
+
+        def call(t, data)
+          require "net/http"
+          require "json"
+          uri  = URI::HTTPS.build(host: RA_HOST, path: RA_PATH)
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl      = true
+          http.read_timeout = 15
+          req  = Net::HTTP::Post.new(uri.path)
+          req['User-Agent'] = "gemba/#{Gemba::VERSION} (https://github.com/jamescook/gemba)"
+          req.set_form_data(data.transform_keys(&:to_s).transform_values(&:to_s))
+          resp = http.request(req)
+          ok   = resp.is_a?(Net::HTTPSuccess) && JSON.parse(resp.body)["Success"]
+          t.yield([ok ? true : false, data[:a].to_s])
+        rescue
+          t.yield([false, data[:a].to_s])
+        end
+      end
+    end
+  end
+end

data/lib/gemba/app_controller.rb

@@ -100,10 +100,11 @@ module Gemba
       @rom_overrides  = RomOverrides.new
       @game_picker = GamePickerFrame.new(app: @app, rom_library: @rom_library,
                                          boxart_fetcher: @boxart_fetcher, rom_overrides: @rom_overrides)
-      @frame_stack.push(:picker, @game_picker)
-      @window.set_geometry(GamePickerFrame::PICKER_DEFAULT_W, GamePickerFrame::PICKER_DEFAULT_H)
-      @window.set_minsize(GamePickerFrame::PICKER_MIN_W, GamePickerFrame::PICKER_MIN_H)
-      apply_frame_aspect(@game_picker)
+      @list_picker = ListPickerFrame.new(app: @app, rom_library: @rom_library,
+                                         rom_overrides: @rom_overrides)
+      @active_picker = @config.picker_view == 'list' ? @list_picker : @game_picker
+      @frame_stack.push(:picker, @active_picker)
+      apply_picker_window(@active_picker)
 
       @help_auto_paused = false
       @cursor_hidden    = false
@@ -188,6 +189,7 @@ module Gemba
       bus.on(:open_config_dir)     { open_config_dir }
       bus.on(:open_recordings_dir) { open_recordings_dir }
       bus.on(:open_replay_player)  { show_replay_player }
+      bus.on(:picker_view_changed) { |view:| switch_picker_view(view) }
 
       # Frame → controller events
       bus.on(:pause_changed) do |paused|
@@ -200,6 +202,7 @@ module Gemba
       bus.on(:request_quit)            { self.running = false if confirm_quit }
       bus.on(:achievement_unlocked) do |achievement:|
         frame&.receive(:show_toast, message: "#{achievement.title} (#{achievement.points}pts)")
+        frame&.receive(:take_achievement_screenshot, achievement: achievement) if @config.ra_screenshot_on_unlock?
       end
       bus.on(:ra_login) do |username:, password:|
         achievement_backend.login_with_password(username: username, password: password)
@@ -420,9 +423,7 @@ module Gemba
       @emulator_frame = nil
       @rom_path = nil
       @window.set_title("gemba")
-      @window.set_geometry(GamePickerFrame::PICKER_DEFAULT_W, GamePickerFrame::PICKER_DEFAULT_H)
-      @window.set_minsize(GamePickerFrame::PICKER_MIN_W, GamePickerFrame::PICKER_MIN_H)
-      apply_frame_aspect(@game_picker)
+      apply_picker_window(@active_picker)
       @app.command(@view_menu, :entryconfigure, 0, state: :disabled)
       set_event_loop_speed(:idle)
     end
@@ -1004,12 +1005,32 @@ module Gemba
       Gemba.open_directory(Config.default_logs_dir)
     end
 
+    def apply_picker_window(picker)
+      w, h     = picker.default_geometry
+      mn_w, mn_h = picker.min_geometry
+      @window.set_geometry(w, h)
+      @window.set_minsize(mn_w, mn_h)
+      apply_frame_aspect(picker)
+    end
+
+    def switch_picker_view(view)
+      return if @config.picker_view == view
+      new_picker = view == 'list' ? @list_picker : @game_picker
+      @frame_stack.replace_current(new_picker)
+      @active_picker = new_picker
+      @config.picker_view = view
+      save_config
+      apply_picker_window(new_picker)
+    end
+
     def cleanup
       return if @cleaned_up
       @cleaned_up = true
       @emulator_frame&.cleanup
       @game_picker&.cleanup
+      @list_picker&.cleanup
       RomResolver.cleanup_temp
+      @achievement_backend&.shutdown
     end
   end
 end

data/lib/gemba/config.rb

@@ -57,7 +57,9 @@ module Gemba
       'ra_token'             => '',
       'ra_hardcore'          => false,
       'ra_unofficial'        => false,
-      'ra_rich_presence'     => false,
+      'ra_rich_presence'          => false,
+      'ra_screenshot_on_unlock'   => true,
+      'picker_view'               => 'grid',
     }.freeze
 
     # Settings that can be overridden per ROM. Maps config key → locale key.
@@ -73,7 +75,8 @@ module Gemba
       'turbo_speed'       => 'settings.turbo_speed',
       'quick_save_slot'   => 'settings.quick_save_slot',
       'save_state_backup' => 'settings.keep_backup',
-      'ra_rich_presence'  => 'settings.ra_rich_presence',
+      'ra_rich_presence'          => 'settings.ra_rich_presence',
+      'ra_screenshot_on_unlock'   => 'settings.ra_screenshot_on_unlock',
     }.freeze
 
     PER_GAME_KEYS = PER_GAME_SETTINGS.keys.to_set.freeze
@@ -496,6 +499,23 @@ module Gemba
       global['ra_rich_presence'] = val ? true : false
     end
 
+    def ra_screenshot_on_unlock?
+      global['ra_screenshot_on_unlock']
+    end
+
+    def ra_screenshot_on_unlock=(val)
+      global['ra_screenshot_on_unlock'] = val ? true : false
+    end
+
+    # @return [String] preferred picker view ('grid' or 'list')
+    def picker_view
+      global['picker_view'] || 'grid'
+    end
+
+    def picker_view=(val)
+      global['picker_view'] = val.to_s
+    end
+
     # @return [String] directory for .grec recording files
     def recordings_dir
       global['recordings_dir'] || self.class.default_recordings_dir

data/lib/gemba/emulator_frame.rb

@@ -492,6 +492,30 @@ module Gemba
       @toast&.show(translate('toast.screenshot_failed'))
     end
 
+    def take_achievement_screenshot(achievement)
+      return unless @core && !@core.destroyed?
+
+      dir = Config.default_screenshots_dir
+      FileUtils.mkdir_p(dir)
+
+      stamp = Time.now.strftime('%Y%m%d_%H%M%S')
+      name  = "achievement_#{achievement.id}_#{stamp}.png"
+      path  = File.join(dir, name)
+
+      pixels    = @core.video_buffer_argb
+      photo_name = "__gemba_ach_ss_#{object_id}"
+      out_w = @platform.width * @scale
+      out_h = @platform.height * @scale
+      @app.command(:image, :create, :photo, photo_name, width: out_w, height: out_h)
+      @app.interp.photo_put_zoomed_block(photo_name, pixels, @platform.width, @platform.height,
+                                         zoom_x: @scale, zoom_y: @scale, format: :argb)
+      @app.command(photo_name, :write, path, format: :png)
+      @app.command(:image, :delete, photo_name)
+    rescue StandardError => e
+      Gemba.log(:warn) { "achievement screenshot failed: #{e.message} (#{e.class})" }
+      @app.command(:image, :delete, photo_name) rescue nil
+    end
+
     # -- Recording --------------------------------------------------------------
 
     def toggle_recording

data/lib/gemba/frame_stack.rb

@@ -48,6 +48,16 @@ module Gemba
       frame.show
     end
 
+    # Replace the current frame in-place without changing the stack depth.
+    #
+    # The existing frame is hidden; the new one is shown under the same name.
+    def replace_current(frame)
+      return unless (entry = @stack.last)
+      entry.frame.hide
+      @stack[-1] = Entry.new(name: entry.name, frame: frame)
+      frame.show
+    end
+
     # Pop the current frame off the stack.
     #
     # The popped frame is hidden. If there's a previous frame, it is re-shown.

data/lib/gemba/game_picker_frame.rb

@@ -30,6 +30,9 @@ module Gemba
     PICKER_MIN_W     = 576
     PICKER_MIN_H     = 768
 
+    def default_geometry = [PICKER_DEFAULT_W, PICKER_DEFAULT_H]
+    def min_geometry     = [PICKER_MIN_W,     PICKER_MIN_H]
+
     def initialize(app:, rom_library:, boxart_fetcher: nil, rom_overrides: nil)
       @app      = app
       @rom_library = rom_library
@@ -43,11 +46,11 @@ module Gemba
     def show
       build_ui unless @built
       refresh
-      @app.command(:pack, @grid, fill: :both, expand: 1)
+      @app.command(:pack, @outer, fill: :both, expand: 1)
     end
 
     def hide
-      @app.command(:pack, :forget, @grid) rescue nil
+      @app.command(:pack, :forget, @outer) rescue nil
     end
 
     def cleanup
@@ -69,8 +72,12 @@ module Gemba
     private
 
     def build_ui
-      @grid = '.game_picker'
-      @app.command('ttk::frame', @grid, padding: 16)
+      @outer = '.game_picker'
+      @app.command('ttk::frame', @outer, padding: 0)
+
+      @cards_frame = "#{@outer}.cards"
+      @app.command('ttk::frame', @cards_frame, padding: 16)
+      @app.command(:pack, @cards_frame, fill: :both, expand: 1)
 
       # Capture the system window background color so hollow cards blend in
       # rather than appearing as stark black rectangles.
@@ -84,8 +91,8 @@ module Gemba
         row = i / COLS
         col = i % COLS
 
-        cell = "#{@grid}.card#{i}"
-        @app.command(:frame, cell, relief: :groove, borderwidth: 2,
+        cell = "#{@cards_frame}.card#{i}"
+        @app.command(:frame, cell, relief: :groove, borderwidth: 1,
           padx: 4, pady: 4, bg: '#2a2a2a')
         @app.command(:grid, cell, row: row, column: col, padx: 6, pady: 6, sticky: :nsew)
 
@@ -114,12 +121,46 @@ module Gemba
       end
 
       # Make columns and rows expand evenly
-      COLS.times { |c| @app.command(:grid, :columnconfigure, @grid, c, weight: 1) }
-      ROWS.times { |r| @app.command(:grid, :rowconfigure, @grid, r, weight: 1) }
+      COLS.times { |c| @app.command(:grid, :columnconfigure, @cards_frame, c, weight: 1) }
+      ROWS.times { |r| @app.command(:grid, :rowconfigure, @cards_frame, r, weight: 1) }
+
+      build_toolbar
 
       @built = true
     end
 
+    def build_toolbar
+      sep = "#{@outer}.sep"
+      @app.command('ttk::separator', sep, orient: :horizontal)
+      @app.command(:pack, sep, fill: :x)
+
+      toolbar = "#{@outer}.toolbar"
+      @app.command('ttk::frame', toolbar, padding: [4, 2])
+      @app.command(:pack, toolbar, fill: :x)
+
+      gear_btn = "#{toolbar}.gear"
+      gear_menu = "#{toolbar}.gearmenu"
+      @app.command('ttk::button', gear_btn, text: "\u2699", width: 1,
+        command: proc { post_view_menu(gear_menu, gear_btn) })
+      @app.command(:pack, gear_btn, side: :right)
+    end
+
+    def post_view_menu(menu, btn)
+      @app.command(:menu, menu, tearoff: 0) unless @app.tcl_eval("winfo exists #{menu}") == '1'
+      @app.command(menu, :delete, 0, :end)
+      current = Gemba.user_config.picker_view
+      @app.command(menu, :add, :command,
+        label: "#{current == 'grid' ? "\u2713 " : '  '}#{translate('picker.toolbar.boxart_view')}",
+        command: proc { emit(:picker_view_changed, view: 'grid') })
+      @app.command(menu, :add, :command,
+        label: "#{current == 'list' ? "\u2713 " : '  '}#{translate('picker.toolbar.list_view')}",
+        command: proc { emit(:picker_view_changed, view: 'list') })
+      x = @app.tcl_eval("winfo rootx #{btn}").to_i
+      y = @app.tcl_eval("winfo rooty #{btn}").to_i
+      h = @app.tcl_eval("winfo height #{btn}").to_i
+      @app.tcl_eval("tk_popup #{menu} #{x} #{y + h}")
+    end
+
     def refresh
       roms = @rom_library.all.first(SLOTS)