aniview 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3997c84f2c7fe4c76932df56e2974b8e7fcdfdd
-  data.tar.gz: de56d18cced70e4feb91ad1f54bbf6975eaaa761
+  metadata.gz: 2886da682b5b5671858688ae216011d2af04ed3a
+  data.tar.gz: b59ed72a1289d7a21eda2b4922674061702a267f
 SHA512:
-  metadata.gz: e59457afc95892f3a5002bc9fa01d3433a39a831ea32c5382628939245c3f23e1125c829634f1760b830fc1f2edec1645c58ed9d2d43a30113ceb79060ff7a49
-  data.tar.gz: c51ed7a61437b2ed9bc3c7a8ea02e4b7b52a04c788bcfedcaa5e8baa54af72025e4ed9d0e29459a2b54b47029650ae825ce07db620cbf0737473383f2ec71a3c
+  metadata.gz: c6943259e6c267341c73262ad702fb04bb489c46a88308127a7318b44aed913452a69c212a816cd9b5ac4761b5b1d436aa015708df78c91fe7879ec509c73eca
+  data.tar.gz: b5ff1b8ec8ca41dd1a85ca8771ff8ffeb2853a99fbf0469f55cf6f14a4252d4dbe2f097d352b308621a08621fd2929906046e754d0f8fa715f0946f67186ab79

data/bin/aniviewd

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+begin
+  require 'aniviewd'
+rescue LoadError
+  require_relative '../lib/aniviewd' if File.exist?(File.join(File.dirname(__FILE__), '../lib/aniviewd.rb'))
+end
+
+unless defined? AniViewd
+  puts "cant find aniviewd library" 
+  exit 
+end
+
+av = AniViewd.new(ARGV)
+
+process = fork do
+  av.run
+end
+
+Process.detach(process)

data/lib/aniview.rb

@@ -11,12 +11,13 @@ require_relative 'aniview/view/delugemenu'
 require_relative 'aniview/view/prefmenu'
 require_relative 'aniview/view/schedulemenu'
 require_relative 'aniview/view/subscriptionmenu'
+require_relative 'aniview/view/statusline'
 
 require_relative 'aniview/interface/animeio/animeio'
+require_relative 'aniview/interface/mpv/mpvbridge'
 require_relative 'aniview/interface/deluge/delugec'
 require_relative 'aniview/interface/pref/pref'
 require_relative 'aniview/interface/subscription/subscription'
-require_relative 'aniview/interface/subscription/subscriptiondaemon'
 require_relative 'aniview/interface/schedule/schedule'
 
 require_relative 'aniview/util/alogger'
@@ -30,19 +31,31 @@ $stdout.sync = true
 class AniView
 	def initialize
 
-		@term     = Term.new
+		@term         = Term.new
 		
-		@pref     = Pref.new
+		@pref         = Pref.new
 
-    $l        = ALogger.new(@pref.parseDir(@pref.get "log_file"), false)
+    $l            = ALogger.new(@pref.parseDir(@pref.get "log_file"), false)
 
-		@aio      = AnimeIO.new  @pref
+    @mpvbridge    = MPVBridge.new @pref
+
+		@aio          = AnimeIO.new  @pref, @mpvbridge
 		
-    @schedule = Schedule.new @pref
+    @schedule     = Schedule.new @pref
+
+    @delugec      = DelugeC.new @pref
+
+    @c            = AniClient.new @pref
+
+    @statusline   = StatusLine.new @pref, @term, @mpvbridge
 
-    @delugec  = DelugeC.new(@pref)
+    #file = "/Users/lattis/anime/Tekkonkinkreet/Tekkonkinkreet.mkv"
+    #@mpvbridge.play file
 
-    @c = AniClient.new @pref
+    #while true
+    #  @statusline.draw
+    #  sleep 1/45.0
+    #end
 		
     @subscription = Subscription.new(@pref, @schedule, @delugec, @c)
 
@@ -57,11 +70,11 @@ class AniView
     end
 
     @aiomenu = AioMenu.new(
-			refresh_function: :getAll,
+			refresh_function: :getUnwatched,
 			interface:        @aio,
-			name:             @pref.get("menu_titles")["library"],
+			name:             @pref.get("menu_titles")["unwatched"],
 			pref:             @pref,
-			format:           "format_library",
+			format:           "format_library_unwatched",
 			term:             @term
 		)
 		@prefmenu = PrefMenu.new(
@@ -109,7 +122,9 @@ class AniView
 
 	def cleanup
 		@mthread.exit if @mthread != nil
+    @statusthread.exit if @statusthread != nil
 		@term.reset
+    @mpvbridge.quit!
 		exit
 	end
 
@@ -126,9 +141,21 @@ class AniView
 		elsif cmd == "index"
 			@aio.index_anime :force => true, :verbose => true
 			@aiomenu.refresh
+    elsif cmd == "help"
+      print "\e[1;1H" + Color.white
+      puts "Help"
+      puts ""
+    else
+      print "\033[" + String(@term.rows) + ";1H" + Color.red + "error, unknown command"
+      @term.getKey
 		end
 	end
 
+  def changeView newView
+    @view = newView
+    @view.change_screen_size
+  end
+
 	def run
 
 		@view = @aiomenu
@@ -153,46 +180,71 @@ class AniView
 			end
 		end
 
+    @statusthread = Thread.new do
+      while true
+        if @shoulddraw
+          @statusline.draw
+        end
+        sleep 1/25.0
+      end
+    end
+
 		while true
-			@shoulddraw = true
-			key = @term.getKey
-			@shoulddraw = false
-		
-			if key == @pref.get("keybindings")["goto_unwatched"]
-				@view = @aiomenu
-				@view.setName(@pref.get("menu_titles")["unwatched"])
-				@view.setFormat("format_library_unwatched")
-				@view.setRfunc(:getUnwatched)
-		
-			elsif key == @pref.get("keybindings")["goto_library"]
-				@view = @aiomenu
-				@view.setName(@pref.get("menu_titles")["library"])
-				@view.setFormat("format_library")
-				@view.setRfunc(:getAll)
-
-			elsif key == @pref.get("keybindings")["goto_torrents"]
-				@view = @delugemenu
-				@view.setName(@pref.get("menu_titles")["torrents"])
-		
-			elsif key == @pref.get("keybindings")["goto_preferences"]
-				@view = @prefmenu
-				@view.setName(@pref.get("menu_titles")["preferences"])
+      @shoulddraw = true
+      key = @term.getKey
+      @shoulddraw = false
+
+      kb = @pref.get("keybindings")
+      nm = @pref.get("menu_titles")
+
+      case key
+      when kb["goto_unwatched"]
+        changeView @aiomenu
+        @view.setName nm["unwatched"]
+        @view.setFormat("format_library_unwatched")
+        @view.setRfunc(:getUnwatched)
+
+      when kb["goto_library"]
+        changeView @aiomenu
+        @view.setName nm["library"]
+        @view.setFormat("format_library")
+        @view.setRfunc(:getAll)
+
+      when kb["goto_torrents"]
+        changeView @delugemenu
+        @view.setName nm["torrents"]
+      when kb["goto_preferences"]
+        changeView @prefmenu
+        @view.setName nm["preferences"]
+      when kb["goto_schedule"]
+        changeView @schedulemenu
+        @view.setName nm["schedule"]
+      when kb["goto_subscriptions"]
+        changeView @subscriptionmenu
+        @view.setName nm["subscriptions"]
+      when ":"
+        runCommand Command.read(@term, ":")
+      when "q"
+        cleanup
+      end
 
-      elsif key == @pref.get("keybindings")["goto_schedule"]
-        @view = @schedulemenu
-        @view.setName(@pref.get("menu_titles")["schedule"])
 
-      elsif key == @pref.get("keybindings")["goto_subscriptions"]
-        @view = @subscriptionmenu
-        @view.setName(@pref.get("menu_titles")["subscriptions"])
-		
-			elsif key == ":"
-				cmd = Command.read(@term, ":")
-				self.runCommand cmd
 		
-			elsif key == "q"
-				self.cleanup
-			end
+			#if key == @pref.get("keybindings")["goto_unwatched"]
+			#	@view.setFormat("format_library_unwatched")
+			#	@view.setRfunc(:getUnwatched)
+		#
+			#elsif key == @pref.get("keybindings")["goto_library"]
+			#	@view.setFormat("format_library")
+			#	@view.setRfunc(:getAll)
+#
+			#elsif key == ":"
+			#	cmd = Command.read(@term, ":")
+			#	self.runCommand cmd
+		#
+			#elsif key == "q"
+			#	self.cleanup
+			#end
 		
 			@view.control(key)
 		end

data/lib/aniview/client/aniclient.rb

@@ -1,4 +1,6 @@
 require 'socket'
+require_relative '../util/serializer'
+
 
 #require_relative '../interface/pref/pref'
 
@@ -20,7 +22,7 @@ class AniClient
   def sendMsg msg
     begin
       s = connect
-      return "" if s == false
+      return "offline" if s == false
       s.puts msg
       r = s.gets.chomp
       s.close
@@ -42,6 +44,14 @@ class AniClient
     sendMsg "lastchecked"
   end
 
+  def getItems
+    Serializer.d(sendMsg "items")
+  end
+
+  def getAllCereal
+    sendMsg "itemshash"
+  end
+
   def server?
     return false unless sendMsg("up?") == "true"
     return true  

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

@@ -5,8 +5,9 @@ require_relative 'animeseries'
 
 class AnimeIO
 
-	def initialize(pref)
+	def initialize(pref, mpvbridge)
 		@pref = pref
+    @mpvbridge = mpvbridge
 		@empty_hash = {
 			"empty" => AnimeFile.new(
 				"empty",
@@ -179,6 +180,6 @@ class AnimeIO
 
 	#run mpv
 	def watch(file)
-		pid = spawn("#{@pref.get "watch_command"} '#{file}'")
+		@mpvbridge.play file
 	end
 end

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

@@ -36,17 +36,17 @@ class DelugeC
   end
 
   def connect
+    @connected = false
+    @status = "error connecting"
     begin
-      @status = "connected"
       @client.connect
-      @connected = true
     rescue Deluge::Rpc::Connection::RPCError
-      @status = "error connecting"
-      @connected = false
+      @client.close
     rescue RuntimeError
-      @status = "error connecting"
       @client.close
-      @connected = false
+    else
+      @status = "connected"
+      @connected = true
     end
 
     @client.close unless @connected
@@ -121,14 +121,20 @@ class DelugeC
     @client.core.remove_torrent(id, withData)
   end
 
-  def addTorrent mag, loc
+  def addTorrent mag, loc, verbose: false
     connect unless @connected
     return false unless @connected
+    puts "[delugec] connected!" if verbose
     begin
       tid = @client.core.add_torrent_magnet(mag, {"download_location": loc})
     rescue Deluge::Rpc::Connection::InvokeTimeoutError
+      puts "[delugec] Error: timeout error" if verbose
+      tid = nil
+    rescue Errno::EPIPE
+      puts "[delugec] Error: Errno::EPIPE" if verbose
       tid = nil
     end
+    p tid
     return true if tid.class == String and tid.length > 1
     return false
   end

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

@@ -0,0 +1,80 @@
+require 'mpv'
+require_relative '../../util/format'
+
+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
+      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" => 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" => "."
+      }
+    end
+  end
+
+end

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

@@ -47,14 +47,14 @@
   },
   "format_library_unwatched"   :
   {
-    "title"                  : " %t @ $q@ %D %S ",
+    "title"                  : " %t@ %D %S ",
     "parent"                 : " %t - %c@ %D %S ",
     "child"                  : "  %t@ %D %S %r  "
   },
   "format_torrents"            :
   {
     "title"                  : " %t - %s",
-    "parent"                 : " %n@ %p "
+    "parent"                 : " %n - %s@ %e %p\\% "
   },
   "format_schedule"            :
   {
@@ -71,6 +71,7 @@
     "title"                  : " %t",
     "parent"                 : " %t@ %v "
   },
+  "format_status"            : " %n - %t/%d@ %p ",
   "deluge_config"              :
   {
     "host"                   : "localhost",
@@ -87,11 +88,12 @@
   {
     "port"                   : "21312"
   },
+  "set_watched_percentage"   : "80",
   "log_file"                   : "$conf_dir/aw.log",
   "daemon_log_file"            : "$conf_dir/server.log",
   "watch_log"                  : "$conf_dir/watchlog",
   "conf_dir"                   : "~/.config/aniview",
-  "watch_command"              : "mpv -alang jpn -slang eng -msg-level=all=fatal -ass",
+  "mpv_args"                   : "--alang=jpn --slang=eng",
   "local_anime"                : null,
   "schedule"                   : []
 }