aniview 2.1.2 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6824d7f28e7bebe026f0081c09d7442e99d50e64
-  data.tar.gz: e645a210dcd58f0d039430e64ffd9b9254a4cbe0
+  metadata.gz: 4b35aefbae5c33c60dd90e34e39ba25538fb537d
+  data.tar.gz: f930e37c98cab765b2baaf880e1631e9b8cee308
 SHA512:
-  metadata.gz: dad87f8040707a9718894b85f4ab715b20d38947a3c6007a61b8bdbfe4718c430ce13ec80c5d54398a58fa5813927d88547509b4e43f6c0bc1feb468429b0434
-  data.tar.gz: 865b2b9710b445419ae625aa8ad9b95703ea1e9edecd148e5b55df6fc95e5848cb110ca56e231c496371c5704a25b4fdb140961b1cdf1950b0e8db2bd763d874
+  metadata.gz: 0cb7100a4503b321ebac1a28582d856fc2b536fbae03ffa7dbc3d9bcacb5d5506e3ba8f75871822f749695afff13c9249bee1fc6bdb309c2d0265e366e49cace
+  data.tar.gz: def2061bba9ae07a58886a26a0f8d468632d98623c1d13be405f895651be834e4d737aebc7df084fcf79b5bd44ac274012c264f35bdad467c245078b4428597c

data/bin/aniview

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 
 begin
-	require 'aniview'
+  require 'aniview'
 rescue LoadError
-	require_relative '../lib/aniview' if File.exist?(File.join(File.dirname(__FILE__), '../lib/aniview.rb'))
+  require_relative '../lib/aniview' if File.exist?(File.join(File.dirname(__FILE__), '../lib/aniview.rb'))
 end
 
 unless defined? Aniview
-	puts "cant find aniview library" 
-	exit 
+  puts "cant find aniview library" 
+  exit 
 end
 
 Aniview::main(ARGV)

data/lib/aniview.rb

@@ -32,6 +32,7 @@ module Aniview
       case arg
       when "-d"
         argv.delete_at(0)
+        daemonize = true
         main_class = Aniview::Daemon.new(argv)
       when "-h"
         self.show_help
@@ -49,7 +50,6 @@ module Aniview
       process = fork do
         main_class.run
       end
-      
       Process.detach(process)
     else
       main_class.run

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

@@ -11,17 +11,19 @@ module Aniview
       include Aniview::Util
 
       attr_accessor :last_modified
+      attr_accessor :accessible
       attr_accessor :path
 
       def initialize(path_, seen = false)
-        @watched = seen
+        @watched    = seen
+        @accessible = true
         begin
           @last_modified = File::Stat.new(path_).mtime
         rescue Errno::ENOENT
           @last_modified = "0"
         end
         @watched_on = 0
-        @path = path_
+        @path       = path_
 
         @attr = {
           "t" => "empty",

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

@@ -1,212 +1,263 @@
 require 'mkmf'
 require 'fileutils'
+require 'observer'
+require 'listen'
+require 'benchmark'
+
 require_relative 'animefile'
 require_relative 'animeseries'
 require_relative '../../util/util'
+require_relative '../bridge'
 
 module Aniview
   module Interface
-    include Aniview::Util
-    class AnimeIO
-    	def initialize(pref, mpvbridge)
+    
+    class AnimeIO < Bridge
+
+      include Aniview::Util
+
+      include Observable
+
+      def initialize(pref, mpvbridge)
         @pref              = pref
         @mpvbridge         = mpvbridge
         @empty_hash        = make_empty_hash
         @watch_log_tag     = "♪"
         @dir_last_modified = {}
-    
-    		self.load
-    		index_anime
-    	end
+        @made_changes      = true
+
+        self.load
+        pref_changed!
+        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 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
+        @listener.start
+      end
+
+      def cleanup
+        @listener.stop unless @listener == nil
+      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
-    	
-    	def load
-    		raw = @pref.get "local_anime"
-    		if not raw == nil and raw.class == String
-    			@@local_anime = Util.decode_object raw
-    		else
-    			@@local_anime = {}
-    		end
-    	end
+      def save
+        @pref.set "local_anime", Util.encode_object(@@local_anime)
+      end
+      
+      def load
+        raw = @pref.get "local_anime"
+        if not raw == nil and raw.class == String
+          @@local_anime = Util.decode_object raw
+        else
+          @@local_anime = {}
+        end
+      end
+
+      def pref_changed!
+        new_dirs = (@pref.get("anime_locations").split(":")).collect { |dir|
+          @pref.parseDir(dir)
+        }
+        if new_dirs != @anime_dirs
+          @anime_dirs = new_dirs
+          index_anime
+          relisten
+        end
+      end
+
+      def animefile_changed!
+        return unless @mpvbridge.what_changed == "local_anime"
+        changed
+        notify_observers
+      end
     
-    	def index_anime(force: false, verbose: false)
-    		ret = {}
-        made_changes = false
 
-    		(@pref.get("anime_locations").split(":")).each { |dir|
-    			
-    			dir       = @pref.parseDir dir
-          dir      += "/" if dir[-1] != "/"
+      ##
+      ## @brief      Indexes anime files up to 1 level deep in specified anime directories
+      ##
+      ## @param      force    The force
+      ## @param      verbose  The verbose
+      ##
+      ## @return     { description_of_the_return_value }
+      ##
+      def index_anime(force: false, verbose: false)
+        Thread.new {
+          ret = {}
+          made_changes = false
+          lal = @@local_anime.length
 
-          dir_mtime = File::Stat.new(dir).mtime
+          @anime_dirs.each { |dir|
 
-          if @dir_last_modified.key? dir
-            if @dir_last_modified[dir] == dir_mtime
-              #puts "skipping"
+            # check if the directory exists
+            if not File.exist? dir 
+              if @dir_last_modified[dir] != "check"
+                @dir_last_modified[dir] = "check"
+                made_changes = true
+              end
               next
-            else
-              @dir_last_modified[dir] = dir_mtime
             end
-          else
-            @dir_last_modified.merge!(dir => dir_mtime)
-          end
 
-          files = Dir.glob("#{dir}*/*.{mkv,avi,mp4}") + Dir.glob("#{dir}/*.{mkv,avi,mp4}")
-
-    			files.each { |file|
-    				puts "indexing #{file}" if verbose
-    				seen_this = false
-    				if @@local_anime != nil and @@local_anime.key?(file)
-    					seen_this = @@local_anime[file].seen?
-
-              last_modified = File::Stat.new(file).mtime
-
-    					if not force or last_modified == @@local_anime[file].last_modified
-    						ret.merge!(file => @@local_anime[file])
-    						next
-    					end
-    				end
-            made_changes = true
-    				ret.merge!(
-    					file => AnimeFile.new(
-    						file,
-    						seen_this
-    					)
-    				)
-    			}
-    		}
-    		if @@local_anime != nil
-    			@@local_anime.merge!(ret)
-    		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
-        puts "made changes" if made_changes
-    		self.save if made_changes
-    	end
-    
-    	#returns the parent directory of a file
-    	def parent(file)
-    		return File.basename(File.dirname(file))
-    	end
-    
-    	#convert an AnimeFile array to a hash structured like
-    	#(string)parent => (AnimeFile array)[child0, child1, child2] and return it
-    	def makeHash(arr)
-    		return @empty_hash if arr[0] == nil
-    		ret = {}
-    		subarray = []
-    		
-    
-    		sarr = arr.sort_by {|s| s.path}
-    		last_parent = parent sarr[0].path
-    
-    		(sarr).each { |animefile|
-    
-    			this_parent = parent animefile.path
-    
-    			if this_parent != last_parent
-            sorted_subarray = subarray.sort_by { |a| a.title }
-    				ret.merge!(
-    					AnimeSeries.new(
-    						last_parent,
-    						sorted_subarray
-    					) => sorted_subarray)
-    				subarray = [animefile]
-    			else
-    				subarray << animefile
-    			end
-    			
-    			last_parent = this_parent
-    
-    		}
-
-        sorted_subarray = subarray.sort_by { |a| a.title }
-    		ret.merge!( 
-    			AnimeSeries.new(
-    				parent(sarr[sarr.length - 1].path),
-    				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|
-    			ret << anime[1] if not anime[1].seen?
-    		}
-    		return ret
-    	end
-    
-    	#return an AnimeFile array of all mkvs in any dir specified in $pref["dirs"]
-    	def getAll
-        index_anime
-    		return @@local_anime.values
-    	end
-    
-    	def getAllSeries
-    		arr = getAll
+            puts "checking #{dir}" if verbose
+
+            # skip indexing a directory if it hasn't been modified since the last
+            # check (disabled because doesn't save to much time)
+            #
+            #dir_mtime = File::Stat.new(dir).mtime
+            #
+            #if @dir_last_modified.key? dir
+            #  if @dir_last_modified[dir] == dir_mtime
+            #    next
+            #  else
+            #    @dir_last_modified[dir] = dir_mtime
+            #  end
+            #else
+            #  @dir_last_modified.merge!(dir => dir_mtime)
+            #end
+
+            # 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
+
+              # we have already indexed this file
+              if @@local_anime != nil and @@local_anime.key?(file)
+                
+                # get its seen data
+                seen_this = @@local_anime[file].seen?
+                # get its last modifed data
+                last_modified = File::Stat.new(file).mtime
+                # get wether or not it is accessible
+                @@local_anime[file].accessible = true
+
+                # 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
+                  ret.merge!(file => @@local_anime[file])
+                  next
+                end
+              end
+
+              #puts "changed!"
+
+              # okay we are making changes to local_anime
+              made_changes = true
+
+              # this is the anime file we are adding
+              ret.merge!(
+                file => AnimeFile.new(
+                  file,
+                  seen_this
+                )
+              )
+            }
+          }
+
+          #if @@local_anime != nil
+          #  @@local_anime.merge!(ret)
+          #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
+          made_changes = true if @@local_anime.length != lal
+          if @made_changes
+            self.save 
+            changed 
+            notify_observers
+          end
+        }
+      end
     
-    		last_parent = parent arr[0].path
-    		ret = [ last_parent ]
+      #returns the parent directory of a file
+      def parent(file)
+        return File.basename(File.dirname(file))
+      end
     
-    		arr.each { |animefile|
-    			this_parent = parent animefile.path
-    			if this_parent != last_parent
-    				ret << this_parent
-    			end
-    			last_parent = this_parent
-    		}
-    		return ret
-    	end
+      #convert an AnimeFile array to a hash structured like
+      #(string)parent => (AnimeFile array)[child0, child1, child2] and return it
+      def makeHash arr
+        #return @empty_hash if arr[0] == nil
+        
+        keys = {}
+        hash = {}
+
+        arr.sort_by {|i| i.title}.each { |file|
+          if ! keys.key?(parent file.path)
+            key = AnimeSeries.new parent(file.path)
+            keys.merge! parent(file.path) => key
+            hash.merge! key => []
+          else
+            key = keys[parent file.path]
+          end
+
+          hash[key] << file
+          key += file
+        }
+        hash.sort_by{ |j| j[0].title }.to_h
+      end
     
-    	def logWatched(file)
-    		open(@pref.parseDir(@pref.get("watch_log")), 'a') do |f|
-    			f.puts %x(date).chomp + " ./" + File.basename(file) + " " + @watch_log_tag
-    		end
-    	end
+      #return the difference of getAired and getWatched
+      def unwatched
+        makeHash @@local_anime.reject { |f, a| a.seen? }.values
+      end
     
-    	def addWatched(file)
-    		@@local_anime[file].watch
-    		self.save
-    	end
+      #return an AnimeFile array of all mkvs in any dir specified in $pref["dirs"]
+      def items
+        makeHash @@local_anime.values
+      end
     
-    	def rmWatched(path = "zoz")
+      def logWatched(file)
+        open(@pref.parseDir(@pref.get("watch_log")), 'a') do |f|
+          f.puts %x(date).chomp + " ./" + File.basename(file) + " " + @watch_log_tag
+        end
+      end
     
-    		if @@local_anime.key? path
-    			@@local_anime[path].unwatch
-    			return
-    		end
+      def addWatched(file)
+        @@local_anime[file].watch
+        self.save
+        changed
+        notify_observers
+      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
-    	end
+      def rmWatched(path = "")
+        if @@local_anime.key? path
+          @@local_anime[path].unwatch
+          return
+        end
     
-    	#run mpv
-    	def watch(file)
-    		@mpvbridge.play file
-    	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
+        changed
+        notify_observers
+      end
+
+      def watch(file)
+        @mpvbridge.play file
+      end
+
     end
   end
 end