aniview 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76fe86faf6063dc4aefae602dce65dc59b0563a6
-  data.tar.gz: 0bc9c727056c4b7ce31daea1aeed4e5e89668c4f
+  metadata.gz: 2c5f585fc35515dc5a6a3711eeae7aa8e49fe85d
+  data.tar.gz: f63599d23c1cfc65641bbca8cd4c1b429671dadd
 SHA512:
-  metadata.gz: 801a40242ad37834ebbe5e86f5705bab97bb0d17e5da2bc60f33c79fd443e8efe024b5752e573258ffd1b29c49f5ab047ee171c066f939cd721249e4044f148c
-  data.tar.gz: 82d13c551202d58ef28eaf09eac30041fbfa3f1f904627d43ad2f3616ace509140df747631c2f26a8957ddb151d3d17cbd9a200483dd59dffbceefa04960fdfd
+  metadata.gz: 8aaa333dbd7d119f668807f5f2a471e8c74ced69ed5801d5b3f190319d035e56db4d12c272b1d2422d19c6767bc4c15d21f12b5f26bebbe8b1837b1a8bd26bea
+  data.tar.gz: cae32d83c6f162daa32704d3d56d188537031de31cc95ceb1acfd7890a483ea7e835293255d610c6997de87895d155472f77e73e0e4fde00377549844af0af18

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

@@ -57,6 +57,10 @@ module Aniview
         end
     
       end
+
+      def title
+        return @attr["t"]
+      end
     
       def seen?
         return @watched

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

@@ -9,19 +9,21 @@ module Aniview
     include Aniview::Util
     class AnimeIO
     	def initialize(pref, mpvbridge)
-    		@pref = pref
-        @mpvbridge = mpvbridge
-    		@empty_hash = {
-    			"empty" => AnimeFile.new(
-    				"empty"
-    			)
-    		}
-    		@watch_log_tag = "♪"
+        @pref              = pref
+        @mpvbridge         = mpvbridge
+        @empty_hash        = make_empty_hash
+        @watch_log_tag     = "♪"
+        @dir_last_modified = {}
     
     		self.load
     		index_anime
     	end
     
+      def make_empty_hash
+        af = AnimeFile.new("empty")
+        {AnimeSeries.new("empty", [af]) => [af]}
+      end
+
     	def save
     		@pref.set "local_anime", Util.encode_object(@@local_anime)
     	end
@@ -37,12 +39,29 @@ module Aniview
     
     	def index_anime(force: false, verbose: false)
     		ret = {}
+        made_changes = false
+
     		(@pref.get("anime_locations").split(":")).each { |dir|
     			
-    			dir = @pref.parseDir dir
+    			dir       = @pref.parseDir dir
+          dir_mtime = File::Stat.new(dir).mtime
+
+          if @dir_last_modified.key? dir
+            if @dir_last_modified[dir] == dir_mtime
+              #puts "skipping"
+              next
+            else
+              @dir_last_modified[dir] = dir_mtime
+            end
+          else
+            @dir_last_modified.merge!(dir => dir_mtime)
+          end
+
+         # puts "not skipping..."
+          #p @dir_last_modified
 
           files = Dir.glob("#{dir}*/*.{mkv,avi,mp4}") + Dir.glob("#{dir}/*.{mkv,avi,mp4}")
-    
+
     			files.each { |file|
     				puts "indexing #{file}" if verbose
     				seen_this = false
@@ -56,6 +75,7 @@ module Aniview
     						next
     					end
     				end
+            made_changes = true
     				ret.merge!(
     					file => AnimeFile.new(
     						file,
@@ -69,14 +89,14 @@ module Aniview
     		else
     			@@local_anime = ret
     		end
-    
+
     		pruned = {}
     		@@local_anime.each{ |a|
     			pruned.merge!(a[0] => a[1]) if File.exist? a[1].path
     		}
     		@@local_anime = pruned
-    
-    		self.save
+        puts "made changes" if made_changes
+    		self.save if made_changes
     	end
     
     	#returns the parent directory of a file
@@ -100,11 +120,12 @@ module Aniview
     			this_parent = parent animefile.path
     
     			if this_parent != last_parent
+            sorted_subarray = subarray.sort_by { |a| a.title }
     				ret.merge!(
     					AnimeSeries.new(
     						last_parent,
-    						subarray
-    					) => subarray)
+    						sorted_subarray
+    					) => sorted_subarray)
     				subarray = [animefile]
     			else
     				subarray << animefile
@@ -113,17 +134,20 @@ module Aniview
     			last_parent = this_parent
     
     		}
+
+        sorted_subarray = subarray.sort_by { |a| a.title }
     		ret.merge!( 
     			AnimeSeries.new(
     				parent(sarr[sarr.length - 1].path),
-    				subarray
-    			) => subarray
+    				sorted_subarray
+    			) => sorted_subarray
     		)
     		return Hash[ret.sort_by{ |a| a[0].title}]
     	end
     
     	#return the difference of getAired and getWatched
     	def getUnwatched
+        index_anime
     		ret = []
     		#puts @@local_anime
     		@@local_anime.each{ |anime|
@@ -134,6 +158,7 @@ module Aniview
     
     	#return an AnimeFile array of all mkvs in any dir specified in $pref["dirs"]
     	def getAll
+        index_anime
     		return @@local_anime.values
     	end
     

data/lib/aniview/interface/deluge/delugec.rb

@@ -56,7 +56,7 @@ module Aniview
     
       def localAuth
         authfile = Dir.home + "/.config/deluge/auth"
-        ["", ""] if not File.exist? authfile
+        return ["", ""] if not File.exist? authfile
         File.open(Dir.home + "/.config/deluge/auth") { |f| f.read }.split(":")
       end
     

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

@@ -7,25 +7,37 @@ module Aniview
       include Aniview::Util
       def initialize pref
         @pref = pref
+        @mpv_enabled = true
         connect
       end
     
       def quit!
-        @mpv.quit!
+        @mpv.quit! unless @mpv == nil
       end
     
       def connect
+        return unless @mpv_enabled
         return unless @mpv == nil or @mpv.client.get_property("idle-active") == nil
-        @mpv = MPV::Session.new(user_args: @pref.get("mpv_args").split(" "))
+        @mpv = nil
+        @mpv_enabled = false
+        begin
+          @mpv = MPV::Session.new(user_args: @pref.get("mpv_args").split(" "))
+        rescue MPV::MPVNotAvailableError
+        rescue MPV::MPVUnsupportedFlagError
+        else
+          @mpv_enabled = true
+        end
       end
     
       def play file
+        return unless @mpv_enabled
         connect
         @playing_file = file
         @mpv.client.command "loadfile", file.path
       end
     
       def playing?
+        return false unless @mpv_enabled
         @mpv.client.get_property("time-pos") != nil
       end
     

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

@@ -21,8 +21,8 @@
     "menu_nav_down"          : "down",
     "menu_nav_expand"        : "space"
   },
-  "anime_locations"            : "~/anime/:$airing_dir",
-  "airing_dir"                 : "~/anime/airing/",
+  "anime_locations"            : "$airing_dir",
+  "airing_dir"                 : "",
   "clr"                        :
   {
     "main"                   : "blue",

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

@@ -7,136 +7,143 @@ require_relative '../../view/color'
 module Aniview
   module Interface
     class Pref
-    	def initialize
+      def initialize
     
-    		@home = Dir.home
-    		@conf = @home + "/.config/aniview"
+        @home = Dir.home
+        @conf = @home + "/.config/aniview"
     
-    		File.open(File.join(File.dirname(__FILE__), "/validate.json"), "r") {
-    			|f| @validate = JSON.parse(f.read)
-    		}
+        File.open(File.join(File.dirname(__FILE__), "/validate.json"), "r") {
+          |f| @validate = JSON.parse(f.read)
+        }
     
-    		FileUtils.mkdir_p(@conf) unless File.directory?(@conf)
+        FileUtils.mkdir_p(@conf) unless File.directory?(@conf)
     
-    		@pref_file = @conf + "/aniview.json"
+        @pref_file = @conf + "/aniview.json"
     
-    		self.defaults if not File.exist?(@pref_file)
-    		self.load
-    	end
+        self.defaults if not File.exist?(@pref_file)
+        self.load
+      end
     
-    	def parseDir path
+      def parseDir path
         path = path.gsub("$airing_dir", @pref["airing_dir"])
         path = path.gsub("$conf_dir", @pref["conf_dir"])
-    		path = path.gsub("~", Dir.home)
+        path = path.gsub("~", Dir.home)
+
+        path += "/" if path[-1] != "/"
+
         return path
-    	end
-    
-    	def defaults
-    		File.open(File.join(File.dirname(__FILE__), "/defaults.json"), "r") {|f| @pref = JSON.parse(f.read)}
-    		self.save
-    	end
-    
-    	def set(s, val)
-    		trail = [s] if s.class == String
-    		trail = s   if s.class == Array
-    		if valpref(trail, val, @validate)
-    			@pref = setpref(trail, val, @pref)
-    		end
-    
-    		save
-    	end
-    
-    	def setpref(trail, destination, map)
-    		if trail.length == 1
-    			map[trail[0]] = destination
-    			return map
-    		else
-    			
-    			blaze = trail[0]
-    			map[blaze] = setpref(trail[1..-1], destination, map[blaze])
-    			
-    		end
-    		return map
-    	end
-    
-    	def valpref(trail, destination, map)
-    		
-    		if trail.length == 1
-    			skeys = [
-    				"space",
-    				"up",
-    				"down",
-    				"left",
-    				"right",
-    				"enter"
-    			]
-    
-    			case map[trail[0]]
-    				when "key"
-    					return false if destination.length != 1 and not skeys.include? destination
-    	
-    				when "path"
-    					destination.split(":").each { |d|
+      end
+    
+      def defaults(should_save:true)
+        File.open(File.join(File.dirname(__FILE__), "/defaults.json"), "r") {|f| @pref = JSON.parse(f.read)}
+        self.save if should_save
+      end
+    
+      def set(s, val)
+        trail = [s] if s.class == String
+        trail = s   if s.class == Array
+        if valpref(trail, val, @validate)
+          @pref = setpref(trail, val, @pref)
+        end
+    
+        save
+      end
+    
+      def setpref(trail, destination, map)
+        if trail.length == 1
+          map[trail[0]] = destination
+          return map
+        else
+          
+          blaze = trail[0]
+          map[blaze] = setpref(trail[1..-1], destination, map[blaze])
+          
+        end
+        return map
+      end
+    
+      def valpref(trail, destination, map)
+        
+        if trail.length == 1
+          skeys = [
+            "space",
+            "up",
+            "down",
+            "left",
+            "right",
+            "enter"
+          ]
+    
+          case map[trail[0]]
+            when "key"
+              return false if destination.length != 1 and not skeys.include? destination
+      
+            when "path"
+              destination.split(":").each { |d|
                 return false if not Dir.exist?(parseDir d)
               }
-    	
-    				when "color"
-    					return false if not Aniview::View::Color.respond_to? destination
-    	
-    				when "int"
-    					return false if not destination.scan(/\D/).empty? and destination.length > 1
+      
+            when "color"
+              return false if not Aniview::View::Color.respond_to? destination
+      
+            when "int"
+              return false if not destination.scan(/\D/).empty? and destination.length > 1
     
             when "locked"
               return false
     
-    			end
+          end
     
-    			return true
+          return true
     
-    		else
-    			blaze = trail[0]
-    			return valpref(trail[1..-1], destination, map[blaze])
-    		end
-    	end
+        else
+          blaze = trail[0]
+          return valpref(trail[1..-1], destination, map[blaze])
+        end
+      end
     
-    	def get s
-    		return @pref[s] if @pref.key?(s)
-    	end
+      def get s
+        return @pref[s] if @pref.key?(s)
+      end
     
-    	def getAll
-    		ignore = {
-    			"local_anime" => true,
+      def getAll
+        ignore = {
+          "local_anime" => true,
           "schedule" => true,
-    		}
-    
-    		r = {}
-    		@pref.each{ |item| 
-    			next if ignore.key? item[0]
-    			title = item[0]
-    			if item[1].class == String
-    				val = item[1]
-    			elsif item[1].class == Array
-    				val = item[1].join(":")
-    			elsif item[1].class == Hash
-    				item[1].each { |subitem|
-    					subtitle = title + "_" + subitem[0]
-    					subval   = subitem[1]
-    					r.merge!(PrefItem.new(subtitle, subval, []) => [PrefItem.new("", "", [item[0], subitem[0]])])
-    				}
-    				next
-    			end
-    			r.merge!(PrefItem.new(title, val, []) => [ PrefItem.new("", "", [item[0]]) ] )
-    		}
-    		return r
-    	end
-    
-    	def save
-    		File.open(@pref_file, "w") { |f| f.write(JSON.pretty_generate(@pref)) }
-    	end
-    	
-    	def load
-    		File.open(@pref_file, "r") {|f| @pref = JSON.parse(f.read)}
-    	end
+        }
+    
+        r = {}
+        @pref.each{ |item| 
+          next if ignore.key? item[0]
+          title = item[0]
+          if item[1].class == String
+            val = item[1]
+          elsif item[1].class == Array
+            val = item[1].join(":")
+          elsif item[1].class == Hash
+            item[1].each { |subitem|
+              subtitle = title + "_" + subitem[0]
+              subval   = subitem[1]
+              r.merge!(PrefItem.new(subtitle, subval, []) => [PrefItem.new("", "", [item[0], subitem[0]])])
+            }
+            next
+          end
+          r.merge!(PrefItem.new(title, val, []) => [ PrefItem.new("", "", [item[0]]) ] )
+        }
+        return r
+      end
+    
+      def save
+        File.open(@pref_file, "w") { |f| f.write(JSON.pretty_generate(@pref)) }
+      end
+      
+      def load
+        begin
+          File.open(@pref_file, "r") {|f| @pref = JSON.parse(f.read)}
+          #rescue JSON::ParserError
+          #defaults should_save: false
+        end
+      end
     end
   end
 end

data/lib/aniview/util/term.rb

@@ -1,39 +1,42 @@
 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 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 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 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 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
+      def reset
+        self.restore.show_cursor.echo_on
+      end
     
     end
   end

data/lib/aniview/util/util.rb

@@ -18,6 +18,11 @@ module Aniview
       return input
     end
 
+    def self.error_message
+      print "\e[#{Term.rows};2H Message"
+      sleep 1
+    end
+
     def self.format_duration v
       hours = Integer((v-(v%3600))/3600)
       minutes = Integer( ((v-(v%60))/60) - (hours * 60))

data/lib/aniview/view/aiomenu.rb

@@ -40,27 +40,27 @@ module Aniview
     
     	def customControl(key, sel)
     		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"
+    		elsif key == "enter" and not empty
     			
     			@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"]
+    		elsif key == @pref.get("keybindings")["anime_set_watched"] and not empty
     			@interface.addWatched(path)
     			refresh
     		elsif key == @pref.get("keybindings")["anime_undo_set_watched"]
     			@interface.rmWatched()
     			refresh
-    		elsif key == @pref.get("keybindings")["anime_set_unwatched"]
+    		elsif key == @pref.get("keybindings")["anime_set_unwatched"] and not empty
     			@interface.rmWatched(path)
     				
     		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aniview
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - annacrombie