imdb-terminal 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 668a4e977795d0075d70382890a72e911688c452d67cb02ba432f1cfefdacd01
-  data.tar.gz: 4d1ac685489c8b509349841fc55e00285576ed9be0815802740731e5762cb954
+  metadata.gz: f8347c47ad3e34bb786894d6a997d63b4476c618fbe5384dbcddb9fb528f742b
+  data.tar.gz: 91459db3845e5335bcc4736cc9c517b7261ae209a315a23f975b5c036c70062e
 SHA512:
-  metadata.gz: 627fbd556497607248a0ebb78012d0ce9b5577eab31a0b8f8446c0b65b1aaba6bb78cc25216d0c115db672a6b179e21b468f86727ce09a2f397d98a0a8ceb893
-  data.tar.gz: 87531c704b0b7b1d5bea5d2a8bd91b656f08a6ded7d4639c2441ca3923a6c282920bdbe74c430a70615e117e58c272fa468f7f27bda0a7c1735ec5f8e4a6fbb8
+  metadata.gz: 4144094e4f95160f6c61f3add759f5bcbdbcd3df023c82d65a9337a9b299e225b3d69ff68db345cb4fbe8493d080d73f1771efcd68ad83eef6e407c2d415d983
+  data.tar.gz: 4ab879585b58294d0b6ec12dda210de5de81f9a5f3290603d8e4389dcf0a171d6729a125793dda67369a0951354ac220e4e425a4b51f5eaf0de031af8b8ce881

data/README.md

@@ -2,7 +2,6 @@
 ![Ruby](https://img.shields.io/badge/language-Ruby-red) [![Gem Version](https://badge.fury.io/rb/imdb-terminal.svg)](https://badge.fury.io/rb/imdb-terminal) ![Unlicense](https://img.shields.io/badge/license-Unlicense-green) ![Stay Amazing](https://img.shields.io/badge/Stay-Amazing-important)
 
 # IMDB for the terminal
-
 Finding the right moviie to watch or series to binge can be time consuming. My
 girlfriend asked if I could create an application that would cut down the time
 spent on searching in favor of time spent watching and cuddling. Meet
@@ -34,24 +33,23 @@ The screenshot gives you an overview of the layout of the panes:
 ![IMDB-terminal screenshot](img/screenshot.png)
 
 # Keymap
-
-Keys       | Function
------------|--------------------
-TAB        | Cycle the panes (active pane is gray)
-Shift-TAB  | Cycle backward
-Arrow keys | UP, DOWN, PgUP, PgDOWN, HOME, END in lists
-\+ or -     | Depends on pane (intuitive)
-I          | Load fresh IMDB data (be patient)
-m or s     | Show MOVIES or SERIES
-r          | Select MINimum IMDB rating (in bottom line)
-y or Y     | Select MINimum or MAXimum production year
-/ or \\     | Enter or clear search for movie/series title
-G          | Set genres to match every movie/series
-d          | Get details on selected movie/series
-D          | Show where you can stream the movie/series
-R          | Refresh all panes
-w or W     | Write changes to config or save IMDB data
-q or Q     | Quit w/saving config or w/o saving config
+Keys         | Function
+-------------|--------------------
+TAB or S-TAB | Cycle panes (active is gray) or backwards
+Arrow keys   | UP, DOWN, PgUP, PgDOWN, HOME, END in lists
+\+ or -       | Depends on pane (intuitive)
+I            | Load fresh IMDB data (be patient)
+m or s       | Show MOVIES or SERIES
+r            | Select MINimum IMDB rating (in bottom line)
+y or Y       | Select MINimum or MAXimum production year
+/ or \\       | Enter or clear search for movie/series title
+G            | Set genres to match every movie/series
+d            | Get details on selected movie/series
+D            | Show where you can stream the movie/series
+R            | Refresh all panes
+v            | Show version (and latest RybyGems version)
+w or W       | Write changes to config or save IMDB data
+q or Q       | Quit w/saving config or w/o saving config
 
 # Suggestions and improvements
 If you have any suggestions for improvement or cool features, create an issue

data/bin/imdb

@@ -14,28 +14,29 @@
 #             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 = "0.2"
 
 # PRELIMINARIES
 @help = <<HELPTEXT
 IMDB-term (https://github.com/isene/IMDB) Help text:
 
-Keys       | Function
------------+--------------------
-TAB        | Cycle the panes (active pane is gray)
-Shift-TAB  | Cycle backward
-Arrow keys | UP, DOWN, PgUP, PgDOWN, HOME, END in lists
-+ or -     | Depends on pane (intuitive)
-I          | Load fresh IMDB data (be patient)
-m or s     | Show MOVIES or SERIES
-r          | Select MINimum IMDB rating (in bottom line)
-y or Y     | Select MINimum or MAXimum production year
-/ or \\     | Enter or clear search for movie/series title
-G          | Set genres to match every movie/series
-d          | Get details on selected movie/series
-D          | Show where you can stream the movie/series
-R          | Refresh all panes
-w or W     | Write changes to config or save IMDB data
-q or Q     | Quit w/saving config or w/o saving config
+Keys         | Function
+-------------+--------------------
+TAB or S-TAB | Cycle panes (active is gray) or backwards
+Arrow keys   | UP, DOWN, PgUP, PgDOWN, HOME, END in lists
++ or -       | Depends on pane (intuitive)
+I            | Load fresh IMDB data (be patient)
+m or s       | Show MOVIES or SERIES
+r            | Select MINimum IMDB rating (in bottom line)
+y or Y       | Select MINimum or MAXimum production year
+/ or \\       | Enter or clear search for movie/series title
+G            | Set genres to match every movie/series
+d            | Get details on selected movie/series
+D            | Show where you can stream the movie/series
+R            | Refresh all panes
+v            | Show version (and latest RybyGems version)
+w or W       | Write changes to config or save IMDB data
+q or Q       | Quit w/saving config or w/o saving config
 HELPTEXT
 begin # BASIC SETUP
   require 'net/http'
@@ -331,6 +332,8 @@ def getkey # GET KEY FROM USER
       w_b("Error: #{e.inspect}")
     end
     @w_b.update = false
+  when 'v'
+    w_b("Version = #{@version} (latest RubyGems version is #{Gem.latest_version_for("imdb-terminal").version} - https://github.com/isene/IMDB)")
   when 'w'
     saveconf
   when 'W'
@@ -594,7 +597,13 @@ def w_d(ext = 0) # SHOW INFO IN @w_d and @w_p
   # Display the poster
   poster     = det["Poster"]
   `curl -s "#{poster}" > /tmp/imdb.jpg`
-  image      = "/tmp/imdb.jpg"
+  imageshow("/tmp/imdb.jpg")
+  return unless ext > 1 # Skip if no outlets are to be displayed
+  otl.each{|o| outlets += "#{o}  "}
+  @w_d.text += "Outlets:   " + outlets
+  @w_d.write
+end
+def imageshow(image)
   begin
     terminfo    = `xwininfo -id $(xdotool getactivewindow)`
     term_w      = terminfo.match(/Width: (\d+)/)[1].to_i
@@ -603,10 +612,11 @@ def w_d(ext = 0) # SHOW INFO IN @w_d and @w_p
     char_h      = term_h / Curses.lines
     img_x       = char_w * 105
     img_y       = char_h * (Curses.lines / 2 + 2)
-    img_max_w   = char_w * (Curses.cols - width - 2)
+    img_max_w   = char_w * (Curses.cols - (Curses.cols - 104) - 2)
     img_max_h   = char_h * (@w_d.maxy - 2)
     # Clear previous images
     `echo "6;#{img_x};#{img_y};#{img_max_w+2};#{img_max_h+2};\n4;\n3;" | #{@w3mimgdisplay} 2>/dev/null`
+    return if image == ""
     img_w,img_h = `identify -format "%[fx:w]x%[fx:h]" #{image} 2>/dev/null`.split('x')
     img_w       = img_w.to_i
     img_h       = img_h.to_i
@@ -622,26 +632,6 @@ def w_d(ext = 0) # SHOW INFO IN @w_d and @w_p
   rescue
     w_b("Error showing image")
   end
-  return unless ext > 1 # Skip if no outlets are to be displayed
-  otl.each{|o| outlets += "#{o}  "}
-  @w_d.text += "Outlets:   " + outlets
-  @w_d.write
-end
-def imageclear
-  begin
-    terminfo    = `xwininfo -id $(xdotool getactivewindow)`
-    term_w      = terminfo.match(/Width: (\d+)/)[1].to_i
-    term_h      = terminfo.match(/Height: (\d+)/)[1].to_i
-    char_w      = term_w / Curses.cols
-    char_h      = term_h / Curses.lines
-    img_x       = char_w * 105
-    img_y       = char_h * (Curses.lines / 2 + 2)
-    img_max_w   = char_w * (Curses.cols - (Curses.cols - 104) - 2)
-    img_max_h   = char_h * (@w_d.maxy - 2)
-    `echo "6;#{img_x};#{img_y};#{img_max_w+2};#{img_max_h+2};\n4;\n3;" | #{@w3mimgdisplay} 2>/dev/null`
-  rescue
-    w_b("Error clearing image")
-  end
 end
 
 # BOTTOM WINDOW FUNCTIONS 
@@ -770,7 +760,7 @@ loop do # OUTER LOOP - (catching refreshes via 'r')
         @w_d.fill
         w_d
       end
-      imageclear if @w_d.update
+      imageshow("") if @w_d.update
       @w_d.update = true
       w_b(nil) if @w_b.update
       @w_b.update = true
@@ -779,7 +769,7 @@ loop do # OUTER LOOP - (catching refreshes via 'r')
       break if Curses.cols != maxx or Curses.lines != maxy # break on terminal resize 
     end
   ensure # On exit: clear image, close curses 
-    image_show("clear")
+    imageshow("")
     close_screen
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imdb-terminal
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-01 00:00:00.000000000 Z
+date: 2023-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -30,10 +30,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.2
-description: Narrow down your preferences from a 1000 movies and almost 500 series.
+description: 'Narrow down your preferences from a 1000 movies and almost 500 series.
   Select a minimum IMDB rating, range of production years, genres you like and dislike
   to get your preferred list.  Get detailed information on movies and series and where
-  you can stream them. Even the movie poster in the terminal.
+  you can stream them. Even the movie poster in the terminal. New in 0.2: Added ''v''
+  to show version and RubyGem version. Code cleanup.'
 email: g@isene.com
 executables:
 - imdb