aniview 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2886da682b5b5671858688ae216011d2af04ed3a
-  data.tar.gz: b59ed72a1289d7a21eda2b4922674061702a267f
+  metadata.gz: 76fe86faf6063dc4aefae602dce65dc59b0563a6
+  data.tar.gz: 0bc9c727056c4b7ce31daea1aeed4e5e89668c4f
 SHA512:
-  metadata.gz: c6943259e6c267341c73262ad702fb04bb489c46a88308127a7318b44aed913452a69c212a816cd9b5ac4761b5b1d436aa015708df78c91fe7879ec509c73eca
-  data.tar.gz: b5ff1b8ec8ca41dd1a85ca8771ff8ffeb2853a99fbf0469f55cf6f14a4252d4dbe2f097d352b308621a08621fd2929906046e754d0f8fa715f0946f67186ab79
+  metadata.gz: 801a40242ad37834ebbe5e86f5705bab97bb0d17e5da2bc60f33c79fd443e8efe024b5752e573258ffd1b29c49f5ab047ee171c066f939cd721249e4044f148c
+  data.tar.gz: 82d13c551202d58ef28eaf09eac30041fbfa3f1f904627d43ad2f3616ace509140df747631c2f26a8957ddb151d3d17cbd9a200483dd59dffbceefa04960fdfd

data/bin/aniview

@@ -6,10 +6,9 @@ rescue LoadError
 	require_relative '../lib/aniview' if File.exist?(File.join(File.dirname(__FILE__), '../lib/aniview.rb'))
 end
 
-unless defined? AniView
+unless defined? Aniview
 	puts "cant find aniview library" 
 	exit 
 end
 
-av = AniView.new
-av.run
+Aniview::main(ARGV)

data/lib/aniview.rb

@@ -1,252 +1,59 @@
-require 'highline'
-require 'highline/import'
-require 'thread'
-require 'io/console'
-require 'warning'
-
-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/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/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
-		
-		@pref         = Pref.new
-
-    $l            = ALogger.new(@pref.parseDir(@pref.get "log_file"), false)
-
-    @mpvbridge    = MPVBridge.new @pref
-
-		@aio          = AnimeIO.new  @pref, @mpvbridge
-		
-    @schedule     = Schedule.new @pref
-
-    @delugec      = DelugeC.new @pref
-
-    @c            = AniClient.new @pref
-
-    @statusline   = StatusLine.new @pref, @term, @mpvbridge
-
-    #file = "/Users/lattis/anime/Tekkonkinkreet/Tekkonkinkreet.mkv"
-    #@mpvbridge.play file
+require_relative 'application'
+require_relative 'daemon'
+
+# Main namespace for Aniview and all its classes
+module Aniview
+
+  def self.show_help
+    puts "aniview"
+    puts "-h : show this message"
+    puts "-d <command> : send a command to the daemon"
+    puts "    help     : show help"
+    puts "    start    : start the daemon"
+    puts "    stop     : stop the daemon"
+    puts "    info     : show daemon info"
+    puts "    up?      : check if the daemon is up"
+    puts "    nani     : ###"
+    puts "    items    : check the daemon's items"
+  end
 
-    #while true
-    #  @statusline.draw
-    #  sleep 1/45.0
-    #end
-		
-    @subscription = Subscription.new(@pref, @schedule, @delugec, @c)
+  # initializes either the application or the daemon with given arguments
+  # @param      argv  an array of arguments, if -d is supplied, the remaining
+  #                   arguments will be passed on to the daemon
+  #
+  # @return     nil
+  #
+  def self.main argv
+
+    main_class = nil
+    daemonize  = false
+
+    argv.each { |arg|
+      case arg
+      when "-d"
+        argv.delete_at(0)
+        main_class = Aniview::Daemon.new(argv)
+      when "-h"
+        self.show_help
+        exit
+      else
+        puts "unknown argument #{arg}"
+        self.show_help
+        exit
+      end
+    }
+    
+    main_class = Aniview::Application.new if main_class == nil
 
-    if not @c.server?
-      #puts "starting server"
+    if daemonize
       process = fork do
-        require_relative 'aniviewd'
-        avd = AniViewd.new([])
-        avd.run
+        main_class.run
       end
+      
       Process.detach(process)
-    end
-
-    @aiomenu = AioMenu.new(
-			refresh_function: :getUnwatched,
-			interface:        @aio,
-			name:             @pref.get("menu_titles")["unwatched"],
-			pref:             @pref,
-			format:           "format_library_unwatched",
-			term:             @term
-		)
-		@prefmenu = PrefMenu.new(
-			refresh_function: :getAll,
-			interface:        @pref,
-			name:             @pref.get("menu_titles")["preferences"],
-			pref:             @pref,
-			format:           "format_preferences",
-			term:             @term,
-			children:         false
-		)
-		@delugemenu = DelugeMenu.new(
-			refresh_function: :getTorrents,
-			interface:        @delugec,
-			name:             @pref.get("menu_titles")["torrents"],
-			pref:             @pref,
-			format:           "format_torrents",
-			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
-		
-	end
-
-	def cleanup
-		@mthread.exit if @mthread != nil
-    @statusthread.exit if @statusthread != nil
-		@term.reset
-    @mpvbridge.quit!
-		exit
-	end
-
-	def runCommand(cmds)
-		cmd_s = cmds.split
-		cmd = cmd_s[0]
-		if cmd == "quit"
-			self.cleanup
-		elsif cmd == "sync"
-			#alist = Anilist.new
-			#alist.sync
-		elsif cmd == "pref"
-			@pref.set cmd_s[1], cmd_s[2]
-		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
-
-		mutex = Mutex.new
-		Signal.trap('SIGWINCH', proc { 
-			Thread.new { mutex.synchronize { @view.change_screen_size } } 
-		} )
-
-		key = ""
-		@view.refresh
-		@shoulddraw = true
-
-		Thread.abort_on_exception = true
-		@mthread = Thread.new do
-			while true
-				if @shoulddraw
-					@view.draw
-					@view.refresh
-				end
-				sleep 1/45.0
-			end
-		end
-
-    @statusthread = Thread.new do
-      while true
-        if @shoulddraw
-          @statusline.draw
-        end
-        sleep 1/25.0
-      end
+      main_class.run
     end
+  end
 
-		while true
-      @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
-
-
-		
-			#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
-	end
 end

data/lib/aniview/client/aniclient.rb

@@ -1,60 +1,118 @@
 require 'socket'
-require_relative '../util/serializer'
+require_relative '../util/util'
 
 
-#require_relative '../interface/pref/pref'
+module Aniview
+  module Client
+    class AniClient
+      include Aniview::Util
+      
+      # initializes a new AniClient @
+      #
+      # @param      pref  see preferences
+      #
+      # @return     nil
+      #
+      def initialize(pref)
+        @pref = pref
+      end
 
-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 "offline" if s == false
-      s.puts msg
-      r = s.gets.chomp
-      s.close
-      return r
-    rescue Errno::ECONNRESET
-      return ""
+      # connects to aniview daemon
+      #
+      # @return     [TCPSocket, false] false if unsuccessful
+      #
+      def connect
+        begin
+          TCPSocket.new 'localhost', @pref.get("daemon")["port"]
+        rescue Errno::ECONNREFUSED
+          return false
+        end
+      end
+    
+      # sends message to aniview daemon
+      #
+      # @param      msg   the message to send
+      #
+      # @return     the daemons response, or "" if there is an error.  If the
+      #             daemon is offline, "offline" is returned
+      #
+      def sendMsg msg
+        begin
+          s = connect
+          return "offline" if s == false
+          s.puts msg
+          r = s.gets.chomp
+          s.close
+          return r
+        rescue Errno::ECONNRESET
+          return ""
+        end
+      end
+    
+      # sends the message "quit" to the daemon
+      # 
+      # see #sendMsg
+      #
+      # @return     "okay"
+      #
+      def stopDaemon
+        sendMsg "quit"
+      end
+    
+      # sends the message "info" to the daemon 
+      # 
+      # see #sendMsg
+      #
+      # @return     daemon info string including uptime and number of loops and
+      #             matches
+      #
+      def info
+        sendMsg "info"
+      end
+    
+      # sends the message "lastchecked" to the daemon
+      # 
+      # see #sendMsg
+      #
+      # @return     string of the last time the daemon checked the rss feed for
+      #             new matches
+      #
+      def lastchecked
+        sendMsg "lastchecked"
+      end
+    
+      # sends the message "items" to the daemon and decodes the serialized
+      # object using Util.decode_object
+      # 
+      # see #sendMsg
+      #
+      # @return     The items.
+      #
+      def getItems
+        Util.decode_object(sendMsg "items")
+      end
+    
+      # sends the message "itemshash" to the daemon
+      # 
+      # see #sendMsg
+      #
+      # @return     item.cereal of all items
+      #
+      def getAllCereal
+        sendMsg "itemshash"
+      end
+    
+      # checks if the server is online (sends message "up?" to the daemon)
+      #
+      # see #sendMsg
+      #
+      # @return     [true, false]
+      #
+      def server?
+        return false unless sendMsg("up?") == "true"
+        return true  
+      end
+    
     end
   end
-
-  def stopDaemon
-    sendMsg "quit"
-  end
-
-  def info
-    sendMsg "info"
-  end
-
-  def lastchecked
-    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  
-  end
-
 end