aniview 1.3.0 → 2.0.0

data/lib/aniview/view/delugemenu.rb

@@ -1,43 +1,47 @@
 require_relative 'menu'
-require_relative '../util/format'
-require_relative '../util/command'
-
-
-class DelugeMenu < Menu
-
-	def refresh
-		@items = @interface.makeHash @interface.send(@refresh_func)
-
-		@attributes = {
-			"t" => @attributes["t"],
-      "s" => @interface.getStatus
-		}
-
-		@expanded = -1 if @items.values[@expanded] == nil
-		fixCursor
-	end
-
-	def customControl(key, sel)
-
-    if @items != nil and @items.length > 0
-      item = @items.values[sel["out"]]
-    else
-      item = ""
+require_relative '../util/util'
+
+module Aniview
+  module View
+    class DelugeMenu < Menu
+      include Aniview::Util
+    
+    	def refresh
+    		@items = @interface.makeHash @interface.send(@refresh_function)
+    
+    		@attributes = {
+    			"t" => @attributes["t"],
+          "s" => @interface.getStatus
+    		}
+    
+    		@expanded = -1 if @items.values[@expanded] == nil
+    		fixCursor
+    	end
+    
+    	def customControl(key, sel)
+    
+        if @items != nil and @items.length > 0
+          item = @items.values[sel["out"]]
+        else
+          item = ""
+        end
+    
+    		if key == @pref.get("keybindings")["torrents_pause"]
+          @interface.toggleTorrent(item)
+        elsif key == @pref.get("keybindings")["torrents_remove"]
+          @interface.removeTorrent(item, false)
+        elsif key == @pref.get("keybindings")["torrents_remove_data"]
+          @interface.removeTorrent(item, true)
+    		elsif key == "enter"
+    
+        elsif key == "+"
+          newval = Util.readline(@term, "mag:", "")
+          @interface.addTorrent newval, Dir.home + "/downloads/"
+    
+    		end
+    	end
+    
     end
-
-		if key == @pref.get("keybindings")["torrents_pause"]
-      @interface.toggleTorrent(item)
-    elsif key == @pref.get("keybindings")["torrents_remove"]
-      @interface.removeTorrent(item, false)
-    elsif key == @pref.get("keybindings")["torrents_remove_data"]
-      @interface.removeTorrent(item, true)
-		elsif key == "enter"
-
-    elsif key == "+"
-      newval = Command.read(@term, "mag:", "")
-      @interface.addTorrent newval, Dir.home + "/downloads/"
-
-		end
-	end
-
+  end
 end
+    

data/lib/aniview/view/menu.rb

@@ -1,305 +1,300 @@
 require_relative 'color'
-require_relative '../util/alogger'
-require_relative '../util/format'
-
-class Menu
-
-  def initialize(refresh_function:,interface:,name:,pref:,format:,term:,children: true)
-    @term = term
-    @format = format
-    @attributes = {
-      "t" => name,
-    }
-    @pref = pref
-    @refresh_func = refresh_function
-    @interface = interface
-    @expanded = -1
-    @selected = 0
-    @children = children
-    @items_formatted = {}
-    @items_hash      = {}
-    @hashmap         = {}
-    @lu = 0
-
-    @oldRows = @term.rows
-    @logger = ALogger.new("/dev/null", true)
-
-    refresh
-    @lastcount = getLen
-
-    @view = [0, @term.rows - 3]
-
-  end
-
-  def setRfunc(name)
-    @refresh_func = name
-    @items_formatted = {}
-    @items_hash = {}
-    @lu = 0
-    refresh
-    refreshFormats
-  end
-
-  def change_screen_size
-    #@term.rows = lines
-    #@term.cols = cols
-    @items_formatted = {}
-    @items_hash = {}
-    @lu = 0
-    refresh
-    
-    #if @term.rows > @oldRows
-
-    diff = @term.rows - @oldRows
-    #@view[0] += diff
-    @view[1] += diff
-
-    @oldRows = @term.rows
-    adjustView
-    draw
-  end
-
-  def setName(name)
-    @attributes["t"] = name
-  end
-
-  def setFormat(format_)
-    @format = format_
-  end
-
-  def refresh
-    @items = @interface.makeHash @interface.send(@refresh_func)
-    @expanded = -1 if @items.values[@expanded] == nil
-    fixCursor
-  end
-
-  def expand(i)
-    return if i > @items.length
-    if @expanded == i
-      @selected = @expanded
-      @expanded = -1
-    else
-      @selected = i
-      @expanded = i
-    end
-    fixCursor
-    adjustView
-  end
-  
-  def resolveSelected(resolve_me=@selected)
-    in_expanded=false
-    inside = 0
-    outside = resolve_me
-    if @expanded > -1
-      if resolve_me > @expanded and resolve_me <= (@items.values[@expanded].length + @expanded)
-        outside = @expanded
-        inside = resolve_me - @expanded -  1
-        in_expanded=true
-      elsif resolve_me > @expanded
-        outside = resolve_me - @items.values[@expanded].length
+require_relative '../util/util'
+
+module Aniview
+  module View
+    class Menu
+      include Aniview::Util
+      def initialize(refresh_function:,interface:,name:,pref:,format:,term:,children: true)
+        @attributes       = {}
+
+        @refresh_function = refresh_function
+        @interface        = interface
+        setName name
+        @pref             = pref
+        @format           = format
+        @term             = term
+        @children         = children
+        
+        @expanded         = -1
+        @selected         = 0
+
+        @items_formatted  = {}
+        @items_hash       = {}
+        @hashmap          = {}
+        @lu               = 0
+    
+        @oldRows          = @term.rows
+    
+        refresh
+    
+        @view             = [0, @term.rows - 3]
+    
       end
-    end
-
-    return Hash["out" => outside, "in" => inside, "in_expanded" => in_expanded]
-  end
-
-  def moveCursor(dir)
-    @selected -= 1 if dir == "up"
-    @selected += 1 if dir == "down"
-    adjustView
-    fixCursor
-  end
-
-  def fixCursor
-    #wrap selector
-    #@selected = getLen - 1 if @selected < 0
-    #@selected = 0 if @selected >= getLen
-    #
-    #nowrap
-    @selected = 0 if @selected < 0
-    @selected = getLen - 1 if @selected >= getLen
-  end
-
-  def getLen
-    len = @items.length
-    len += @items.values[@expanded].length if @expanded >= 0
-    return len
-  end
-
-  def color(index)
-    if index == @selected
-      return Color.public_send(@pref.get("clr")["selected"])
-    else 
-      return Color.public_send(@pref.get("clr")["secondary"])
-    end
-  end
-
-  def refreshFormats
-    now = Integer(DateTime.now.strftime('%Q'))
-    return if now - @lu < 100
-    @lu = now
-
-    @cl = {
-      "s" => Color.public_send(@pref.get("clr")["selected"]),
-      "1" => Color.public_send(@pref.get("clr")["primary"]),
-      "2" => Color.public_send(@pref.get("clr")["secondary"]),
-      "m" => Color.public_send(@pref.get("clr")["main"]),
-    }
-
-    #@items_formatted = {}
-    new_items_formatted = {}
-    new_items_hash      = {}
-    new_hashmap         = {}
-    @items.each_with_index { |item, i|
-
-      #@l.log @items.keys[i]
-      #
-      babble = item[0].cereal #Digest::SHA256.bubblebabble String(item[0])
-
-      if @items_hash.key? babble
-        val = @items_hash[babble]
-        new_items_hash.merge!(babble => val)
-        new_items_formatted.merge!(@hashmap[babble] => @items_formatted[@hashmap[babble]])
-        new_hashmap.merge!(babble => @hashmap[babble])
-        next
+    
+      def setRfunc(new_method)
+        @refresh_function = new_method
+        @items_formatted = {}
+        @items_hash = {}
+        @lu = 0
+        refresh
+        refreshFormats
+      end
+    
+      def change_screen_size
+        #@term.rows = lines
+        #@term.cols = cols
+        @items_formatted = {}
+        @items_hash = {}
+        @lu = 0
+        refresh
+        
+        #if @term.rows > @oldRows
+    
+        diff = @term.rows - @oldRows
+        #@view[0] += diff
+        @view[1] += diff
+    
+        @oldRows = @term.rows
+        adjustView
+        draw
+      end
+    
+      def setName(name)
+        @attributes["t"] = name
+      end
+    
+      def setFormat(format_)
+        @format = format_
+      end
+    
+      def refresh
+        @items = @interface.makeHash @interface.send(@refresh_function)
+        @expanded = -1 if @items.values[@expanded] == nil
+        fixCursor
+      end
+    
+      def expand(i)
+        return if i > @items.length
+        if @expanded == i
+          @selected = @expanded
+          @expanded = -1
+        else
+          @selected = i
+          @expanded = i
+        end
+        fixCursor
+        adjustView
       end
-
-      parent = Format.parse_format(
-        @pref.get(@format)["parent"],
-        item[0].attributes,
-        @term.cols
-      )
-      
-      children = []
-      children_hash = []
       
-      if @children
-        item[1].each { |subitem|
-
-          child_babble = subitem.cereal
-
-          if @items_hash.key? child_babble
+      def resolveSelected(resolve_me=@selected)
+        in_expanded=false
+        inside = 0
+        outside = resolve_me
+        if @expanded > -1
+          if resolve_me > @expanded and resolve_me <= (@items.values[@expanded].length + @expanded)
+            outside = @expanded
+            inside = resolve_me - @expanded -  1
+            in_expanded=true
+          elsif resolve_me > @expanded
+            outside = resolve_me - @items.values[@expanded].length
+          end
+        end
+    
+        return Hash["out" => outside, "in" => inside, "in_expanded" => in_expanded]
+      end
+    
+      def moveCursor(dir)
+        @selected -= 1 if dir == "up"
+        @selected += 1 if dir == "down"
+        adjustView
+        fixCursor
+      end
+    
+      def fixCursor
+        #wrap selector
+        #@selected = getLen - 1 if @selected < 0
+        #@selected = 0 if @selected >= getLen
+        #
+        #nowrap
+        @selected = 0 if @selected < 0
+        @selected = getLen - 1 if @selected >= getLen
+      end
+    
+      def getLen
+        len = @items.length
+        len += @items.values[@expanded].length if @expanded >= 0
+        return len
+      end
+    
+      def color(index)
+        if index == @selected
+          return Aniview::View::Color.public_send(@pref.get("clr")["selected"])
+        else 
+          return Aniview::View::Color.public_send(@pref.get("clr")["secondary"])
+        end
+      end
+    
+      def refreshFormats
+        now = Integer(DateTime.now.strftime('%Q'))
+        return if now - @lu < 100
+        @lu = now
+    
+        @cl = {
+          "s" => Aniview::View::Color.public_send(@pref.get("clr")["selected"]),
+          "1" => Aniview::View::Color.public_send(@pref.get("clr")["primary"]),
+          "2" => Aniview::View::Color.public_send(@pref.get("clr")["secondary"]),
+          "m" => Aniview::View::Color.public_send(@pref.get("clr")["main"]),
+        }
+    
+        #@items_formatted = {}
+        new_items_formatted = {}
+        new_items_hash      = {}
+        new_hashmap         = {}
+        @items.each_with_index { |item, i|
+    
+          #@l.log @items.keys[i]
+          #
+          babble = item[0].cereal #Digest::SHA256.bubblebabble String(item[0])
+    
+          if @items_hash.key? babble
             val = @items_hash[babble]
-            new_items_hash.merge!(child_babble => val)
-            children<<@hashmap[babble]
+            new_items_hash.merge!(babble => val)
+            new_items_formatted.merge!(@hashmap[babble] => @items_formatted[@hashmap[babble]])
             new_hashmap.merge!(babble => @hashmap[babble])
             next
           end
-
-          children << Format.parse_format(
-            @pref.get(@format)["child"],
-            subitem.attributes,
+    
+          parent = Util.parse_format(
+            @pref.get(@format)["parent"],
+            item[0].attributes,
             @term.cols
           )
-          children_hash << subitem.hash
-
+          
+          children = []
+          children_hash = []
+          
+          if @children
+            item[1].each { |subitem|
+    
+              child_babble = subitem.cereal
+    
+              if @items_hash.key? child_babble
+                val = @items_hash[babble]
+                new_items_hash.merge!(child_babble => val)
+                children<<@hashmap[babble]
+                new_hashmap.merge!(babble => @hashmap[babble])
+                next
+              end
+    
+              children << Util.parse_format(
+                @pref.get(@format)["child"],
+                subitem.attributes,
+                @term.cols
+              )
+              children_hash << subitem.hash
+    
+            }
+          end
+    
+          new_items_hash.merge!(babble => children_hash)
+          new_items_formatted.merge!(parent => children)
+          new_hashmap.merge!(babble => parent)
         }
+    
+        @items_formatted = new_items_formatted
+        @items_hash      = new_items_hash
+        @hashmap         = new_hashmap
+    
+        @title_formatted = Util.parse_format(
+          @pref.get(@format)["title"],
+          @attributes,
+          @term.cols
+        )
       end
-
-      new_items_hash.merge!(babble => children_hash)
-      new_items_formatted.merge!(parent => children)
-      new_hashmap.merge!(babble => parent)
-    }
-
-    @items_formatted = new_items_formatted
-    @items_hash      = new_items_hash
-    @hashmap         = new_hashmap
-
-    @title_formatted = Format.parse_format(
-      @pref.get(@format)["title"],
-      @attributes,
-      @term.cols
-    )
-  end
-
-  def adjustView
-    buffer = 2
-    bottom = @term.rows-3
-
-    diff = 0
-    #@logger.log("pre first loop: #{@selected}, #{buffer}, #{@view}")
-    if @selected < @view[0] + buffer #and @selected > buffer
-      while @selected < @view[0] + buffer
-        @view[0]-=1
-        @view[1]-=1
-        @logger.log("first loop: #{@selected}, #{@view}")
+    
+      def adjustView
+        buffer = 2
+        bottom = @term.rows-3
+    
+        diff = 0
+        if @selected < @view[0] + buffer #and @selected > buffer
+          while @selected < @view[0] + buffer
+            @view[0]-=1
+            @view[1]-=1
+          end
+        elsif @selected > @view[1] - (buffer+1) and @selected < getLen - buffer
+          while @selected > @view[1] - (buffer+1) and @selected < getLen - buffer
+            @view[0]+=1
+            @view[1]+=1
+          end
+        end
+    
+        diff = 0      - @view[0] if @view[0] < 0
+        diff = bottom - @view[1] if @view[1] < bottom
+    
+        @view[0] += diff
+        @view[1] += diff
       end
-    elsif @selected > @view[1] - (buffer+1) and @selected < getLen - buffer
-      @logger.log("")
-      while @selected > @view[1] - (buffer+1) and @selected < getLen - buffer
-        @logger.log("second loop: #{@selected}, #{@view}")
-        @view[0]+=1
-        @view[1]+=1
-        @logger.log("-----------: #{@selected}, #{@view}")
+    
+      def draw
+        refreshFormats
+        drawFrom(@view[0], @view[1])
       end
-    end
-
-    @logger.log("#{@selected}, #{@view}")
-
-    diff = 0      - @view[0] if @view[0] < 0
-    diff = bottom - @view[1] if @view[1] < bottom
-
-    @view[0] += diff
-    @view[1] += diff
-  end
-
-  def draw
-    refreshFormats
-    drawFrom(@view[0], @view[1])
-  end
-
-  def drawFrom(line_on, lines_to_draw)
-    #print menu header
-    lo="\e[1;1H"
-    print lo + @cl["m"] + @title_formatted + "\e[K"
-
-    resolved_start_position = resolveSelected line_on
-
-    outer_index = resolved_start_position["out"]
-    inner_index = resolved_start_position["in"]
     
-    if resolved_start_position["in_expanded"]
-      outer_index+=1
-    end
-
-    offset=line_on-1
-
-    while line_on < lines_to_draw
-      
-      in_outer_region    = ! (line_on >= getLen)
-      in_expanded_region = resolveSelected(line_on)["in_expanded"]
-      line               = line_on-offset+1
-      selected           = line_on == @selected
-
-      cl  = ""
-      cl = @cl["s"] if selected
-      lo = "\e[#{line};1H" + cl
-
-      if in_expanded_region and @children
-        print @cl["2"] + lo + String(@items_formatted.values[@expanded][inner_index]) + "\e[K" unless @items_formatted.values[@expanded] == nil
-        inner_index+=1
-      elsif in_outer_region
-        print @cl["1"] + lo + String(@items_formatted.keys[outer_index]) + "\e[K"
-        outer_index+=1
-      else
-        print "\e[#{line};1H\e[2K\n"
+      def drawFrom(line_on, lines_to_draw)
+        #print menu header
+        lo="\e[1;1H"
+        print lo + @cl["m"] + @title_formatted + "\e[K"
+    
+        resolved_start_position = resolveSelected line_on
+    
+        outer_index = resolved_start_position["out"]
+        inner_index = resolved_start_position["in"]
+        
+        if resolved_start_position["in_expanded"]
+          outer_index+=1
+        end
+    
+        offset=line_on-1
+    
+        while line_on < lines_to_draw
+          
+          in_outer_region    = ! (line_on >= getLen)
+          in_expanded_region = resolveSelected(line_on)["in_expanded"]
+          line               = line_on-offset+1
+          selected           = line_on == @selected
+    
+          cl  = ""
+          cl = @cl["s"] if selected
+          lo = "\e[#{line};1H" + cl
+    
+          if in_expanded_region and @children
+            print @cl["2"] + lo + String(@items_formatted.values[@expanded][inner_index]) + "\e[K" unless @items_formatted.values[@expanded] == nil
+            inner_index+=1
+          elsif in_outer_region
+            print @cl["1"] + lo + String(@items_formatted.keys[outer_index]) + "\e[K"
+            outer_index+=1
+          else
+            print "\e[#{line};1H\e[2K\n"
+          end
+    
+          line_on+=1
+        end
       end
-
-      line_on+=1
-    end
-  end
-
-  def control(key)
-    sel = resolveSelected
-    if key == @pref.get("keybindings")["menu_nav_up"]
-      moveCursor("up")
-    elsif key == @pref.get("keybindings")["menu_nav_down"]
-      moveCursor("down")
-    else
-      customControl(key, sel)
+    
+      def control(key)
+        sel = resolveSelected
+        if key == @pref.get("keybindings")["menu_nav_up"]
+          moveCursor("up")
+        elsif key == @pref.get("keybindings")["menu_nav_down"]
+          moveCursor("down")
+        else
+          customControl(key, sel)
+        end
+      end
+    
+      def customControl(key, sel); end
     end
   end
-
-  def customControl(key, sel); end
-
 end