imdb-terminal 2.0.1 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a835730544b1acf9055d609a37a5727aecb9754878be3ccf1b873502b72fd771
-  data.tar.gz: 6a9bc9712e20f70d2eceb8169dc32d81263a0a65cf2418815a3774a05399aeda
+  metadata.gz: 8b26870720d0e55ae88bc797de5e902b24bca1deac0514c3c29058b90df31d08
+  data.tar.gz: 39c9433b18a602fa2f7b16493ae94841896da14493b24256852c1bd70253a403
 SHA512:
-  metadata.gz: cf5bc22eb1a504498cb0a0843066b32c6fd0aaae995894f01616a27cebc3daac6c1c2bc996f28b7178c53a68dc9993f1dd1b4850118ea84fb42ebc2678b670f8
-  data.tar.gz: 51ae69f5e824dd50157bb2f770d8536ffb9121957166fb61710d281d09c6041f794b5b41a520b2d6c7aa56359592974ff7e098c5315cd4e8510411086a0bd2a5
+  metadata.gz: 92396d67a67433e37f25fa135577f012f1259c88e7cc859f868eec153705a35cd138fb57aeb26132927d82b502d3ebf40dab9ae0ee6999a6fb0e951b71a2ed0c
+  data.tar.gz: 556c17abd3c6e6b2b5aaebb6a5b1e179cb16374f82945ce2fa484185bebfb9eaf0a2329d892a9ed0cd3ee12987a22536e6dba767034a241feee07eda0d9af66f

data/bin/imdb

@@ -14,7 +14,7 @@
 #             for any damages resulting from its use. Further, I am under no
 #             obligation to maintain or extend this software. It is provided 
 #             on an 'as is' basis without any expressed or implied warranty.
-# Version:    2.0.0: Breaking change - requires rcurses 6.0.0+ with explicit init
+# Version:    2.1.1: Add HTTP timeouts and external command error handling
 
 # REQUIRES AND CONSTANTS {{{1
 require 'io/console'
@@ -32,6 +32,7 @@ require 'nokogiri'
 require 'fileutils'
 require 'concurrent'
 require 'rcurses'
+require 'termpix'
 
 include Rcurses
 include Rcurses::Cursor
@@ -84,8 +85,9 @@ class IMDBApp
     @list.border = true
     @last_poster_id = nil
     @current_image = nil
+    @termpix = Termpix::Display.new unless WINDOWS
     @last_active_window = nil
-    
+
     run_loop
   ensure
     save_config
@@ -409,7 +411,8 @@ class IMDBApp
     uri = "https://www.imdb.com/#{path}/"
     
     begin
-      raw = `curl -sfL -H "User-Agent: #{ua}" "#{uri}"`
+      raw = `curl -sfL --max-time 15 --connect-timeout 10 -H "User-Agent: #{ua}" "#{uri}"`
+      return [] unless $?.success?
       html = raw.force_encoding('UTF-8').scrub('')
       doc = Nokogiri::HTML(html)
       
@@ -452,10 +455,19 @@ class IMDBApp
 
   def scrape_json_ld(path, ua) #{{{2
     uri = "https://www.imdb.com/#{path}/"
-    raw = `curl -sfL -H "User-Agent: #{ua}" "#{uri}"`
+    begin
+      raw = `curl -sfL --max-time 15 --connect-timeout 10 -H "User-Agent: #{ua}" "#{uri}"`
+      unless $?.success?
+        @progress.say("Warning: Failed to fetch #{path}") if defined?(@progress) && @progress
+        return []
+      end
+    rescue => e
+      @progress.say("Warning: curl error for #{path}: #{e.message}") if defined?(@progress) && @progress
+      return []
+    end
     html = raw.force_encoding('UTF-8').scrub('')
     doc = Nokogiri::HTML(html)
-    
+
     if (ld = doc.at_css('script[type="application/ld+json"]'))
       begin
         data = JSON.parse(ld.text)
@@ -473,7 +485,7 @@ class IMDBApp
         # fall back to HTML scrape
       end
     end
-    
+
     doc.css('.lister-list tr').map do |tr|
       rating = tr.at_css('td.ratingColumn strong')&.text.to_f || 0.0
       a      = tr.at_css('td.titleColumn a') or next
@@ -767,16 +779,27 @@ class IMDBApp
   def download_poster(tconst, cache) #{{{2
     url = fetch_imdb_poster_url(tconst)
     return unless url
-    
+
     dest = File.join(cache, "#{tconst}.jpg")
     return if File.exist?(dest) && File.size(dest) > 1000
-    
+
     cmd = [
-      'curl', '-sfL', '--max-time', '10', '--retry', '2', '--retry-delay', '1',
+      'curl', '-sfL', '--max-time', '10', '--connect-timeout', '10',
+      '--retry', '2', '--retry-delay', '1',
       '-H', 'User-Agent: Mozilla/5.0', '-o', dest, url
     ].map { |arg| Shellwords.escape(arg) }.join(' ')
-    
-    system(cmd, err: File::NULL)
+
+    begin
+      system(cmd, err: File::NULL)
+      # Remove incomplete downloads
+      if File.exist?(dest) && File.size(dest) < 100
+        File.delete(dest) rescue nil
+      end
+    rescue => e
+      File.open("/tmp/imdb_fetch_errors.log", "a") do |f|
+        f.puts "[#{Time.now.iso8601}] Poster download failed for #{tconst}: #{e.message}"
+      end
+    end
   end
 
   def fetch_imdb_poster_url(tconst) #{{{2
@@ -784,9 +807,13 @@ class IMDBApp
       html = URI.open(
         "https://www.imdb.com/title/#{tconst}/",
         "User-Agent"      => "Mozilla/5.0",
-        "Accept-Encoding" => "identity"
+        "Accept-Encoding" => "identity",
+        open_timeout:       10,
+        read_timeout:       10
       ).read
-    rescue SocketError, Errno::ECONNREFUSED, OpenURI::HTTPError, Net::HTTPBadResponse
+    rescue SocketError, Errno::ECONNREFUSED, OpenURI::HTTPError,
+           Net::HTTPBadResponse, Net::OpenTimeout, Net::ReadTimeout,
+           Timeout::Error, Errno::ETIMEDOUT
       return nil
     end
     html[/<meta property="og:image" content="([^"]+)"/,1]
@@ -1188,12 +1215,14 @@ class IMDBApp
     uri.query = URI.encode_www_form(q: query, s: 'tt')
     html = nil
     begin
-      Timeout.timeout(5) do
+      Timeout.timeout(15) do
         html = URI.open(uri.to_s,
                         'User-Agent'      => 'Mozilla/5.0',
                         'Accept'          => 'text/html,application/xhtml+xml',
                         'Accept-Language' => 'en-US,en;q=0.9',
-                        'Accept-Encoding' => 'identity'
+                        'Accept-Encoding' => 'identity',
+                        open_timeout:       10,
+                        read_timeout:       10
                       ).read
         # Fix encoding issues
         html = html.force_encoding('UTF-8').scrub('?')
@@ -1324,7 +1353,7 @@ class IMDBApp
     help_text << "  • Dump list removes items from main view permanently\n".fg(230)
     help_text << "  • TMDb provides streaming provider information\n".fg(230)
     unless WINDOWS
-      help_text << "  • Posters are displayed in the terminal using w3mimgdisplay\n".fg(230)
+      help_text << "  • Posters are displayed using termpix (Sixel or w3m protocols)\n".fg(230)
     else
       help_text << "  • Poster display not available on Windows\n".fg(230)
     end
@@ -1811,43 +1840,33 @@ class IMDBApp
 
   def show_poster(tconst) #{{{2
     return if WINDOWS # Skip image display on Windows for now
-    
-    w3m = "/usr/lib/w3m/w3mimgdisplay"
-    return unless File.executable?(w3m)
+    return unless @termpix&.supported?
+
     cache = cache_dir
     file  = File.join(cache, "#{tconst}.jpg")
 
     begin
       Timeout.timeout(2) do
-        info = `xwininfo -id $(xdotool getactivewindow) 2>/dev/null`
-        return unless info =~ /Width:\s*(\d+).*Height:\s*(\d+)/m
-        term_w, term_h = $1.to_i, $2.to_i
         rows, cols = IO.console.winsize
-        cw = term_w.to_f / cols
-        ch = term_h.to_f / rows
-        px = ((@detail.x - 1) * cw).to_i
-        py = (25 * ch).to_i
-        max_w = (40 * cw).to_i
-        max_h = ((rows - 28) * ch).to_i
 
-        `echo "6;#{px};#{py};#{max_w+4};#{max_h+4};\n4;\n3;" | #{w3m} 2>/dev/null`
+        # Always clear previous poster first to prevent overlapping
+        @termpix.clear(
+          x: @detail.x - 1,
+          y: 25,
+          width: 40,
+          height: rows - 27,
+          term_width: cols,
+          term_height: rows)
 
         if File.exist?(file) && File.size?(file) > 0
-          iw, ih = `identify -format "%wx%h" #{file}`.split('x').map(&:to_i)
-
-          if iw > max_w
-            ih = ih * max_w / iw; iw = max_w
-          end
-          if ih > max_h
-            iw = iw * max_h / ih; ih = max_h
-          end
-
-          `echo "0;1;#{px};#{py};#{iw};#{ih};;;;;\"#{file}\"\n4;\n3;" | #{w3m} 2>/dev/null`
-          
-          # Track the current image
+          # Display new poster using termpix
+          @termpix.show(file,
+            x: @detail.x - 1,
+            y: 25,
+            max_width: 40,
+            max_height: rows - 28)
           @current_image = file
         else
-          # Clear current image if no file exists
           @current_image = nil
         end
       end
@@ -1858,24 +1877,26 @@ class IMDBApp
 
   def check_image_redraw #{{{2
     return if WINDOWS # Skip image redraw on Windows
+    return unless @termpix&.supported?
     # Only check if we have an image currently displayed
     return unless @current_image && File.exist?(@current_image)
-    
+
     begin
-      # Check if we're in the active window - if not, image overlay might be cleared
-      active_window = `xdotool getactivewindow 2>/dev/null`.chomp
-      return if active_window.empty?
-      
-      # Check if this terminal window is the active one
-      current_window = `xdotool getwindowfocus 2>/dev/null`.chomp
-      
-      # Only redraw if we detect a focus change (simple heuristic)
-      if @last_active_window && @last_active_window != active_window && current_window == active_window
-        # Window focus changed and we're now active - redraw image using last poster id
-        show_poster(@last_poster_id) if @last_poster_id
+      # For w3m protocol, check if image overlay was cleared
+      if @termpix.protocol == :w3m
+        active_window = `xdotool getactivewindow 2>/dev/null`.chomp
+        return if active_window.empty?
+
+        current_window = `xdotool getwindowfocus 2>/dev/null`.chomp
+
+        # Only redraw if we detect a focus change
+        if @last_active_window && @last_active_window != active_window && current_window == active_window
+          show_poster(@last_poster_id) if @last_poster_id
+        end
+
+        @last_active_window = active_window
       end
-      
-      @last_active_window = active_window
+      # Sixel images persist, no redraw needed
     rescue
       # Silently fail - we don't want focus checking to break anything
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imdb-terminal
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.1
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-19 00:00:00.000000000 Z
+date: 2026-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: termpix
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -66,12 +80,12 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description: 'Discover and manage movies and TV series from IMDb''s Top 250 lists.
-  Features smart search with preview mode, advanced filtering by rating/year/genre,
+description: 'IMDB v2.1.1: Modern poster display using termpix gem with Sixel and
+  w3m protocol support. Discover and manage movies and TV series from IMDb''s Top
+  250 lists. Features smart search with preview mode, advanced filtering by rating/year/genre,
   streaming information via TMDb, wish lists, and terminal poster display. Enhanced
-  with jump-to-existing items, duplicate management, and robust data handling. Version
-  2.0.1: Added Windows support - all core functionality works on Windows with graceful
-  handling of platform-specific features.'
+  with jump-to-existing items, duplicate management, robust data handling, and improved
+  HTTP timeout/error handling.'
 email: g@isene.com
 executables:
 - imdb
@@ -90,11 +104,11 @@ metadata:
 post_install_message: "✓ IMDb Terminal Browser installed successfully!\n\nTo get started:\n1.
   Run: imdb\n2. On first run, the app will scrape IMDb Top 250 lists\n3. Optional:
   Get a free TMDb API key for streaming info\n4. Press '?' for help once running\n\nExternal
-  dependencies for full functionality (Linux/macOS only):\n- w3m-img (for poster display):
-  sudo apt install w3m-img\n- imagemagick (for poster processing): sudo apt install
-  imagemagick\n- xdotool (for image redraw on workspace switch): sudo apt install
-  xdotool\n\nNote: Poster display is not available on Windows, but all other \nfunctionality
-  works normally.\n\nEnjoy discovering your next favorite movie! :-)\n"
+  dependencies for full functionality (Linux/macOS only):\n- imagemagick (for image
+  processing): sudo apt install imagemagick\n- For w3m protocol: w3m-img, xdotool
+  (sudo apt install w3m-img xdotool)\n- For Sixel protocol (mlterm, xterm): imagemagick
+  convert command\n\nNote: Poster display is not available on Windows, but all other
+  \nfunctionality works normally.\n\nEnjoy discovering your next favorite movie! :-)\n"
 rdoc_options: []
 require_paths:
 - "."