aniview 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 827d5b9084b305647f640fd4cf3ba14ce15bcea5
-  data.tar.gz: 3e10b4ccf9d9f02cfee4260921eb7f22ae097339
+  metadata.gz: 0ea930584ab074643f3257cfb4ead82380d28a8e
+  data.tar.gz: dd51a52724248c507c8fcf171181ed73aa30acd0
 SHA512:
-  metadata.gz: 69a1e2a4ba2c11f38811bb5eb951993f5ea41228796c77f397a9292c2f053993f653b8ecbe614df7c41a9fe3d3a88c481bc8379e73340d0ea580166974c57206
-  data.tar.gz: 6195b01dcd02520fb7119c4b690f2266c0459ea603b96c6eaea03ab9e6aa352314800cac6b6f3052f846306886a409b7772fa0d6534ae2d29f7ad18ff73dbb97
+  metadata.gz: 337ae5115ba6619e0e526e8ef7d8dfc424671c36c8698d4e5b39dddb24fd6f873b715c8c383805e21d48f4cd33fc4d1ab9b7ba4cae0e16c4bf1cec8e95c813fe
+  data.tar.gz: 657aee82a1a6ac61017368fd4d5238813535a25dcfe36d0c7326be23883188e58b1811786bfa06ce5124d0ac885c082ea84efbbaaff70eb35fa4f34afc44222c

data/README.md

@@ -7,6 +7,6 @@ command line anime library viewer
 ### using rubygems
 `gem install aniview`
 
-### Find out more on the wiki
-+ [Default Keybingings](https://github.com/annacrombie/aniview/wiki/Default-Keybindings)
-+ [Format Strings](https://github.com/annacrombie/aniview/wiki/Format-Strings)
+## documentation
++ [rubydoc.info](http://www.rubydoc.info/gems/aniview/)
++ [wiki](https://github.com/annacrombie/aniview/wiki/)

data/lib/aniview/interface/animeio/animefile.rb

@@ -14,7 +14,7 @@ module Aniview
       attr_accessor :accessible
       attr_accessor :path
 
-      def initialize(path_, seen = false)
+      def initialize(path_, seen: false, watched_on: 0)
         @watched    = seen
         @accessible = true
         begin
@@ -22,7 +22,7 @@ module Aniview
         rescue Errno::ENOENT
           @last_modified = "0"
         end
-        @watched_on = 0
+        @watched_on = watched_on
         @path       = path_
 
         @attr = {
@@ -37,6 +37,7 @@ module Aniview
           "l" => "",
           "f" => "",
           "b" => "",
+          "w" => seen? ? "x" : " "
         }
     
         if (@path == "empty")
@@ -55,15 +56,15 @@ module Aniview
             "l" => mov.colorspace,
             "f" => mov.frame_rate,
             "b" => String(mov.bitrate) + "kb/s",
+            "w" => seen? ? "x" : " "
           }
         end
-    
       end
 
       def title
         return @attr["t"]
       end
-    
+
       def seen?
         return @watched
       end
@@ -75,10 +76,12 @@ module Aniview
       def watch
         @watched = true
         @watched_on = DateTime.now.strftime('%Q')
+        @attr["w"] = "x"
       end
     
       def unwatch
         @watched = false
+        @attr["w"] = " "
       end
       
       def string

data/lib/aniview/interface/animeio/animeio.rb

@@ -7,6 +7,7 @@ require 'benchmark'
 require_relative 'animefile'
 require_relative 'animeseries'
 require_relative '../../util/util'
+require_relative '../../util/folder_listen'
 require_relative '../bridge'
 
 module Aniview
@@ -27,24 +28,34 @@ module Aniview
         @made_changes      = true
 
         self.load
-        pref_changed!
-        relisten
+        pref_changed!(verbose: false)
+        #relisten
 
         @pref.add_observer(self, :pref_changed!)
         @mpvbridge.add_observer(self, :animefile_changed!)
         #@@local_anime.each { |key, obj| obj.add_observer(self, :animefile_changed!)}
       end
 
+      def listen_to_all_dirs
+        #listen to all
+        all_dirs = (@pref.get("anime_locations").split(":")).map { |dir| @pref.parseDir(dir) }
+        @folder_listener = FolderListen.to(all_dirs) { index_anime }
+        @folder_listener.start
+      end
+
       def relisten
-        @listener.stop unless @listener == nil
-        return if @anime_dirs == nil or @anime_dirs[0] == ""
-        @listener = Listen.to(*@anime_dirs, only: /\.mkv$/) do |modified, added, removed|
-          index_anime
-        end
+        cleanup
+
+        listen_to_all_dirs
+
+        return if @anime_dirs == nil or @anime_dirs[0] == "" or @anime_dirs.length == 0
+
+        @listener = Listen.to(*@anime_dirs, only: /\.mkv$/) { index_anime }
         @listener.start
       end
 
       def cleanup
+        @folder_listener.stop unless @folder_listener == nil
         @listener.stop unless @listener == nil
       end
     
@@ -66,23 +77,24 @@ module Aniview
         end
       end
 
-      def pref_changed!
+      def pref_changed!(verbose: true)
         new_dirs = (@pref.get("anime_locations").split(":")).collect { |dir|
-          @pref.parseDir(dir)
-        }
+          parsed_dir = @pref.parseDir(dir)
+          parsed_dir if File.exist?(parsed_dir)
+        }.compact
         if new_dirs != @anime_dirs
           @anime_dirs = new_dirs
-          index_anime
+          index_anime(verbose: verbose)
           relisten
         end
       end
 
       def animefile_changed!
-        return unless @mpvbridge.what_changed == "local_anime"
+        return unless @mpvbridge.what_changed[:local_anime]
+        save
         changed
         notify_observers
       end
-    
 
       ##
       ## @brief      Indexes anime files up to 1 level deep in specified anime directories
@@ -92,24 +104,36 @@ module Aniview
       ##
       ## @return     { description_of_the_return_value }
       ##
-      def index_anime(force: false, verbose: false)
+      def index_anime(force: false, verbose: true, very_verbose: false)
+        puts "Indexing anime" if very_verbose
         Thread.new {
           ret = {}
           made_changes = false
           lal = @@local_anime.length
 
-          @anime_dirs.each { |dir|
+          @anime_dirs.each_with_index { |dir, i|
+
+            avs_file = dir + "/.avs"
+
+            if File.exist?(avs_file)
+              puts "found avs_data" if very_verbose
+              avs_data = JSON.parse(File.open(avs_file, "r") { |f| f.read })
+            else
+              puts "no avs_data" if very_verbose
+              avs_data = {}
+            end
+
 
             # check if the directory exists
-            if not File.exist? dir 
-              if @dir_last_modified[dir] != "check"
+            unless File.exist? dir 
+              unless @dir_last_modified[dir] == "check"
                 @dir_last_modified[dir] = "check"
                 made_changes = true
               end
               next
             end
 
-            puts "checking #{dir}" if verbose
+            puts "checking #{dir}" if very_verbose
 
             # skip indexing a directory if it hasn't been modified since the last
             # check (disabled because doesn't save to much time)
@@ -129,15 +153,37 @@ module Aniview
             # get all files in the directory and in all subfolders of the directory
             files = Dir.glob("#{dir}*/*.{mkv,avi,mp4}") + Dir.glob("#{dir}/*.{mkv,avi,mp4}")
 
-            files.each { |file|
-              print "indexing #{file} -> " if verbose
-              seen_this = false
+            files.each_with_index { |file, j|
+              if verbose
+                pct = Util.format_progress ((j + 1) / Float(files.length)) * ( (i + 1) / Float(@anime_dirs.length)) * 100
+                Util.error_message("#{pct}% #{File.basename(file)}") 
+              end
+
+              print "indexing #{file} -> " if very_verbose
+              params = {:seen => false, :watched_on => 0}
+
+              #check if this anime has a stored watched value
+              if avs_data.key?(file)
+                puts "found stored data for this file" if very_verbose
+                params = {
+                  :seen => avs_data[file]["seen"],
+                  :watched_on => avs_data[file]["watched_on"]
+                }
+                puts params if very_verbose
+              else
+                puts "no data on this file" if very_verbose
+                avs_data.merge!({file => params})
+              end
 
               # we have already indexed this file
               if @@local_anime != nil and @@local_anime.key?(file)
                 
+                puts "this file is in the index" if very_verbose
+
                 # get its seen data
-                seen_this = @@local_anime[file].seen?
+                params[:seen]       = @@local_anime[file].seen?
+                params[:watched_on] = @@local_anime[file].seenOn
+                puts params if very_verbose
                 # get its last modifed data
                 last_modified = File::Stat.new(file).mtime
                 # get wether or not it is accessible
@@ -146,7 +192,7 @@ module Aniview
                 # if we arent forcing or the anime hasn't been modified since the
                 # last check, skip it
                 if not force or last_modified == @@local_anime[file].last_modified
-                  puts "unchanged" if verbose
+                  puts "unchanged" if very_verbose
                   ret.merge!(file => @@local_anime[file])
                   next
                 end
@@ -159,12 +205,15 @@ module Aniview
 
               # this is the anime file we are adding
               ret.merge!(
-                file => AnimeFile.new(
-                  file,
-                  seen_this
-                )
+                file => AnimeFile.new(file, params)
               )
             }
+
+            mavsf = @pref.get("avs_files")["create?"]
+            oimfs = @pref.get("avs_files")["only_on_mounted_fs?"]
+            if mavsf and ((oimfs and Util.mounted_filesystem?(dir)) or not oimfs)
+              File.open(avs_file, "w") { |f| f.puts JSON.generate(avs_data)}
+            end
           }
 
           #if @@local_anime != nil
@@ -184,6 +233,7 @@ module Aniview
             changed 
             notify_observers
           end
+          #
         }
       end
     
@@ -201,7 +251,7 @@ module Aniview
         hash = {}
 
         arr.sort_by {|i| i.title}.each { |file|
-          if ! keys.key?(parent file.path)
+          unless keys.key?(parent file.path)
             key = AnimeSeries.new parent(file.path)
             keys.merge! parent(file.path) => key
             hash.merge! key => []
@@ -210,7 +260,7 @@ module Aniview
           end
 
           hash[key] << file
-          key += file
+          key << file
         }
         hash.sort_by{ |j| j[0].title }.to_h
       end
@@ -230,10 +280,10 @@ module Aniview
           f.puts %x(date).chomp + " ./" + File.basename(file) + " " + @watch_log_tag
         end
       end
-    
+
       def addWatched(file)
         @@local_anime[file].watch
-        self.save
+        save
         changed
         notify_observers
       end
@@ -241,15 +291,14 @@ module Aniview
       def rmWatched(path = "")
         if @@local_anime.key? path
           @@local_anime[path].unwatch
-          return
+        else
+          r = []
+          @@local_anime.values.each_with_index{ |v, i| r << {Integer(v.seenOn) => @@local_anime.keys[i]} if v.seen? }
+          return if r.length == 0
+          last_watched = (r.sort_by{ |h| h.keys.first}.reverse)[0].values[0]
+          @@local_anime[last_watched].unwatch
         end
-    
-        r = []
-        @@local_anime.values.each_with_index{ |v, i| r << {Integer(v.seenOn) => @@local_anime.keys[i]} if v.seen? }
-        return if r.length == 0
-        last_watched = (r.sort_by{ |h| h.keys.first}.reverse)[0].values[0]
-        @@local_anime[last_watched].unwatch
-        self.save
+        save
         changed
         notify_observers
       end
@@ -258,6 +307,15 @@ module Aniview
         @mpvbridge.play file
       end
 
+      def watch_list(files)
+        File.open("/tmp/aniview_list.m3u", "w") { |f|
+          files.each { |file|
+            f.puts file.path
+          }
+        }
+        @mpvbridge.playlist("/tmp/aniview_list.m3u", files.map { |f| [f.path, f] }.to_h)
+      end
+
     end
   end
 end

data/lib/aniview/interface/animeio/animeseries.rb

@@ -16,6 +16,9 @@ module Aniview
           "c" => 0,
           "d" => 0,
           "s" => 0,
+          "p" => 0,
+          "w" => 0,
+          "W" => 0
         }
 
         @children = children
@@ -24,10 +27,25 @@ module Aniview
 
       def + af
         @attr["d"] += af.attr["d"]
-        @attr["D"]  = Util.format_duration @attr["d"]
+        @attr["D"]  = Util.format_duration(@attr["d"])
         @attr["s"] += af.attr["s"]
-        @attr["S"]  = Util.format_size     @attr["s"]
+        @attr["S"]  = Util.format_size(@attr["s"])
         @attr["c"] += 1
+        @attr["w"] += 1 if af.seen?
+        @attr["W"] += af.attr["d"] if af.seen?
+      end
+
+      def << af
+        @children << af
+        self + af
+        average
+      end
+
+      def average
+        @attr["p"] = @attr["w"] * 100.0 / @attr["c"]
+        @attr["q"] = @attr["d"] > 0 ? @attr["W"] * 100.0 / @attr["d"] : 0
+        @attr["Q"] = Util.format_progress @attr["q"]
+        @attr["P"] = Util.format_progress @attr["p"]
       end
 
       def title

data/lib/aniview/interface/mpv/mpvbridge.rb

@@ -11,12 +11,13 @@ module Aniview
       include Observable
 
       attr_accessor :playing
+      attr_accessor :playing_file
       attr_accessor :what_changed
 
       def initialize pref
         @pref = pref
         @mpv_enabled = true
-        @logger = Logger.new('mpv.log')
+        @logger = Logger.new(@pref.parseDir('$conf_dir/mpv.log'))
         @logger.level = Logger::DEBUG
         connect
         @what_changed = ""
@@ -24,17 +25,25 @@ module Aniview
       end
 
       def event_handler event
-        case event
+        @logger.debug event
+        case event["event"]
+          #file-loaded
         when "start-file"
           @playing = true
-          @what_changed = "playing_status"
+          @what_changed = {:playing_status => :start}
           changed
           notify_observers
         when "end-file"
           @playing = false
-          @what_changed = "playing_status"
+          @what_changed = {:playing_status => :end}
           changed
           notify_observers
+        when "property-change"
+          case event["name"]
+          when "path"
+            @playing_file = @playing_files[event["data"]]
+          end
+        else
         end
       end
 
@@ -50,6 +59,8 @@ module Aniview
         begin
           @mpv = MPV::Session.new(user_args: @pref.get("mpv_args").split(" "))
           @mpv.callbacks << MPV::Callback.new(self, :event_handler)
+          @mpv.client.command("observe_property_string", 1, "path")
+          #@mpv.client.command("observe_property_string", 1, "playback-abort")
         rescue MPV::MPVNotAvailableError
         rescue MPV::MPVUnsupportedFlagError
         else
@@ -60,11 +71,20 @@ module Aniview
       def play file
         return unless @mpv_enabled
         connect
-        @playing_file = file
+        @playing_files = {file.path => file}
         @mpv.client.command "loadfile", file.path
         @playing = true
       end
-    
+
+      def playlist playlist, files
+        return unless @mpv_enabled
+        connect
+        @playing_files = files
+        #@playing_file = @playing_files[0]
+        @mpv.client.command "loadlist", playlist
+        @playing = true
+      end
+
       def playing?
         @playing
       end
@@ -75,7 +95,7 @@ module Aniview
           pct = Float(percentage)
           if pct >= swp and not @playing_file.seen?
             @playing_file.watch
-            @what_changed = "local_anime"
+            @what_changed = {:local_anime => :watched}
             changed
             notify_observers
           end

data/lib/aniview/interface/pref/defaults.json

@@ -41,14 +41,14 @@
   },
   "format_library"             :
   {
-    "title"                  : " %t @ %D %S ",
-    "parent"                 : " %t - %c@ %D %S ",
-    "child"                  : "  %t@ %D %S  "
+    "title"                  : " %t@ ##%w/##%c #####%Q ########%D #######%S ",
+    "parent"                 : " %t@ ##%w/##%c #####%Q ########%D #######%S ",
+    "child"                  : "  %w %t@ ########%D #######%S "
   },
   "format_library_unwatched"   :
   {
-    "title"                  : " %t@ %D %S ",
-    "parent"                 : " %t - %c@ %D %S ",
+    "title"                  : " %t@ ##%w/##%c ########%D #######%S ",
+    "parent"                 : " %t@ ##%w/##%c ########%D #######%S ",
     "child"                  : "  %t@ %D %S %r  "
   },
   "format_torrents"            :
@@ -89,6 +89,11 @@
   {
     "port"                   : "21312"
   },
+  "avs_files":
+  {
+    "create?": true,
+    "only_on_mounted_fs?": false
+  },
   "set_watched_percentage"     : "80",
   "log_file"                   : "$conf_dir/aw.log",
   "daemon_log_file"            : "$conf_dir/server.log",

data/lib/aniview/interface/pref/pref.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'json'
+require 'observer'
 
 require_relative 'prefitem'
 require_relative '../../view/color'
@@ -76,6 +77,16 @@ module Aniview
       ##
       def set(trail, destination)
         trail = [trail] if trail.class == String
+
+        destination = case destination
+                      when "true"
+                        true
+                      when "false"
+                        false
+                      else
+                        destination
+                      end
+
         return unless valid_preference?(trail, destination)
 
         trail[0...-1].inject(@pref, :fetch)[trail.last] = destination
@@ -83,6 +94,14 @@ module Aniview
         changed
         notify_observers
       end
+
+      def pref_type(trail)
+        trail.inject(@validations, :fetch)
+      end
+
+      def get_pref(trail)
+        trail.inject(@pref, :fetch)
+      end
     
       ##
       ## @brief      validates a preference
@@ -96,7 +115,7 @@ module Aniview
       def valid_preference?(trail, destination)
         skeys = [ "space", "up", "down", "left", "right", "enter" ]
 
-        case trail.inject(@validations, :fetch)
+        case pref_type(trail)
         when "key"
           destination.length == 1 or skeys.include?(destination)
         when "path"
@@ -105,6 +124,8 @@ module Aniview
           Aniview::View::Color.respond_to?(destination)
         when "int"
           destination.scan(/\D/).empty? and destination.length > 1
+        when "boolean"
+          destination.class == TrueClass or destination.class == FalseClass
         when "locked"
           false
         else 

data/lib/aniview/interface/pref/validate.json

@@ -90,6 +90,10 @@
   {
     "port"                   : "int"
   },
+  "avs_files": {
+    "create?": "boolean",
+    "only_on_mounted_fs?": "boolean"
+  },
   "set_watched_percentage"   : "int",
 	"log_file"                   : "path",
   "daemon_log_file"            : "path",

data/lib/aniview/interface/subscription/subscription.rb

@@ -50,10 +50,6 @@ module Aniview
     
         rescue SocketError
           @rss = nil
-    
-        #rescue 
-        #  @rss = nil
-    
         end
     	end
     

data/lib/aniview/util/folder_listen.rb

@@ -0,0 +1,53 @@
+# watch for changes in a folder's existance
+
+module Aniview
+  module Util
+    module FolderListen
+
+      def self.to(dirs, &block)
+        Listener.new(dirs, &block)
+      end
+
+      ##
+      ## @brief      Similar to Listen gem but uses polling and is only intended
+      ##             to be used on a small number of files. the Listen gem
+      ##             wouldn't support watching an individual FOLDER to see if
+      ##             the folder went away so this is that!
+      ##
+      class Listener
+        def initialize(dirs, &block)
+          @dirs           = dirs
+          @block          = block
+          @sleep_duration = 1
+          @dir_hash       = dir_hash
+        end
+
+        def dir_hash
+          @dirs.map { |dir| [dir, File.exist?(dir)]}.to_h
+        end
+
+        def changed?
+          @dir_hash != dir_hash
+        end
+
+        def stop
+          @listen_thread.exit if @listen_thread
+        end
+
+        def start
+          Thread.abort_on_exception = true
+          @listen_thread = Thread.new do
+            while true
+              if changed?
+                @block.call
+                @dir_hash = dir_hash
+              end
+              sleep 1
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/aniview/util/term.rb

@@ -1,6 +1,7 @@
 module Aniview
   module Util
     class Term
+
       def initialize
         @tput=Hash[
           "smcup" => %x(tput smcup),
@@ -12,7 +13,7 @@ module Aniview
           "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
@@ -23,21 +24,21 @@ module Aniview
       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 self.cols;        return HighLine::SystemExtensions.terminal_size[0]; end
       def self.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

@@ -9,7 +9,7 @@ module Aniview
       term.show_cursor
       Readline.completion_append_character = ""
       Readline.pre_input_hook = -> do
-        Readline.insert_text default
+        Readline.insert_text "#{default}"
         Readline.redisplay
         Readline.pre_input_hook = nil
       end
@@ -18,9 +18,9 @@ module Aniview
       return input
     end
 
-    def self.error_message
+    def self.error_message(message)
       #use statusline to show error messages
-      print "\e[#{Term.rows};2H Message"
+      print "\e[#{Term.rows - 1};1H\e[31m #{message}\e[K"
     end
 
     def self.format_duration v
@@ -101,12 +101,12 @@ module Aniview
           mode = "char"
         
         elsif mode == "%"
-          addstr = ""
-          addstr = String(d[c]) if d.key?(c)
-          ol = addstr.length
-          addstr = " " + addstr while addstr.length < (ol + padding_collected)
+          addstr = d.key?(c) ? String(d[c]) : ""
+          padding = padding_collected > addstr.length ? " " * (padding_collected - addstr.length) : ""
+          addstr = padding + addstr
           add_to += addstr
           mode = "char"
+          padding_collected = 0
   
         else
           add_to += c
@@ -150,5 +150,18 @@ module Aniview
         {}
       end
     end
+
+    def self.mounted_filesystem? dir
+      %x(mount).split("\n").map { |l| 
+        mounted = /on (.*?) /.match(l)[1]
+        if mounted == "/"
+          false
+        else
+          dir.split("/").zip(mounted.split("/")).reduce(true) { |m,v|
+            m and (v[0] == v[1] or v[1] == nil)
+          }
+        end
+      }.reduce { |a,b| a or b}
+    end
   end
 end

data/lib/aniview/view/aiomenu.rb

@@ -7,56 +7,62 @@ module Aniview
       include Aniview::Util
 
       def refresh_attributes
+        if @items.length > 0
+          unformatted_P = sum_attribute("p") / @items.length
+        else
+          unformatted_P = 0
+        end
+
+        if sum_attribute("d") > 0
+          unformatted_Q = sum_attribute("W") * 100.0 / sum_attribute("d")
+        else
+          unformatted_Q = 0
+        end
         @attributes = {
           "t" => @attributes["t"],
-          "D" => Util.format_duration(getDuration),
-          "S" => Util.format_size(getSize)
+          "D" => Util.format_duration(sum_attribute("d")),
+          "S" => Util.format_size(sum_attribute("s")),
+          "P" => Util.format_progress(unformatted_P),
+          "Q" => Util.format_progress(unformatted_Q),
+          "c" => sum_attribute("c"),
+          "w" => sum_attribute("w")
         }
       end
-    
-    	def getDuration
-        dur = 0
-    		@items.each{ |p, c| dur += p.attr["d"] }
-    		return dur
-    	end
-    	
-    	def getSize
-    		size = 0
-    		@items.each{ |child| 
-    			size += child[0].attributes["s"]
-    		}
-    		return size
-    	end
-    
-    	def customControl(key, sel)
+
+      def sum_attribute k
+        @items.inject(0) { |mem, c| mem += c[0].attr[k] }
+      end
+
+      def customControl(key, sel)
         return if @items == {}
-    		path = @items.values[sel["out"]][sel["in"]].path
+        path = @items.values[sel["out"]][sel["in"]].path
 
         empty = path == "empty"
     
-    		if key == @pref.get("keybindings")["menu_nav_expand"]
-    			expand(sel["out"])
-    		elsif key == "r"
-    			refresh
-    		elsif key == "enter" and not empty
-    			
-    			@interface.watch(@items.values[sel["out"]][sel["in"]])
-
-    			@interface.logWatched(path)
-
-    			refresh
-    		elsif key == @pref.get("keybindings")["anime_set_watched"] and not empty
-    			@interface.addWatched(path)
-    		elsif key == @pref.get("keybindings")["anime_undo_set_watched"]
-    			@interface.rmWatched()
-    		elsif key == @pref.get("keybindings")["anime_set_unwatched"] and not empty
-    			@interface.rmWatched(path)
-    			moveCursor("down")
-    		end
+        if key == @pref.get("keybindings")["menu_nav_expand"]
+          expand(sel["out"])
+        elsif key == "r"
+          refresh
+        elsif key == "enter" and not empty
+
+          if sel["in_expanded"]  
+            @interface.watch(@items.values[sel["out"]][sel["in"]])
+            @interface.logWatched(path)
+          else
+            @interface.watch_list(@items.values[sel["out"]])
+          end
+        elsif key == @pref.get("keybindings")["anime_set_watched"] and not empty
+          @interface.addWatched(path)
+        elsif key == @pref.get("keybindings")["anime_undo_set_watched"]
+          @interface.rmWatched
+        elsif key == @pref.get("keybindings")["anime_set_unwatched"] and not empty
+          @interface.rmWatched(path)
+          moveCursor("down")
+        end
 
         changed
         notify_observers
-    	end
+      end
     end
   end
 end

data/lib/aniview/view/menu.rb

@@ -9,18 +9,17 @@ module Aniview
       include Aniview::Util
       include Observable
 
-      attr_accessor :visible
+      attr_accessor :attributes
+      attr_accessor :format
 
       def initialize(refresh_function: :items, interface:, name:, pref:, format:, term:, children: true, visible: false, logger: nil)
         @attributes       = {}
 
         @logger = logger
 
-        @visible = visible
-
         @refresh_function = refresh_function
         @interface        = interface
-        setName name
+        @attributes["t"]  = name
         @pref             = pref
         @format           = format
         @term             = term
@@ -65,7 +64,7 @@ module Aniview
               refresh
               changed
               notify_observers
-              sleep 0.07
+              sleep 1
             end
           end
         when :stop
@@ -73,7 +72,7 @@ module Aniview
         end
       end
     
-      def setRfunc(new_method)
+      def rfunc=(new_method)
         @refresh_function = new_method
         @items_formatted = {}
         @items_hash = {}
@@ -100,15 +99,7 @@ module Aniview
         adjustView
         draw if redraw
       end
-    
-      def setName(name)
-        @attributes["t"] = name
-      end
-    
-      def setFormat(format_)
-        @format = format_
-      end
-    
+
       def refresh
         @items = @interface.send(@refresh_function)
         refreshFormats

data/lib/aniview/view/prefmenu.rb

@@ -11,8 +11,13 @@ module Aniview
         title = @items[sel["out"]].attributes["t"]
         value = @items[sel["out"]].attributes["v"]
         if key == "enter"
-          newval = Util.readline(@term, title + ":", value)
-          @interface.set(path, newval)
+          case @interface.pref_type(path)
+          when "boolean"
+            @interface.set(path, (not @interface.get_pref(path)))
+          else
+            newval = Util.readline(@term, title + ":", value)
+            @interface.set(path, newval)
+          end
           refresh
         end
       end

data/lib/application.rb

@@ -75,11 +75,10 @@ module Aniview
 
       @aiomenu = View::AioMenu.new(
         interface:        @aio,
-        name:             @pref.get("menu_titles")["unwatched"],
+        name:             @pref.get("menu_titles")["library"],
         pref:             @pref,
-        format:           "format_library_unwatched",
+        format:           "format_library",
         term:             @term,
-        refresh_function: :unwatched,
         logger:           @logger
       )
       @prefmenu = View::PrefMenu.new(
@@ -172,24 +171,28 @@ module Aniview
     #
     # @return     nil
     #
-    def changeView newView
+    def change_view(view:, rfunc: :items, format:nil, name:nil) 
       @view.delete_observers
       @view.pause
-      newView.unpause
-      newView.add_observer(self, :drawview)
-      newView.change_screen_size redraw: false
-      newView.expand -1
-      @view = newView
+      view.attributes["t"] = name   if name
+      view.format          = format if format
+      view.rfunc           = rfunc
+      view.add_observer(self, :drawview)
+      view.change_screen_size redraw: false
+      view.expand -1
+      view.unpause
+      @view = view
     end
   
     def drawview
       @view.draw
+      @statusline.draw
       @rcount ||= 0
       #puts "refreshed view #{@rcount+=1}"
     end
 
     def togglestatusline
-      return unless @mpvbridge.what_changed == "playing_status"
+      return unless @mpvbridge.what_changed[:playing_status]
       unless @statusthread
         @statusthread = Thread.new do
           while true
@@ -218,13 +221,23 @@ module Aniview
     # @return     nil
     #
     def run
+      nm = @pref.get("menu_titles")
+      views = {
+        :unwatched    => {view: @aiomenu, name: nm["unwatched"], format: "format_library_unwatched", rfunc: :unwatched},
+        :library      => {view: @aiomenu, name: nm["library"],   format: "format_library"},
+        :torrents     => {view: @delugemenu},
+        :preferences  => {view: @prefmenu},
+        :schedule     => {view: @schedulemenu},
+        :subscription => {view: @subscriptionmenu}
+      }
 
-      @view = @aiomenu
+      current_view = 0
+      @view        = @aiomenu
+      
       @view.add_observer(self, :drawview)
-      @statusline.draw
-
       @mpvbridge.add_observer(self, :togglestatusline)
       @statusline.add_observer(self, :drawmessage)
+      @statusline.draw
 
       mutex = Mutex.new
       Signal.trap('SIGWINCH', proc { 
@@ -243,31 +256,34 @@ module Aniview
         @shoulddraw = false
   
         kb = @pref.get("keybindings")
-        nm = @pref.get("menu_titles")
   
         case key
         when kb["goto_unwatched"]
-          changeView @aiomenu
-          @view.setName nm["unwatched"]
-          @view.setFormat("format_library_unwatched")
-          @view.setRfunc(:unwatched)
+          change_view(views[:unwatched])
+          current_view = 0
         when kb["goto_library"]
-          changeView @aiomenu
-          @view.setName nm["library"]
-          @view.setFormat("format_library")
-          @view.setRfunc(:items)
+          change_view(views[:library])
+          current_view = 1
         when kb["goto_torrents"]
-          changeView @delugemenu
-          @view.setName nm["torrents"]
+          change_view(views[:torrents])
+          current_view = 2
         when kb["goto_preferences"]
-          changeView @prefmenu
-          @view.setName nm["preferences"]
+          change_view(views[:preferences ])
+          current_view = 5
         when kb["goto_schedule"]
-          changeView @schedulemenu
-          @view.setName nm["schedule"]
+          change_view(views[:schedule])
+          current_view = 3
         when kb["goto_subscriptions"]
-          changeView @subscriptionmenu
-          @view.setName nm["subscriptions"]
+          change_view(views[:subscription])
+          current_view = 4
+        when "right"
+          current_view += 1
+          current_view = views.length - 1 if current_view >= views.length
+          change_view(views.values[current_view])
+        when "left"
+          current_view -= 1
+          current_view = 0 if current_view < 0
+          change_view(views.values[current_view])
         when ":"
           @view.pause
           if @statusthread
@@ -282,6 +298,7 @@ module Aniview
         end
         @view.control(key)
       end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aniview
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - annacrombie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg
@@ -156,6 +156,7 @@ files:
 - "./lib/aniview/interface/schedule/scheduleitem.rb"
 - "./lib/aniview/interface/subscription/subscription.rb"
 - "./lib/aniview/util/error.rb"
+- "./lib/aniview/util/folder_listen.rb"
 - "./lib/aniview/util/term.rb"
 - "./lib/aniview/util/util.rb"
 - "./lib/aniview/view/aiomenu.rb"