aniview 1.3.0 → 2.0.0

data/lib/aniview/util/term.rb

@@ -1,37 +1,40 @@
-class Term
-
-	def initialize
-		@tput=Hash[
-			"smcup" => %x(tput smcup),
-			"rmcup" => %x(tput rmcup),
-			"civis" => %x(tput civis),
-			"cnorm" => %x(tput cnorm),
-			"el1" => "\e[2K",
-			"bold" => %x(tput bold),
-			"nobold" => %x(tput sgr0),
-		]
-	end
-
-	def save;        print @tput["smcup"]; return self; end
-	def restore;     print @tput["rmcup"]; return self; end
-	def hide_cursor; print @tput["civis"]; return self; end
-	def show_cursor; print @tput["cnorm"]; return self; end
-	def clear_line;  print @tput["el1"];   return self; end
-	def echo_off;    %x(stty -echo);       return self; end
-	def echo_on;     %x(stty echo);        return self; end
-	def clear;       print "\033[2J"; return self; end
-	def bold;         print @tput["bold"];   return self; end
-	def nobold;       print @tput["nobold"]; return self; end
-
-	def cols;        return HighLine::SystemExtensions.terminal_size[0]; end
-	def rows;        return HighLine::SystemExtensions.terminal_size[1]; end
-
-	def getKey
-		return STDIN.getch.gsub("\r", "enter").gsub(" ", "space").gsub("A", "up").gsub("B", "down").gsub("C", "right").gsub("D", "left").gsub("\e", "skip").gsub("[", "skip")
-	end
-
-	def reset
-		self.restore.show_cursor.echo_on
-	end
-
+module Aniview
+  module Util
+    class Term
+    	def initialize
+    		@tput=Hash[
+    			"smcup" => %x(tput smcup),
+    			"rmcup" => %x(tput rmcup),
+    			"civis" => %x(tput civis),
+    			"cnorm" => %x(tput cnorm),
+    			"el1" => "\e[2K",
+    			"bold" => %x(tput bold),
+    			"nobold" => %x(tput sgr0),
+    		]
+    	end
+    
+    	def save;        print @tput["smcup"];  return self; end
+    	def restore;     print @tput["rmcup"];  return self; end
+    	def hide_cursor; print @tput["civis"];  return self; end
+    	def show_cursor; print @tput["cnorm"];  return self; end
+    	def clear_line;  print @tput["el1"];    return self; end
+    	def echo_off;    %x(stty -echo);        return self; end
+    	def echo_on;     %x(stty echo);         return self; end
+    	def clear;       print "\033[2J";       return self; end
+    	def bold;        print @tput["bold"];   return self; end
+    	def nobold;      print @tput["nobold"]; return self; end
+    
+    	def cols;        return HighLine::SystemExtensions.terminal_size[0]; end
+    	def rows;        return HighLine::SystemExtensions.terminal_size[1]; end
+    
+    	def getKey
+    		return STDIN.getch.gsub("\r", "enter").gsub(" ", "space").gsub("A", "up").gsub("B", "down").gsub("C", "right").gsub("D", "left").gsub("\e", "skip").gsub("[", "skip")
+    	end
+    
+    	def reset
+    		self.restore.show_cursor.echo_on
+    	end
+    
+    end
+  end
 end

data/lib/aniview/util/util.rb

@@ -0,0 +1,149 @@
+require 'base64'
+require 'readline'
+
+module Aniview
+  module Util
+    def self.readline(term, prompt = "", default = "")
+      term.bold.echo_on
+      print "\033[" + String(term.rows) + ";1H" + Aniview::View::Color.white
+      term.show_cursor
+      Readline.completion_append_character = ""
+      Readline.pre_input_hook = -> do
+        Readline.insert_text default
+        Readline.redisplay
+        Readline.pre_input_hook = nil
+      end
+      input = Readline.readline(prompt, false)
+      term.hide_cursor.nobold.echo_off.clear
+      return input
+    end
+
+    def self.format_duration v
+      hours = Integer((v-(v%3600))/3600)
+      minutes = Integer( ((v-(v%60))/60) - (hours * 60))
+      seconds = Integer(v%60)
+      seconds = "0" + String(seconds) if seconds < 10
+      if hours < 1 and minutes < 1
+        "0:#{seconds}"
+      else
+        if hours < 1
+          return "#{String(minutes)}:#{String(seconds)}"
+        else
+          minutes = "0" + String(minutes) if minutes < 10
+          return "#{String(hours)}:#{String(minutes)}:#{String(seconds)}"
+        end
+      end
+    end
+    
+    def self.format_size s
+      fs = Float(s)
+  
+      bytecount = {
+        "TB" => 1000000000000.0,
+        "GB" => 1000000000.0,
+        "MB" => 1000000.0,
+        "KB" => 1000.0,
+        "B"  => 1.0,
+      }
+      r = "TB"
+      r = "GB" if s < bytecount["TB"]
+      r = "MB" if s < bytecount["GB"]
+      r = "KB" if s < bytecount["KB"]
+  
+      return String( Float(fs/bytecount[r] * 10.0 ).round / 10.0 ) + r
+    end
+  
+    def self.format_progress p
+      return "#{Integer(p)}.#{Integer(p * 10.0) % 10}"
+    end
+  
+    def self.parse_format string, d, cols
+      le = "\e[K\n"
+  
+      pstr = []
+      add_to = ""
+      buffer_char = []
+  
+      mode = "char"
+  
+      padding_collected = 0
+  
+      string.split('').each { |c|
+  
+        if mode == "e"
+          add_to += String(c)
+          mode = "char"
+        
+        elsif c == '%'
+          mode = "%"
+        
+        elsif c == '$'
+          mode = "$"
+        
+        elsif c == '@'
+          pstr << add_to
+          add_to = ""
+          mode = "@"
+        
+        elsif c == "#"
+          padding_collected += 1
+        
+        elsif c == "\\"
+          mode = "e"
+        
+        elsif mode == "@"
+          buffer_char << c
+          mode = "char"
+        
+        elsif mode == "%"
+          addstr = ""
+          addstr = String(d[c]) if d.key?(c)
+          ol = addstr.length
+          addstr = " " + addstr while addstr.length < (ol + padding_collected)
+          add_to += addstr
+          mode = "char"
+  
+        else
+          add_to += c
+        
+        end
+      }
+      pstr << add_to
+  
+      buffer_char << " " if buffer_char.length == 0
+  
+      midstr = ""
+      tl = 0
+      pstr.each{ |s| tl += s.length }
+      buffer_space = 0
+      buffer_space = (cols - tl) / (pstr.length - 1) if pstr.length > 1
+  
+      addl_space = (cols - tl) % pstr.length
+  
+      pstr.each_with_index{ |str, i|
+        break if i == pstr.length - 1
+        buffer_ = ""
+        buffer_ = buffer_char[i] * buffer_space if buffer_space >= 0
+  
+        midstr += str + buffer_
+      }
+      midstr += pstr[pstr.length - 1]
+  
+      return midstr[0..cols-1]
+    end
+
+    def self.encode_object d
+      Base64.strict_encode64(Marshal.dump d)
+    end
+  
+    def self.decode_object e
+      begin
+        Marshal.load(Base64.decode64(e))
+      rescue ArgumentError
+        {}
+      rescue TypeError
+        {}
+      end
+    end
+  end
+end

data/lib/aniview/view/aiomenu.rb

@@ -1,66 +1,71 @@
 require_relative 'menu'
-require_relative '../util/format'
+require_relative '../util/util'
 
-class AioMenu < Menu
-
-	def setmal malanime
-		@malanime = malanime
-	end
-
-	def refresh
-		@items = @interface.makeHash @interface.send(@refresh_func)
-
-		@attributes = {
-			"t" => @attributes["t"],
-			"D" => Format.format_duration(getDuration),
-			"S" => Format.format_size(getSize)
-		}
-
-		@expanded = -1 if @items.values[@expanded] == nil
-		fixCursor
-	end
-
-	def getDuration
-		dur = 0
-		@items.each{ |child| 
-			dur += child[0].attributes["d"]
-		}
-		return dur
-	end
-	
-	def getSize
-		size = 0
-		@items.each{ |child| 
-			size += child[0].attributes["s"]
-		}
-		return size
-	end
-
-	def customControl(key, sel)
-		path = @items.values[sel["out"]][sel["in"]].path
-
-		if key == @pref.get("keybindings")["menu_nav_expand"]
-			expand(sel["out"])
-		elsif key == "r"
-			refresh
-		elsif key == "enter"
-			
-			@interface.watch(@items.values[sel["out"]][sel["in"]])
-			#@interface.addWatched(path)
-			@interface.logWatched(path)
-
-			#@malanime.update(path)
-			
-			refresh
-		elsif key == @pref.get("keybindings")["anime_set_watched"]
-			@interface.addWatched(path)
-			refresh
-		elsif key == @pref.get("keybindings")["anime_undo_set_watched"]
-			@interface.rmWatched()
-			refresh
-		elsif key == @pref.get("keybindings")["anime_set_unwatched"]
-			@interface.rmWatched(path)
-				
-		end
-	end
+module Aniview
+  module View
+    class AioMenu < Menu
+      include Aniview::Util
+    	def setmal malanime
+    		@malanime = malanime
+    	end
+    
+    	def refresh
+    		@items = @interface.makeHash @interface.send(@refresh_function)
+    
+    		@attributes = {
+    			"t" => @attributes["t"],
+    			"D" => Util.format_duration(getDuration),
+    			"S" => Util.format_size(getSize)
+    		}
+    
+    		@expanded = -1 if @items.values[@expanded] == nil
+    		fixCursor
+    	end
+    
+    	def getDuration
+    		dur = 0
+    		@items.each{ |child| 
+    			dur += child[0].attributes["d"]
+    		}
+    		return dur
+    	end
+    	
+    	def getSize
+    		size = 0
+    		@items.each{ |child| 
+    			size += child[0].attributes["s"]
+    		}
+    		return size
+    	end
+    
+    	def customControl(key, sel)
+    		path = @items.values[sel["out"]][sel["in"]].path
+    
+    		if key == @pref.get("keybindings")["menu_nav_expand"]
+    			expand(sel["out"])
+    		elsif key == "r"
+    			refresh
+    		elsif key == "enter"
+    			
+    			@interface.watch(@items.values[sel["out"]][sel["in"]])
+    			#@interface.addWatched(path)
+    			@interface.logWatched(path)
+    
+    			#@malanime.update(path)
+    			
+    			refresh
+    		elsif key == @pref.get("keybindings")["anime_set_watched"]
+    			@interface.addWatched(path)
+    			refresh
+    		elsif key == @pref.get("keybindings")["anime_undo_set_watched"]
+    			@interface.rmWatched()
+    			refresh
+    		elsif key == @pref.get("keybindings")["anime_set_unwatched"]
+    			@interface.rmWatched(path)
+    				
+    		end
+    	end
+    end
+  end
 end
+

data/lib/aniview/view/color.rb

@@ -1,67 +1,69 @@
-class Color
-
-  def self.black
-    "\e[30m"
-  end
-  
-  def self.red
-    "\e[31m"
-  end
-  
-  def self.green
-    "\e[32m"
-  end
-  
-  def self.yellow
-    "\e[33m"
-  end
-  
-  def self.blue
-    "\e[34m"
-  end
-  
-  def self.magenta
-    "\e[35m"
-  end
-  
-  def self.cyan
-    "\e[36m"
-  end
-  
-  def self.white
-    "\e[37m"
-  end
-  
-  def self.bright_black
-    "\e[37m"
-  end
-  
-  def self.bright_red
-    "\e[38m"
-  end
-  
-  def self.bright_green
-    "\e[39m"
-  end
-  
-  def self.bright_yellow
-    "\e[40m"
-  end
-  
-  def self.bright_blue
-    "\e[41m"
-  end
-  
-  def self.bright_magenta
-    "\e[42m"
-  end
-  
-  def self.bright_cyan
-    "\e[43m"
-  end
-  
-  def self.bright_white
-    "\e[44m"
-  end
-
-end
+module Aniview
+  module View
+    module Color
+      def self.black
+        "\e[30m"
+      end
+      
+      def self.red
+        "\e[31m"
+      end
+      
+      def self.green
+        "\e[32m"
+      end
+      
+      def self.yellow
+        "\e[33m"
+      end
+      
+      def self.blue
+        "\e[34m"
+      end
+      
+      def self.magenta
+        "\e[35m"
+      end
+      
+      def self.cyan
+        "\e[36m"
+      end
+      
+      def self.white
+        "\e[37m"
+      end
+      
+      def self.bright_black
+        "\e[37m"
+      end
+      
+      def self.bright_red
+        "\e[38m"
+      end
+      
+      def self.bright_green
+        "\e[39m"
+      end
+      
+      def self.bright_yellow
+        "\e[40m"
+      end
+      
+      def self.bright_blue
+        "\e[41m"
+      end
+      
+      def self.bright_magenta
+        "\e[42m"
+      end
+      
+      def self.bright_cyan
+        "\e[43m"
+      end
+      
+      def self.bright_white
+        "\e[44m"
+      end
+    end
+  end
+end