aniview 1.3.0 → 2.0.0

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

@@ -1,75 +1,84 @@
 require 'streamio-ffmpeg'
 require 'date'
 
-require_relative '../../util/format'
+require_relative '../../util/util'
 require_relative '../item'
 
-class AnimeFile < Item
-	def initialize(path_, seen = false)
-		@watched = seen
-		@watched_on = 0
-		@path = path_
+module Aniview
+  module Interface
+    class AnimeFile < Item
 
-		if (@path == "empty")
-			@attr = {
-				"t" => "empty",
-				"d" => 0,
-				"D" => "0",
-				"s" => 0,
-				"S" => "0",
-				"r" => 0x0,
-				"a" => "n.a.",
-				"v" => "",
-				"l" => "",
-				"f" => "",
-				"b" => "",
-			} 
-		else
-			mov = FFMPEG::Movie.new(@path)
-	
-			@attr = {
-				"t" => self.string,
-				"d" => mov.duration,
-				"D" => Format.format_duration(mov.duration),
-				"s" => mov.size,
-				"S" => Format.format_size(mov.size),
-				"r" => mov.resolution,
-				"a" => mov.audio_codec,
-				"v" => mov.video_codec,
-				"l" => mov.colorspace,
-				"f" => mov.frame_rate,
-				"b" => String(mov.bitrate) + "kb/s",
-			}
-		end
+      include Aniview::Util
 
-	end
+      attr_accessor :last_modified
+      attr_accessor :path
 
-	def seen?
-		return @watched
-	end
+      def initialize(path_, seen = false)
+        @watched = seen
+        begin
+          @last_modified = File::Stat.new(path_).mtime
+        rescue Errno::ENOENT
+          @last_modified = "0"
+        end
+        @watched_on = 0
+        @path = path_
 
-	def seenOn
-		return @watched_on
-	end
+        @attr = {
+          "t" => "empty",
+          "d" => 0,
+          "D" => "0",
+          "s" => 0,
+          "S" => "0",
+          "r" => 0x0,
+          "a" => "n.a.",
+          "v" => "",
+          "l" => "",
+          "f" => "",
+          "b" => "",
+        }
+    
+        if (@path == "empty")
+        else
+          mov = FFMPEG::Movie.new(@path)
+      
+          @attr = {
+            "t" => self.string,
+            "d" => mov.duration,
+            "D" => Util.format_duration(mov.duration),
+            "s" => mov.size,
+            "S" => Util.format_size(mov.size),
+            "r" => mov.resolution,
+            "a" => mov.audio_codec,
+            "v" => mov.video_codec,
+            "l" => mov.colorspace,
+            "f" => mov.frame_rate,
+            "b" => String(mov.bitrate) + "kb/s",
+          }
+        end
+    
+      end
+    
+      def seen?
+        return @watched
+      end
+    
+      def seenOn
+        return @watched_on
+      end
+    
+      def watch
+        @watched = true
+        @watched_on = DateTime.now.strftime('%Q')
+      end
+    
+      def unwatch
+        @watched = false
+      end
+      
+      def string
+        return (File.basename("#{@path}").gsub(/\s*\[.+?\]\s*/) {}).gsub(/(\.mkv)|(\.avi)|(\.mp4)/, "").gsub("_", " ").gsub(/\s*\(.+?\)\s*/) {}
+      end
 
-	def watch
-		@watched = true
-		@watched_on = DateTime.now.strftime('%Q')
-	end
-
-	def unwatch
-		@watched = false
-	end
-
-	def path
-		return @path
-	end
-	
-	def string
-		return (File.basename("#{@path}").gsub(/\s*\[.+?\]\s*/) {}).gsub(/(\.mkv)|(\.avi)|(\.mp4)/, "").gsub("_", " ").gsub(/\s*\(.+?\)\s*/) {}
-	end
-
-	def attributes
-		return @attr
-	end
+    end
+  end
 end

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

@@ -1,185 +1,188 @@
 require 'mkmf'
-require 'base64'
+require 'fileutils'
 require_relative 'animefile'
 require_relative 'animeseries'
-
-class AnimeIO
-
-	def initialize(pref, mpvbridge)
-		@pref = pref
-    @mpvbridge = mpvbridge
-		@empty_hash = {
-			"empty" => AnimeFile.new(
-				"empty",
-				{
-					"d" => 0,
-					"s" => 0,
-					"r" => "0x0",
-					"a" => "n/a"
-				}
-			)
-		}
-		@watch_log_tag = "♪"
-
-		self.load
-		index_anime
-	end
-
-	def save
-		@pref.set "local_anime", Base64.encode64(Marshal.dump @@local_anime)
-	end
-	
-	def load
-		raw = @pref.get "local_anime"
-		if not raw == nil and raw.class == String
-			@@local_anime = Marshal.load(Base64.decode64(raw))
-		else
-			@@local_anime = {}
-		end
-	end
-
-	def index_anime(force: false, verbose: false)
-		ret = {}
-		(@pref.get("anime_locations").split(":")).each { |dir|
-			
-			dir = @pref.parseDir dir
-
-			Dir.glob("#{dir}*/*.{mkv,avi,mp4}").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?
-					if not force
-						ret.merge!(file => @@local_anime[file])
-						next
-					end
-				end
-				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
-
-		self.save
-	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
-				ret.merge!(
-					AnimeSeries.new(
-						last_parent,
-						subarray
-					) => subarray)
-				subarray = [animefile]
-			else
-				subarray << animefile
-			end
-			
-			last_parent = this_parent
-
-		}
-		ret.merge!( 
-			AnimeSeries.new(
-				parent(sarr[sarr.length - 1].path),
-				subarray
-			) => subarray
-		)
-		return Hash[ret.sort_by{ |a| a[0].title}]
-	end
-
-	#return the difference of getAired and getWatched
-	def getUnwatched
-		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
-		return @@local_anime.values
-	end
-
-	def getAllSeries
-		arr = getAll
-
-		last_parent = parent arr[0].path
-		ret = [ last_parent ]
-
-		arr.each { |animefile|
-			this_parent = parent animefile.path
-			if this_parent != last_parent
-				ret << this_parent
-			end
-			last_parent = this_parent
-		}
-		return ret
-	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
-
-	def addWatched(file)
-		@@local_anime[file].watch
-		self.save
-	end
-
-	def rmWatched(path = "zoz")
-
-		if @@local_anime.key? path
-			@@local_anime[path].unwatch
-			return
-		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
-
-	#run mpv
-	def watch(file)
-		@mpvbridge.play file
-	end
+require_relative '../../util/util'
+
+module Aniview
+  module Interface
+    include Aniview::Util
+    class AnimeIO
+    	def initialize(pref, mpvbridge)
+    		@pref = pref
+        @mpvbridge = mpvbridge
+    		@empty_hash = {
+    			"empty" => AnimeFile.new(
+    				"empty"
+    			)
+    		}
+    		@watch_log_tag = "♪"
+    
+    		self.load
+    		index_anime
+    	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 index_anime(force: false, verbose: false)
+    		ret = {}
+    		(@pref.get("anime_locations").split(":")).each { |dir|
+    			
+    			dir = @pref.parseDir dir
+
+          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
+    				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
+    
+    		self.save
+    	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
+    				ret.merge!(
+    					AnimeSeries.new(
+    						last_parent,
+    						subarray
+    					) => subarray)
+    				subarray = [animefile]
+    			else
+    				subarray << animefile
+    			end
+    			
+    			last_parent = this_parent
+    
+    		}
+    		ret.merge!( 
+    			AnimeSeries.new(
+    				parent(sarr[sarr.length - 1].path),
+    				subarray
+    			) => subarray
+    		)
+    		return Hash[ret.sort_by{ |a| a[0].title}]
+    	end
+    
+    	#return the difference of getAired and getWatched
+    	def getUnwatched
+    		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
+    		return @@local_anime.values
+    	end
+    
+    	def getAllSeries
+    		arr = getAll
+    
+    		last_parent = parent arr[0].path
+    		ret = [ last_parent ]
+    
+    		arr.each { |animefile|
+    			this_parent = parent animefile.path
+    			if this_parent != last_parent
+    				ret << this_parent
+    			end
+    			last_parent = this_parent
+    		}
+    		return ret
+    	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
+    
+    	def addWatched(file)
+    		@@local_anime[file].watch
+    		self.save
+    	end
+    
+    	def rmWatched(path = "zoz")
+    
+    		if @@local_anime.key? path
+    			@@local_anime[path].unwatch
+    			return
+    		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
+    
+    	#run mpv
+    	def watch(file)
+    		@mpvbridge.play file
+    	end
+    end
+  end
 end