imdb-terminal 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5900c22d081fb8cc49e3b657f2380246d4984245698fe7f997ce725a5d94a363
-  data.tar.gz: 7fa4905d7d01d3753d53639db6b6f432a4424c5e5224fffd4065c47d7647af52
+  metadata.gz: 318c36f7732c8e2ff3831c96d3e15cef170d9ca6528a49ed65f6de7ff9411f88
+  data.tar.gz: 685167952efd3b9b8b90d79ac7a285347217e2ed246ed9c29f09e93172c25316
 SHA512:
-  metadata.gz: 8545ab5fc7c8655ad3e9541517899e4ce761cb15d7ce4ceb24e6949048b160af96fe2b7e211b39896897aed54fa3b75871a295da9d903e120467b91eb1df8cba
-  data.tar.gz: 359a3cfd14dd7d03f93ef40da0b5e3d0addabeee12cee86f8354e5d791ef52589424b9d91522c5b0a6146415843564575ddac55a55f2cd682915e37415084912
+  metadata.gz: 0b9bc63aaa63bb5f979b9ab3e8b956ae937bba83de7fca1be15e43b75c695f42fcf7e52ad0cc869151ed6bde6475959cd4ada1424f726286cb02bc19f96349b8
+  data.tar.gz: fadebca0abc0f276141a90a2b0eb1f11232f76e7774b530ce249379a35a7c539deff79a9938cded9f8fe109f89bc24f9429807a8ae721f84ad5f9d02dc2a847f

data/bin/imdb

@@ -117,40 +117,87 @@ end
 
 # CLASSES
 class Curses::Window # CLASS EXTENSION 
-  attr_accessor :fg, :bg, :attr, :text, :index, :list, :update
   # General extensions (see https://github.com/isene/Ruby-Curses-Class-Extension)
-  def clr
+  # This is a class extension to Ruby Curses - a class in dire need of such.
+  # self.pair keeps a registry of colors as they are encountered - defined with: 
+  # init_pair(index, foreground, background)
+  # self.fg is set for the foreground color
+  # self.bg is set for the background color
+  # self.attr is set for text attributes like Curses::A_BOLD
+  # self.update can be used to indicate if a window should be updated (true/false)
+  # self.index can be used to keep track of the current list item in a window
+  attr_accessor :fg, :bg, :attr, :text, :update, :index, :list
+  def self.pair(fg, bg)
+    @p = [[]] if @p == nil
+    fg = fg.to_i; bg = bg.to_i
+    if @p.include?([fg,bg])
+      @p.index([fg,bg])
+    else
+      @p.push([fg,bg])
+      cp = @p.index([fg,bg])
+      init_pair(cp, fg, bg)
+      @p.index([fg,bg])
+    end
+  end
+  def clr # Clears the whole window
     self.setpos(0, 0)
     self.maxy.times {self.deleteln()}
     self.refresh
     self.setpos(0, 0)
   end
-  def fill # Fill window with color as set by :bg
+  def fill # Fill window with color as set by self.color (or self.bg if not set) 
+    self.setpos(0, 0)
+    self.fill_from_cur_pos
+  end
+  def fill_to_cur_pos # Fills the window up to current line
+    x = self.curx
+    y = self.cury
     self.setpos(0, 0)
     self.bg = 0 if self.bg   == nil
     self.fg = 255 if self.fg == nil
-    xor = self.fg ^ self.bg
-    init_pair(xor, self.fg, self.bg)
     blank = " " * self.maxx
-    self.maxy.times {self.attron(color_pair(xor)) {self << blank}}
+    cp = Curses::Window.pair(self.fg, self.bg)
+    y.times {self.attron(color_pair(cp)) {self << blank}}
     self.refresh
-    self.setpos(0, 0)
+    self.setpos(y, x)
   end
-  def write # Write context of :text to window with attributes :attr
-    self.bg   = 0 if self.bg   == nil
-    self.fg   = 255 if self.fg == nil
-    xor = self.fg ^ self.bg
-    init_pair(xor, self.fg, self.bg)
+  def fill_from_cur_pos # Fills the rest of the window from current line
+    x = self.curx
+    y = self.cury
+    self.setpos(y, 0)
+    self.bg = 0 if self.bg   == nil
+    self.fg = 255 if self.fg == nil
+    blank = " " * self.maxx
+    cp = Curses::Window.pair(self.fg, self.bg)
+    self.maxy.times {self.attron(color_pair(cp)) {self << blank}}
+    self.refresh
+    self.setpos(y, x)
+  end
+  def write
     self.attr = 0 if self.attr == nil
-    self.attron(color_pair(xor) | self.attr) { self << self.text }
+    self.bg = 0 if self.bg   == nil
+    self.fg = 255 if self.fg == nil
+    cp = Curses::Window.pair(self.fg, self.bg)
+    self.attron(color_pair(cp) | self.attr) { self << self.text }
     self.refresh
-    self.text = ""
   end
-  def p(fg, bg, attr, text)
-    init_pair(fg ^ bg, fg, bg)
-    self.attron(color_pair(fg ^ bg) | attr) { self << text }
+  def p(text) # Puts text to window
+    self.attr = 0 if self.attr == nil
+    self.bg = 0 if self.bg   == nil
+    self.fg = 255 if self.fg == nil
+    cp = Curses::Window.pair(self.fg, self.bg)
+    self.attron(color_pair(cp) | attr) { self << text }
+    self.refresh
+  end
+  def pa(fg = self.fg, bg = self.bg, attr = self.attr, text) # Puts text to window with full set of attributes
+    cp = Curses::Window.pair(fg, bg)
+    self.attron(color_pair(cp) | attr) { self << text }
     self.refresh
   end
+  def format_text(text) # Format text so that it linebreaks neatly inside window
+    return "\n" + text.gsub(/(.{1,#{self.maxx}})( +|$\n?)|(.{1,#{self.maxx}})/, "\\1\\3\n")
+  end
+  alias :puts :p
 end
 
 # GENERIC FUNCTIONS 
@@ -504,8 +551,10 @@ end
 
 # BASIC WINDOW FUNCTIONS 
 def w_t # SHOW INFO IN @w_t
+  @w_t.clr
   @movies ? @w_t.text  = " MOVIES ::  " : @w_t.text  = " SERIES ::  "
   @w_t.text += "Rating MIN: #{@rating} - Year MIN: #{@yearMin} - Year MAX: #{@yearMax} :: Selection = #{@imdbsel.size}"
+  @w_t.text += " " * (@w_t.maxx - @w_t.text.length) if @w_t.text.length < @w_t.maxx
   @w_t.write
 end
 def w_list(win) # LIST IN WINDOW
@@ -716,10 +765,11 @@ end
 loop do # OUTER LOOP - (catching refreshes via 'r')
   @break = false # Initialize @break variable (set if user hits 'r')
   begin # Create the windows/panels 
-    Curses.stdscr.bg = 234 # Use for borders
-    Curses.stdscr.fill
     maxx = Curses.cols
     maxy = Curses.lines
+    init_pair(255, 0, 234)
+    maxy.times {Curses.stdscr.attron(color_pair(255)) {Curses.stdscr << " " * maxx}}
+    Curses.stdscr.refresh
     # Curses::Window.new(       h,        w,        y,        x   )
     @w_t = Curses::Window.new( 1,        maxx,     0,           0 )
     @w_i = Curses::Window.new( maxy-2,   40,       1,           0 )
@@ -737,7 +787,6 @@ loop do # OUTER LOOP - (catching refreshes via 'r')
     @w_p.fg, @w_p.bg = Wpfg, WIbg
     @w_b.fg, @w_b.bg = Wbfg, Wbbg
     [@w_i, @w_g, @w_m, @w_n].each{|w| w.index = 0}
-    @w_b.fill
     @w_g.list   = @genres
     @w_b.update = true
     @w_d.update = true
@@ -754,7 +803,7 @@ loop do # OUTER LOOP - (catching refreshes via 'r')
         @search == '' ? @w_t.bg = WtSbg : @w_t.bg = WtSbgS
         @w_t.attr = Curses::A_BOLD
       end
-      @w_t.fill; @w_i.fill; @w_g.fill; @w_m.fill; @w_n.fill; @w_p.fill
+      @w_i.fill; @w_g.fill; @w_m.fill; @w_n.fill; @w_p.fill
       w_t; w_list(@w_i); w_list(@w_g); w_list(@w_m); w_list(@w_n)
       if @w_d.update
         @w_d.fill

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imdb-terminal
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-02 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -30,11 +30,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 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. New in 0.2: Added ''v''
-  to show version and RubyGem version. Code cleanup. 0.3: Major bug fix on listing'
+  to show version and RubyGem version. Code cleanup. 0.4: Adopted new curses extension
+  upgrade. Added gem dependency for rest-client'
 email: g@isene.com
 executables:
 - imdb