aniview 1.3.0 → 2.0.0

data/lib/aniview/interface/item.rb

@@ -1,17 +1,21 @@
-class Item
-	def initialize()
-		@attr = {}
-	end
-
-	def attributes
-		return @attr
-	end
-
-	def cereal
-		contents = ""
-		@attr.each{ |a|
-			contents += String(a[1])
-		}
-		return "cereal-"+contents
-	end
-end
+module Aniview
+  module Interface
+    class Item
+    	def initialize()
+    		@attr = {}
+    	end
+    
+    	def attributes
+    		return @attr
+    	end
+    
+    	def cereal
+    		contents = ""
+    		@attr.each{ |a|
+    			contents += String(a[1])
+    		}
+    		return "cereal-"+contents
+    	end
+    end
+  end
+end

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

@@ -1,80 +1,85 @@
 require 'mpv'
-require_relative '../../util/format'
+require_relative '../../util/util'
 
-class MPVBridge
-  def initialize pref
-    @pref = pref
-    connect
-  end
-
-  def quit!
-    @mpv.quit!
-  end
-
-  def connect
-    return unless @mpv == nil or @mpv.client.get_property("idle-active") == nil
-    @mpv = MPV::Session.new(user_args: @pref.get("mpv_args").split(" "))
-  end
-
-  def play file
-    connect
-    @playing_file = file
-    @mpv.client.command "loadfile", file.path
-  end
-
-  def playing?
-    @mpv.client.get_property("time-pos") != nil
-  end
-
-  def checkSetWatched percentage
-    if @playing_file != nil
-      swp = Integer(@pref.get "set_watched_percentage")
-      pct = Float(percentage)
-      if pct >= swp and not @playing_file.seen?
-        @playing_file.watch
+module Aniview
+  module Interface
+    class MPVBridge
+      include Aniview::Util
+      def initialize pref
+        @pref = pref
+        connect
       end
-    end
-  end
-
-  def attributes
-    if playing?
-
-      r = {}
-      props = [
-        "time-pos",
-        "percent-pos",
-        "duration"
-      ]
-      props.each { |prop|
-        prop_val = @mpv.client.get_property(prop)
-        prop_val = 0 if prop_val == nil
-        r.merge!(
-          prop[0] => prop_val
-        )
-      }
-
-      if @playing_file != nil
-        r.merge!("n" => @playing_file.attributes["t"])
-      else
-        r.merge!("n" => "loading")
+    
+      def quit!
+        @mpv.quit!
       end
-
-      checkSetWatched r["p"]
-
-      {
-        "t" => Format.format_duration(r["t"]),
-        "p" => Format.format_progress(r["p"]),
-        "d" => Format.format_duration(r["d"]),
-        "n" => r["n"]
-      }
-    else
-      {
-        "t" => "0:00",
-        "p" => "0",
-        "d" => "0:00",
-        "n" => "."
-      }
+    
+      def connect
+        return unless @mpv == nil or @mpv.client.get_property("idle-active") == nil
+        @mpv = MPV::Session.new(user_args: @pref.get("mpv_args").split(" "))
+      end
+    
+      def play file
+        connect
+        @playing_file = file
+        @mpv.client.command "loadfile", file.path
+      end
+    
+      def playing?
+        @mpv.client.get_property("time-pos") != nil
+      end
+    
+      def checkSetWatched percentage
+        if @playing_file != nil
+          swp = Integer(@pref.get "set_watched_percentage")
+          pct = Float(percentage)
+          if pct >= swp and not @playing_file.seen?
+            @playing_file.watch
+          end
+        end
+      end
+    
+      def attributes
+        if playing?
+    
+          r = {}
+          props = [
+            "time-pos",
+            "percent-pos",
+            "duration"
+          ]
+          props.each { |prop|
+            prop_val = @mpv.client.get_property(prop)
+            prop_val = 0 if prop_val == nil
+            r.merge!(
+              prop[0] => prop_val
+            )
+          }
+    
+          if @playing_file != nil
+            r.merge!("n" => @playing_file.attributes["t"])
+          else
+            r.merge!("n" => "loading")
+          end
+    
+          checkSetWatched r["p"]
+    
+          {
+            "t" => Util.format_duration(r["t"]),
+            "p" => Util.format_progress(r["p"]),
+            "d" => Util.format_duration(r["d"]),
+            "n" => r["n"]
+          }
+        else
+          {
+            "t" => "0:00",
+            "p" => "0",
+            "d" => "0:00",
+            "n" => "."
+          }
+        end
+      end
+    
     end
   end
-
 end

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

@@ -3,137 +3,140 @@ require 'json'
 
 require_relative 'prefitem'
 require_relative '../../view/color'
-require_relative '../../util/alogger'
 
-class Pref
-	def initialize
-
-		@home = Dir.home
-		@conf = @home + "/.config/aniview"
-
-		File.open(File.join(File.dirname(__FILE__), "/validate.json"), "r") {
-			|f| @validate = JSON.parse(f.read)
-		}
-
-		FileUtils.mkdir_p(@conf) unless File.directory?(@conf)
-
-		@pref_file = @conf + "/aniview.json"
-
-		self.defaults if not File.exist?(@pref_file)
-		self.load
-	end
-
-	def parseDir path
-    path = path.gsub("$airing_dir", @pref["airing_dir"])
-    path = path.gsub("$conf_dir", @pref["conf_dir"])
-		path = path.gsub("~", Dir.home)
-    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|
-            return false if not Dir.exist?(parseDir d)
-          }
-	
-				when "color"
-					return false if not Color.method_defined? destination
-	
-				when "int"
-					return false if not destination.scan(/\D/).empty? and destination.length > 1
-
-        when "locked"
-          return false
-
-			end
-
-			return true
-
-		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 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
+module Aniview
+  module Interface
+    class Pref
+    	def initialize
+    
+    		@home = Dir.home
+    		@conf = @home + "/.config/aniview"
+    
+    		File.open(File.join(File.dirname(__FILE__), "/validate.json"), "r") {
+    			|f| @validate = JSON.parse(f.read)
+    		}
+    
+    		FileUtils.mkdir_p(@conf) unless File.directory?(@conf)
+    
+    		@pref_file = @conf + "/aniview.json"
+    
+    		self.defaults if not File.exist?(@pref_file)
+    		self.load
+    	end
+    
+    	def parseDir path
+        path = path.gsub("$airing_dir", @pref["airing_dir"])
+        path = path.gsub("$conf_dir", @pref["conf_dir"])
+    		path = path.gsub("~", Dir.home)
+        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|
+                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 "locked"
+              return false
+    
+    			end
+    
+    			return true
+    
+    		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 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
+    end
+  end
 end