aniview 0.3.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f84d93b24636a62d6ce22d1f9849091921c181c
-  data.tar.gz: a231335941b316bc5c11e1f65f92f2df6b413956
+  metadata.gz: c3997c84f2c7fe4c76932df56e2974b8e7fcdfdd
+  data.tar.gz: de56d18cced70e4feb91ad1f54bbf6975eaaa761
 SHA512:
-  metadata.gz: 7781cf1761ba7187e1f890e4be9d810e23a9e4c55983ae19df2a27af93215c7862898adfbc3af1d2dcfa2bd1d44037318479b92b9a180ae0d0317b92004247cb
-  data.tar.gz: a313caffe6a8a5c04d9501f91af855a194936f9af9a4699b904b223a4cf43c57585520d042485105592eb2f0c176751293567b118d5f22899c379b659138b5dc
+  metadata.gz: e59457afc95892f3a5002bc9fa01d3433a39a831ea32c5382628939245c3f23e1125c829634f1760b830fc1f2edec1645c58ed9d2d43a30113ceb79060ff7a49
+  data.tar.gz: c51ed7a61437b2ed9bc3c7a8ea02e4b7b52a04c788bcfedcaa5e8baa54af72025e4ed9d0e29459a2b54b47029650ae825ce07db620cbf0737473383f2ec71a3c

data/lib/aniview.rb

@@ -1,6 +1,5 @@
 require 'highline'
 require 'highline/import'
-require 'json'
 require 'thread'
 require 'io/console'
 require 'warning'
@@ -10,30 +9,54 @@ Warning.ignore([:fixnum, :bignum])
 require_relative 'aniview/view/aiomenu'
 require_relative 'aniview/view/delugemenu'
 require_relative 'aniview/view/prefmenu'
+require_relative 'aniview/view/schedulemenu'
+require_relative 'aniview/view/subscriptionmenu'
 
 require_relative 'aniview/interface/animeio/animeio'
 require_relative 'aniview/interface/deluge/delugec'
 require_relative 'aniview/interface/pref/pref'
-require_relative 'aniview/interface/rssfeed/rssfeed'
+require_relative 'aniview/interface/subscription/subscription'
+require_relative 'aniview/interface/subscription/subscriptiondaemon'
+require_relative 'aniview/interface/schedule/schedule'
 
 require_relative 'aniview/util/alogger'
 require_relative 'aniview/util/command'
 require_relative 'aniview/util/term'
 
+require_relative 'aniview/client/aniclient'
+
 $stdout.sync = true
 
 class AniView
 	def initialize
 
-		@term = Term.new
+		@term     = Term.new
 		
 		@pref     = Pref.new
 
-		@aio     = AnimeIO.new(@pref)
-		@delugec = DelugeC.new(@pref)
-		#@rssfeed = RssFeed.new(@pref)
-		@l       = ALogger.new(@pref.parseTilde(@pref.get "log_file"))
-		@aiomenu = AioMenu.new(
+    $l        = ALogger.new(@pref.parseDir(@pref.get "log_file"), false)
+
+		@aio      = AnimeIO.new  @pref
+		
+    @schedule = Schedule.new @pref
+
+    @delugec  = DelugeC.new(@pref)
+
+    @c = AniClient.new @pref
+		
+    @subscription = Subscription.new(@pref, @schedule, @delugec, @c)
+
+    if not @c.server?
+      #puts "starting server"
+      process = fork do
+        require_relative 'aniviewd'
+        avd = AniViewd.new([])
+        avd.run
+      end
+      Process.detach(process)
+    end
+
+    @aiomenu = AioMenu.new(
 			refresh_function: :getAll,
 			interface:        @aio,
 			name:             @pref.get("menu_titles")["library"],
@@ -59,6 +82,26 @@ class AniView
 			term:             @term,
 			children:         false
 		)
+   
+    @schedulemenu = ScheduleMenu.new(
+      refresh_function: :getAll,
+      interface:        @schedule,
+      name:             @pref.get("menu_titles")["schedlue"],
+      pref:             @pref,
+      format:           "format_schedule",
+      term:             @term,
+      children:         false
+    )
+
+    @subscriptionmenu = SubscriptionMenu.new(
+      refresh_function: :getAll,
+      interface:        @subscription,
+      name:             @pref.get("menu_titles")["subscriptions"],
+      pref:             @pref,
+      format:           "format_subscriptions",
+      term:             @term,
+      children:         false
+    )
 
 		@term.save.hide_cursor.echo_off
 		
@@ -130,12 +173,18 @@ class AniView
 			elsif key == @pref.get("keybindings")["goto_torrents"]
 				@view = @delugemenu
 				@view.setName(@pref.get("menu_titles")["torrents"])
-				@view.setRfunc(:getTorrents)
 		
 			elsif key == @pref.get("keybindings")["goto_preferences"]
 				@view = @prefmenu
 				@view.setName(@pref.get("menu_titles")["preferences"])
-				@view.setRfunc(:getAll)
+
+      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, ":")

data/lib/aniview/client/aniclient.rb

@@ -0,0 +1,50 @@
+require 'socket'
+
+#require_relative '../interface/pref/pref'
+
+class AniClient
+  
+  def initialize(pref)
+    @pref = pref
+   # @pref = Pref.new if @pref == "no"
+  end
+
+  def connect
+    begin
+      TCPSocket.new 'localhost', @pref.get("daemon")["port"]
+    rescue Errno::ECONNREFUSED
+      return false
+    end
+  end
+
+  def sendMsg msg
+    begin
+      s = connect
+      return "" if s == false
+      s.puts msg
+      r = s.gets.chomp
+      s.close
+      return r
+    rescue Errno::ECONNRESET
+      return ""
+    end
+  end
+
+  def stopDaemon
+    sendMsg "quit"
+  end
+
+  def info
+    sendMsg "info"
+  end
+
+  def lastchecked
+    sendMsg "lastchecked"
+  end
+
+  def server?
+    return false unless sendMsg("up?") == "true"
+    return true  
+  end
+
+end

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

@@ -41,7 +41,7 @@ class AnimeIO
 		ret = {}
 		(@pref.get("anime_locations").split(":")).each { |dir|
 			
-			dir = @pref.parseTilde dir
+			dir = @pref.parseDir dir
 
 			Dir.glob("#{dir}*/*.{mkv,avi,mp4}").each { |file|
 				puts "indexing #{file}" if verbose
@@ -117,11 +117,6 @@ class AnimeIO
 				subarray
 			) => subarray
 		)
-		
-
-		#puts ret.inspect
-		#exit
-
 		return Hash[ret.sort_by{ |a| a[0].title}]
 	end
 
@@ -157,7 +152,7 @@ class AnimeIO
 	end
 
 	def logWatched(file)
-		open(@pref.parseTilde(@pref.get("watch_log")), 'a') do |f|
+		open(@pref.parseDir(@pref.get("watch_log")), 'a') do |f|
 			f.puts %x(date).chomp + " ./" + File.basename(file) + " " + @watch_log_tag
 		end
 	end

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

@@ -3,54 +3,151 @@ require_relative 'torrentitem'
 
 class DelugeC
 
-	def initialize pref
-		@pref = pref
-
-		host     = @pref.get("deluge_config")["host"]
-		login    = @pref.get("deluge_config")["login"]
-		password = @pref.get("deluge_config")["password"]
-
-		if (login == "" and password == "") and (host == "127.0.0.1" or host == "localhost")
-			la = localAuth
-			login = la[0]
-			password = la[1]
-			@pref.set(["deluge_config", "login"], login)
-			@pref.set(["deluge_config", "password"], password)
-		end
-
-		@client = Deluge::Rpc::Client.new(
-			host:     host,
-			port:     Integer(@pref.get("deluge_config")["port"]),
-			login:    @pref.get("deluge_config")["login"],
-			password: @pref.get("deluge_config")["password"]
-		)
-
-		@client.connect
-
-	end
-
-	def localAuth
-		authfile = Dir.home + "/.config/deluge/auth"
-		["", ""] if not File.exist? authfile
-		File.open(Dir.home + "/.config/deluge/auth") { |f| f.read }.split(":")
-	end
-
-	def getTorrents
-		return @client.core.get_torrents_status({}, ['name', 'progress', 'eta'])
-	end
-
-	def makeHash(arr)
-		ret = {}
-		arr.each{ |t|
-			tinfo = t[1]
-			torrent = TorrentItem.new(
-				name:     tinfo["name"],
-				progress: tinfo["progress"],
-				eta:      tinfo["eta"],
-			)
-			ret.merge!(torrent => torrent)
-		}
-		return ret
-	end
+  def initialize pref
+    @pref = pref
+
+    host     = @pref.get("deluge_config")["host"]
+    login    = @pref.get("deluge_config")["login"]
+    password = @pref.get("deluge_config")["password"]
+
+    if (login == "" and password == "") and (host == "127.0.0.1" or host == "localhost")
+      la = localAuth
+      login = la[0]
+      password = la[1]
+      @pref.set(["deluge_config", "login"], login)
+      @pref.set(["deluge_config", "password"], password)
+    end
+
+    @client = Deluge::Rpc::Client.new(
+      host:     host,
+      port:     Integer(@pref.get("deluge_config")["port"]),
+      login:    @pref.get("deluge_config")["login"],
+      password: @pref.get("deluge_config")["password"]
+    )
+
+    @status = "not connected"
+    @connected = false
+    connect
+
+  end
+
+  def getStatus
+    @status
+  end
+
+  def connect
+    begin
+      @status = "connected"
+      @client.connect
+      @connected = true
+    rescue Deluge::Rpc::Connection::RPCError
+      @status = "error connecting"
+      @connected = false
+    rescue RuntimeError
+      @status = "error connecting"
+      @client.close
+      @connected = false
+    end
+
+    @client.close unless @connected
+  end
+
+  def localAuth
+    authfile = Dir.home + "/.config/deluge/auth"
+    ["", ""] if not File.exist? authfile
+    File.open(Dir.home + "/.config/deluge/auth") { |f| f.read }.split(":")
+  end
+
+  def getTorrents
+    connect unless @connected
+    return {} unless @connected
+
+    tkeys = [
+      "name",
+      "progress",
+      "eta",
+      "paused",
+      "state",
+      "hash",
+      #"active_time",
+      #"is_finished",
+      #"max_connections",
+      #"max_download_speed",
+      #"max_upload_slots",
+      #"max_upload_speed",
+      #"message",
+      #"next_announce",
+      #"num_peers",
+      #"num_seeds",
+      #"remove_at_ratio",
+      #"save_path",
+      #"seeding_time",
+      #"seeds_peers_ratio",
+      #"seed_rank",
+      #"stop_at_ratio",
+      #"stop_ratio",
+      #"time_added",
+      #"upload_payload_rate",
+      #"comment",
+      #"file_priorities",
+      #"file_progress",
+      #"files",
+      #"is_seed",
+      #"num_files",
+      #"num_pieces",
+      #"peers",
+      #"piece_length",
+      #"private",
+      #"queue",
+      #"ratio",
+      #"total_size",
+      #"tracker_host"
+    ]
+
+    return @client.core.get_torrents_status({}, tkeys)
+  end
+
+  def toggleTorrent torrentItem
+    id = torrentItem.attributes["h"]
+    if torrentItem.attributes["u"]
+      @client.core.resume_torrent([id])
+    else
+      @client.core.pause_torrent([id])
+    end
+  end
+
+  def removeTorrent torrentItem, withData
+    id = torrentItem.attributes["h"]
+    @client.core.remove_torrent(id, withData)
+  end
+
+  def addTorrent mag, loc
+    connect unless @connected
+    return false unless @connected
+    begin
+      tid = @client.core.add_torrent_magnet(mag, {"download_location": loc})
+    rescue Deluge::Rpc::Connection::InvokeTimeoutError
+      tid = nil
+    end
+    return true if tid.class == String and tid.length > 1
+    return false
+  end
+
+  def makeHash(arr)
+    ret = {}
+    arr.each{ |t|
+      tinfo = t[1]
+      torrent = TorrentItem.new(
+        name:     tinfo["name"],
+        progress: tinfo["progress"],
+        eta:      tinfo["eta"],
+        paused:   tinfo["paused"], 
+        state:    tinfo["state"],
+        id:       tinfo["hash"]
+      )
+      ret.merge!(torrent => torrent)
+    }
+    return ret
+  end
 
 end

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

@@ -2,11 +2,14 @@ require_relative '../../util/format'
 require_relative '../item'
 
 class TorrentItem < Item
-	def initialize(name:, progress:, eta:)
+	def initialize(name:, progress:, eta:, paused:, state:, id:)
 		@attr = {
 			"n" => name,
 			"p" => Format.format_progress(progress),
 			"e" => Format.format_duration(eta),
+      "u" => paused,
+      "s" => state,
+      "h" => id
 		}
 	end
 

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

@@ -1,68 +1,97 @@
 {
-	"keybindings"                :
-	{
-		"goto_preferences"       : "0",
-		"goto_unwatched"         : "1",
-		"goto_library"           : "2",
-		"goto_torrents"          : "3",
-		"anime_set_watched"      : "Z",
-		"anime_set_unwatched"    : "u",
-		"anime_undo_set_watched" : "z",
-		"menu_nav_up"            : "up",
-		"menu_nav_down"          : "down",
-		"menu_nav_expand"        : "space"
-	},
-	"anime_locations"            : "~/anime/",
-	"clr"                        :
-	{
-		"main"                   : "blue",
-		"primary"                : "white",
-		"secondary"              : "cyan",
-		"selected"               : "red"
-	},
-	"menu_titles"                :
-	{
-		"unwatched"              : "unwatched",
-		"library"                : "anime library",
-		"torrents"               : "torrents",
-		"preferences"            : "preferences"
-	},
-	"format_library"             :
-	{
-		"title"                  : " %t @ %D %S ",
-		"parent"                 : " %t - %c@ %D %S ",
-		"child"                  : "  %t@ %D %S  "
-	},
-	"format_library_unwatched"   :
-	{
-		"title"                  : " %t @ $q@ %D %S ",
-		"parent"                 : " %t - %c@ %D %S ",
-		"child"                  : "  %t@ %D %S %r  "
-	},
-	"format_torrents"            :
-	{
-		"title"                  : " %t",
-		"parent"                 : " %n@ %p "
-	},
-	"format_preferences"         :
-	{
-		"title"                  : " %t",
-		"parent"                 : " %t@ %v "
-	},
-	"deluge_config"              :
-	{
-		"host"                   : "localhost",
-		"port"                   : "58846",
-		"login"                  : "",
-		"password"               : ""
-	},
-	"rss_feed"                   : 
-	{
-		"url"                    : "https://www.nyaa.se/?page=rss&cats=1_37&filter=1&term=",
-		"refresh_interval"       : "150"
-	},
-	"log_file"                   : "~/.aw/aw.log",
-	"watch_log"                  : "~/.aw/watchlog",
-	"watch_command"              : "mpv -alang jpn -slang eng -msg-level=all=fatal -ass",
-	"local_anime"                : null
+  "keybindings"                :
+  {
+    "goto_preferences"       : "0",
+    "goto_unwatched"         : "1",
+    "goto_library"           : "2",
+    "goto_torrents"          : "3",
+    "goto_schedule"          : "4",
+    "goto_subscriptions"     : "5",
+    "anime_set_watched"      : "Z",
+    "anime_set_unwatched"    : "u",
+    "anime_undo_set_watched" : "z",
+    "torrents_pause"         : "space",
+    "torrents_remove"        : "-",
+    "torrents_remove_data"   : "_",
+    "schedule_add_item"      : "+",
+    "schedule_delete_item"   : "-",
+    "schedule_edit_item"     : "enter",
+    "subscriptions_edit"     : "enter",
+    "menu_nav_up"            : "up",
+    "menu_nav_down"          : "down",
+    "menu_nav_expand"        : "space"
+  },
+  "anime_locations"            : "~/anime/:$airing_dir",
+  "airing_dir"                 : "~/anime/airing/",
+  "clr"                        :
+  {
+    "main"                   : "blue",
+    "primary"                : "white",
+    "secondary"              : "cyan",
+    "selected"               : "red"
+  },
+  "menu_titles"                :
+  {
+    "unwatched"              : "unwatched",
+    "library"                : "anime library",
+    "torrents"               : "torrents",
+    "preferences"            : "preferences",
+    "schedule"               : "schedule",
+    "subscriptions"          : "subscriptions"
+  },
+  "format_library"             :
+  {
+    "title"                  : " %t @ %D %S ",
+    "parent"                 : " %t - %c@ %D %S ",
+    "child"                  : "  %t@ %D %S  "
+  },
+  "format_library_unwatched"   :
+  {
+    "title"                  : " %t @ $q@ %D %S ",
+    "parent"                 : " %t - %c@ %D %S ",
+    "child"                  : "  %t@ %D %S %r  "
+  },
+  "format_torrents"            :
+  {
+    "title"                  : " %t - %s",
+    "parent"                 : " %n@ %p "
+  },
+  "format_schedule"            :
+  {
+    "title"                  : " %t",
+    "parent"                 : " %t@ %p "
+  },
+  "format_subscriptions"         :
+  {
+    "title"                  : " %t - %d@ last checked: %l ",
+    "parent"                 : " %f - /%r/@ %m "
+  },
+  "format_preferences"         :
+  {
+    "title"                  : " %t",
+    "parent"                 : " %t@ %v "
+  },
+  "deluge_config"              :
+  {
+    "host"                   : "localhost",
+    "port"                   : "58846",
+    "login"                  : "",
+    "password"               : ""
+  },
+  "rss_feed"                   : 
+  {
+    "url"                    : "https://nyaa.pantsu.cat/feed?c=3_5&s=1&max=100&userID=0&q=",
+    "refresh_interval"       : "150"
+  },
+  "daemon"                     :
+  {
+    "port"                   : "21312"
+  },
+  "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",
+  "local_anime"                : null,
+  "schedule"                   : []
 }