aniview 2.1.2 → 3.0.1

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

@@ -7,52 +7,36 @@ module Aniview
   module Interface
     class AnimeSeries < Item
       include Aniview::Util
-    	def initialize(_dir, children)
-    		@path     = _dir
-    		@children = children
-    
-    		dur = getDuration
-    		size = getSize
-    
-    		@attr = {
-    			"t" => String(@path),
-    			"c" => String(@children.length),
-    			"d" => dur,
-    			"D" => Util.format_duration(dur),
-    			"s" => size,
-    			"S" => Util.format_size(size),
-    		}
-    	end
-    	def getDuration
-    		dur = 0
-    		@children.each{ |child| 
-    			dur += child.attributes["d"]
-    		}
-    		return dur
-    	end
-    	
-    	def getSize
-    		size = 0
-    		@children.each{ |child| 
-    			size += child.attributes["s"]
-    		}
-    		return size
-    	end
-    
-    	def oldestChild
-    		oldest = DateTime.now.strftime('%Q')
-    		@children.each{ |child|
-    			
-    		}
-    	end
-    
-    	def title
-    		return @path
-    	end
+      
+      def initialize(path, children = [])
+        @path     = path
+
+        @attr = {
+          "t" => String(@path),
+          "c" => 0,
+          "d" => 0,
+          "s" => 0,
+        }
+
+        @children = children
+        @children.each { |c| self + c }
+      end
+
+      def + af
+        @attr["d"] += af.attr["d"]
+        @attr["D"]  = Util.format_duration @attr["d"]
+        @attr["s"] += af.attr["s"]
+        @attr["S"]  = Util.format_size     @attr["s"]
+        @attr["c"] += 1
+      end
+
+      def title
+        return @path
+      end
     
-    	def attributes
-    		return @attr
-    	end
+      def attributes
+        return @attr
+      end
     end
   end
 end

data/lib/aniview/interface/bridge.rb

@@ -0,0 +1,11 @@
+class Bridge
+
+  def make_hash
+    
+  end
+
+  def items
+
+  end
+
+end

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

@@ -3,11 +3,11 @@ require_relative 'torrentitem'
 
 module Aniview
   module Interface
-    class DelugeC
-    
+
+    class DelugeC < Bridge
+
       def initialize pref
         @pref = pref
-    
         host     = @pref.get("deluge_config")["host"]
         login    = @pref.get("deluge_config")["login"]
         password = @pref.get("deluge_config")["password"]
@@ -32,7 +32,7 @@ module Aniview
         connect
     
       end
-    
+
       def getStatus
         @status
       end
@@ -62,7 +62,7 @@ module Aniview
         File.open(Dir.home + "/.config/deluge/auth") { |f| f.read }.split(":")
       end
     
-      def getTorrents
+      def items
         connect unless @connected
         return {} unless @connected
     
@@ -108,7 +108,7 @@ module Aniview
           #"tracker_host"
         ]
     
-        return @client.core.get_torrents_status({}, tkeys)
+        makeHash @client.core.get_torrents_status({}, tkeys)
       end
     
       def toggleTorrent torrentItem
@@ -132,16 +132,22 @@ module Aniview
         begin
           tid = @client.core.add_torrent_magnet(mag, {"download_location": loc})
         rescue Deluge::Rpc::Connection::InvokeTimeoutError
-          puts "[delugec] Error: timeout error" if verbose
+          #puts "[delugec] Error: timeout error" if verbose
           tid = nil
         rescue Errno::EPIPE
-          puts "[delugec] Error: Errno::EPIPE" if verbose
+          #puts "[delugec] Error: Errno::EPIPE" if verbose
           tid = nil
         end
-        p tid
         return true if tid.class == String and tid.length > 1
+        addTorrentCli mag, loc
         return false
       end
+
+      def addTorrentCli mag, loc
+        cli_tool = @pref.get("deluge_config")["cli_executable"]
+        command = "add #{mag} -p #{Shellwords.escape loc}"
+        result = %x(#{cli_tool} '#{command}')
+      end
     
       def makeHash(arr)
         ret = {}
@@ -157,7 +163,7 @@ module Aniview
           )
           ret.merge!(torrent => torrent)
         }
-        return ret
+        ret
       end
     
     end

data/lib/aniview/interface/item.rb

@@ -1,6 +1,9 @@
 module Aniview
   module Interface
     class Item
+
+      attr_accessor :attr
+
     	def initialize()
     		@attr = {}
     	end

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

@@ -1,20 +1,47 @@
 require 'mpv'
 require_relative '../../util/util'
+require 'logger'
 
 module Aniview
   module Interface
     class MPVBridge
+
       include Aniview::Util
+
+      include Observable
+
+      attr_accessor :playing
+      attr_accessor :what_changed
+
       def initialize pref
         @pref = pref
         @mpv_enabled = true
+        @logger = Logger.new('mpv.log')
+        @logger.level = Logger::DEBUG
         connect
+        @what_changed = ""
+        @playing = false
       end
-    
+
+      def event_handler event
+        case event
+        when "start-file"
+          @playing = true
+          @what_changed = "playing_status"
+          changed
+          notify_observers
+        when "end-file"
+          @playing = false
+          @what_changed = "playing_status"
+          changed
+          notify_observers
+        end
+      end
+
       def 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
@@ -22,6 +49,7 @@ module Aniview
         @mpv_enabled = false
         begin
           @mpv = MPV::Session.new(user_args: @pref.get("mpv_args").split(" "))
+          @mpv.callbacks << MPV::Callback.new(self, :event_handler)
         rescue MPV::MPVNotAvailableError
         rescue MPV::MPVUnsupportedFlagError
         else
@@ -34,11 +62,11 @@ module Aniview
         connect
         @playing_file = file
         @mpv.client.command "loadfile", file.path
+        @playing = true
       end
     
       def playing?
-        return false unless @mpv_enabled
-        @mpv.client.get_property("time-pos") != nil
+        @playing
       end
     
       def checkSetWatched percentage
@@ -47,13 +75,15 @@ module Aniview
           pct = Float(percentage)
           if pct >= swp and not @playing_file.seen?
             @playing_file.watch
+            @what_changed = "local_anime"
+            changed
+            notify_observers
           end
         end
       end
     
       def attributes
         if playing?
-    
           r = {}
           props = [
             "time-pos",
@@ -80,14 +110,14 @@ module Aniview
             "t" => Util.format_duration(r["t"]),
             "p" => Util.format_progress(r["p"]),
             "d" => Util.format_duration(r["d"]),
-            "n" => r["n"]
+            "n" => r["n"],
           }
         else
           {
-            "t" => "0:00",
+            "t" => "-",
             "p" => "0",
             "d" => "0:00",
-            "n" => "."
+            "n" => ".",
           }
         end
       end

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

@@ -71,24 +71,25 @@
     "title"                  : " %t",
     "parent"                 : " %t@ %v "
   },
-  "format_status"            : " %n - %t/%d@ %p ",
+  "format_status"            : " %n - %t/%d@ %p\\% ",
   "deluge_config"              :
   {
     "host"                   : "localhost",
     "port"                   : "58846",
     "login"                  : "",
-    "password"               : ""
+    "password"               : "",
+    "cli_executable"         : "/Applications/Deluge.app/Contents/MacOS/deluge-console"
   },
   "rss_feed"                   : 
   {
-    "url"                    : "https://nyaa.pantsu.cat/feed?c=3_5&s=1&max=100&userID=0&q=",
-    "refresh_interval"       : "150"
+    "url"                    : "https://www.tokyotosho.info/rss.php?filter=1&minMB=100&maxMB=500&reversepolarity=1&entries=300",
+    "refresh_interval"       : "300"
   },
   "daemon"                     :
   {
     "port"                   : "21312"
   },
-  "set_watched_percentage"   : "80",
+  "set_watched_percentage"     : "80",
   "log_file"                   : "$conf_dir/aw.log",
   "daemon_log_file"            : "$conf_dir/server.log",
   "watch_log"                  : "$conf_dir/watchlog",

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

@@ -3,12 +3,15 @@ require 'json'
 
 require_relative 'prefitem'
 require_relative '../../view/color'
+require_relative '../bridge'
 
 module Aniview
   module Interface
-    class Pref
+    class Pref < Bridge
+
+      include Observable
+
       def initialize
-    
         @home = Dir.home
         @conf = @home + "/.config/aniview"
     
@@ -17,11 +20,13 @@ module Aniview
         }
     
         FileUtils.mkdir_p(@conf) unless File.directory?(@conf)
-    
+
         @pref_file = @conf + "/aniview.json"
+
+        @saving = false
     
-        self.defaults if not File.exist?(@pref_file)
-        self.load
+        defaults should_save: true if not File.exist?(@pref_file)
+        load
       end
     
       def parseDir path
@@ -32,9 +37,9 @@ module Aniview
         return path
       end
     
-      def defaults(should_save:true)
+      def defaults(should_save:false)
         File.open(File.join(File.dirname(__FILE__), "/defaults.json"), "r") {|f| @pref = JSON.parse(f.read)}
-        self.save if should_save
+        save if should_save
       end
     
       def set(s, val)
@@ -42,9 +47,10 @@ module Aniview
         trail = s   if s.class == Array
         if valpref(trail, val, @validate)
           @pref = setpref(trail, val, @pref)
+          save
+          changed
+          notify_observers
         end
-    
-        save
       end
     
       def setpref(trail, destination, map)
@@ -103,13 +109,13 @@ module Aniview
       def get s
         return @pref[s] if @pref.key?(s)
       end
-    
-      def getAll
+
+      def items
         ignore = {
           "local_anime" => true,
           "schedule" => true,
         }
-    
+
         r = {}
         @pref.each{ |item| 
           next if ignore.key? item[0]
@@ -130,17 +136,35 @@ module Aniview
         }
         return r
       end
-    
+
       def save
+        @saving = true
         File.open(@pref_file, "w") { |f| f.write(JSON.pretty_generate(@pref)) }
+        @saving = false
+      end
+
+      def saving?
+        @saving
       end
       
       def load
         begin
-          File.open(@pref_file, "r") {|f| @pref = JSON.parse(f.read)}
-          #rescue JSON::ParserError
-          #defaults should_save: false
+          #json = ""
+          json = File.open(@pref_file, "r") {|f| f.read}
+          #puts json
+          if json == ""
+            #puts "going to defaults"
+            defaults
+            return
+          end
+          @pref = JSON.parse json
+        rescue JSON::ParserError
+          puts "severe! your preference file #{@pref_file} is corrupted,"
+          puts "please fix the file or delete it to restore defaults"
+          exit
         end
+        changed
+        notify_observers
       end
     end
   end

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

@@ -78,7 +78,8 @@
 		"host"                   : "any",
 		"port"                   : "int",
 		"login"                  : "any",
-		"password"               : "any"
+		"password"               : "any",
+    "cli_executable"         : "any"
 	},
 	"rss_feed"                   : 
 	{

data/lib/aniview/interface/schedule/schedule.rb

@@ -2,13 +2,18 @@ require 'fileutils'
 
 require_relative 'scheduleitem'
 require_relative '../../util/util'
+require_relative '../bridge'
 
 module Aniview
   module Interface
-    class Schedule
+    class Schedule < Bridge
 
       include Aniview::Util
 
+      include Observable
+
+      attr_accessor :schedule
+
       def initialize pref
         @pref = pref
         load
@@ -21,20 +26,20 @@ module Aniview
         end
       end
     
-      def getAll
+      def items
         empty?
-        return @schedule
+        @schedule.map{ |t| [t,t] }.to_h
       end
     
       def getAllCereal
         r=""
         getAll.each { |si| r+=si.cereal }
-        return r
+        r
       end
     
-      def mergeItems items
-        items.each { |item| 
-          @schedule.each { |schedule_item| 
+      def mergeItems _items
+        _items.each { |item|
+          @schedule.each { |schedule_item|
             if item.id == schedule_item.id
               m = [schedule_item.attributes["m"], item.attributes["m"]]
               if m[0] != m[1]
@@ -63,7 +68,7 @@ module Aniview
         @schedule[loc].setTitle val
         new_dir = @pref.parseDir @schedule[loc].attributes["p"]
     
-        FileUtils.mv old_dir, new_dir unless old_dir == new_dir
+        FileUtils.mv old_dir, new_dir unless old_dir.downcase == new_dir.downcase
     
         save
       end
@@ -75,10 +80,12 @@ module Aniview
     
       def save
         @pref.set "schedule", (Util.encode_object @schedule)
+        changed
+        notify_observers
       end
       
       def load
-        @pref.load
+        #@pref.load
         raw = @pref.get "schedule"
         if not raw == nil and raw.class == String
           @schedule = Util.decode_object raw
@@ -86,15 +93,7 @@ module Aniview
           empty?
         end
       end
-    
-      def makeHash(arr)
-        ret = {}
-        arr.each{ |t|
-          ret.merge!(t => t)
-        }
-        return ret
-      end
-    
+
     end
   end
 end