aniview 2.1.2 → 3.0.1

data/lib/aniview/view/prefmenu.rb

@@ -5,34 +5,18 @@ module Aniview
   module View
     class PrefMenu < Menu
       include Aniview::Util
-    	def refresh
-    		@items = @interface.send(@refresh_function)
     
-    		@attributes = {
-    			"t" => @attributes["t"],
-    		}
-    
-    		@expanded = -1 if @items.values[@expanded] == nil
-    		fixCursor
-    	end
-    
-    	def customControl(key, sel)
-    		path = @items.values[sel["out"]][0].path
-    		title = @items.keys[sel["out"]].attributes["t"]
-    		value = @items.keys[sel["out"]].attributes["v"]
-    
-    		if key == "space"
-    			#expand(sel["out"])
-    		elsif key == "r"
-    			refresh
-    		elsif key == "enter"
-    
-    			newval = Util.readline(@term, title + ":", value)
-    
-    			@interface.set(path, newval)
-    			refresh
-    		end
-    	end
+      def customControl(key, sel)
+        return if @items.keys[sel["out"]].attributes["t"] == ""
+        path =  @items.values[sel["out"]][0].path
+        title = @items.keys[sel["out"]].attributes["t"]
+        value = @items.keys[sel["out"]].attributes["v"]
+        if key == "enter"
+          newval = Util.readline(@term, title + ":", value)
+          @interface.set(path, newval)
+          refresh
+        end
+      end
     end
   end
 end

data/lib/aniview/view/schedulemenu.rb

@@ -5,16 +5,6 @@ module Aniview
   module View
     class ScheduleMenu < Menu
       include Aniview::Util
-      def refresh
-        @items = @interface.makeHash @interface.send(@refresh_function)
-    
-        @attributes = {
-          "t" => @attributes["t"],
-        }
-    
-        @expanded = -1 if @items.values[@expanded] == nil
-        fixCursor
-      end
     
       def customControl(key, sel)
     
@@ -33,7 +23,6 @@ module Aniview
         
         end
       end
-    
     end
   end
 end

data/lib/aniview/view/statusline.rb

@@ -4,20 +4,57 @@ require_relative 'color'
 module Aniview
   module View
     class StatusLine
+      
       include Aniview::Util
+      include Observable
+
       def initialize pref, term, mpvbridge
         @term = term
         @pref = pref
         @mpvbridge = mpvbridge
+
+        @mpvbridge.add_observer(self, :draw)
+
         @clr = Aniview::View::Color.public_send(@pref.get("clr")["main"])
+        reset_message
       end
-    
+
+      def message msg, display_for: 1, color: "red"
+        @message = {
+          "text"    => msg,
+          "linger"  => display_for,
+          "color"   => color
+        }
+        changed
+        notify_observers
+      end
+
+      def reset_message
+        @message = {
+          "text"    => nil,
+          "linger"  => 0,
+          "color"   => "red"
+        }
+        changed
+        notify_observers
+      end
+
+      def print_row line
+        print "\e[#{@term.rows - 1};1H" + @clr + line + "\e[K\nq\e[2K"
+      end
+
       def draw
-        status_row = @term.rows - 1
-        line = Util.parse_format @pref.get("format_status"), @mpvbridge.attributes, @term.cols
-        #p @mpvbridge.attributes
-        print "\e[#{status_row};1H" + @clr + line + "\e[K\n\e[2K"
+        if @message["text"] == nil
+          line = Util.parse_format @pref.get("format_status"), @mpvbridge.attributes, @term.cols
+          print_row line
+        else
+          line = Color.public_send(@message["color"]) + @message["text"]
+          print_row line
+          sleep Integer(@message["linger"])
+          reset_message
+        end
       end
+
     end
   end
 end

data/lib/aniview/view/subscriptionmenu.rb

@@ -4,38 +4,34 @@ require_relative '../util/util'
 module Aniview
   module View
     class SubscriptionMenu < Menu
-      
+
       include Aniview::Util
 
-      def refresh
-        @last_checked = Time.now.to_i if @last_checked == nil
-        
-        @items = @interface.makeHash @interface.send(@refresh_function)
-    
-        if Time.now.to_i < @last_checked + 10
-          @attributes["l"] = @interface.getLastChecked
-          @attributes["d"] = @interface.checkDaemon
-          @interface.syncMatches
-          @last_checked = Time.now.to_i
-        end
-    
-        @expanded = -1 if @items.values[@expanded] == nil
-        fixCursor
+      #if Time.now.to_i < @last_checked + 10
+      #  @last_checked = Time.now.to_i
+      #end
+
+      def refresh_attributes
+        @attributes["l"] = @interface.getLastChecked
+        @attributes["d"] = @interface.checkDaemon
+        @attributes["n"] = @interface.getNextCheck
+        @interface.syncMatches
       end
-    
+
       def customControl(key, sel)
-    
+
         item = @items.values[sel["out"]].attributes["r"]
-    
+
         if key == @pref.get("keybindings")["subscriptions_edit"]
           newval = Util.readline(@term, "regexp:", item)
           @interface.editItem(sel["out"], newval)
-    
+
         elsif key == "m"
           @interface.forceMatch
 
         end
-      end 
+      end
+
     end
   end
 end

data/lib/application.rb

@@ -3,6 +3,10 @@ require 'highline/import'
 require 'thread'
 require 'io/console'
 require 'warning'
+require 'observer'
+require 'benchmark'
+
+require 'logger'
 
 Warning.ignore([:fixnum, :bignum])
 
@@ -37,35 +41,29 @@ module Aniview
     # @return     nil
     #
     def initialize
-  
+
+      #@logger = Logger.new('aniview.log')
+      #@logger.level = Logger::DEBUG
+      
       @term         = Util::Term.new
       
       @pref         = Interface::Pref.new
 
-      @mpvbridge    = Interface::MPVBridge.new @pref
-  
-      @aio          = Interface::AnimeIO.new  @pref, @mpvbridge
-      
-      @schedule     = Interface::Schedule.new @pref
-  
-      @delugec      = Interface::DelugeC.new @pref
-  
-      @c            = Client::AniClient.new @pref
-  
-      @statusline   = View::StatusLine.new @pref, @term, @mpvbridge
-  
-      #file = "/Users/lattis/anime/Tekkonkinkreet/Tekkonkinkreet.mkv"
-      #@mpvbridge.play file
-  
-      #while true
-      #  @statusline.draw
-      #  sleep 1/45.0
-      #end
-      
-      @subscription = Interface::Subscription.new(@pref, @schedule, @delugec, @c)
-  
+      @mpvbridge    = Interface::MPVBridge.new    @pref
+
+      @aio          = Interface::AnimeIO.new      @pref, @mpvbridge
+
+      @schedule     = Interface::Schedule.new     @pref
+
+      @delugec      = Interface::DelugeC.new      @pref
+
+      @c            = Client::AniClient.new       @pref
+
+      @statusline   = View::StatusLine.new        @pref, @term, @mpvbridge
+
+      @subscription = Interface::Subscription.new @pref, @schedule, @delugec, @c
+
       if not @c.server?
-        #puts "starting server"
         process = fork do
           require_relative 'daemon'
           avd = Daemon.new([])
@@ -73,17 +71,16 @@ module Aniview
         end
         Process.detach(process)
       end
-  
+
       @aiomenu = View::AioMenu.new(
-        refresh_function: :getUnwatched,
         interface:        @aio,
         name:             @pref.get("menu_titles")["unwatched"],
         pref:             @pref,
         format:           "format_library_unwatched",
-        term:             @term
+        term:             @term,
+        refresh_function: :unwatched
       )
       @prefmenu = View::PrefMenu.new(
-        refresh_function: :getAll,
         interface:        @pref,
         name:             @pref.get("menu_titles")["preferences"],
         pref:             @pref,
@@ -92,7 +89,6 @@ module Aniview
         children:         false
       )
       @delugemenu = View::DelugeMenu.new(
-        refresh_function: :getTorrents,
         interface:        @delugec,
         name:             @pref.get("menu_titles")["torrents"],
         pref:             @pref,
@@ -100,19 +96,15 @@ module Aniview
         term:             @term,
         children:         false
       )
-     
       @schedulemenu = View::ScheduleMenu.new(
-        refresh_function: :getAll,
         interface:        @schedule,
-        name:             @pref.get("menu_titles")["schedlue"],
+        name:             @pref.get("menu_titles")["schedule"],
         pref:             @pref,
         format:           "format_schedule",
         term:             @term,
         children:         false
       )
-  
       @subscriptionmenu = View::SubscriptionMenu.new(
-        refresh_function: :getAll,
         interface:        @subscription,
         name:             @pref.get("menu_titles")["subscriptions"],
         pref:             @pref,
@@ -120,8 +112,8 @@ module Aniview
         term:             @term,
         children:         false
       )
-  
       @term.save.hide_cursor.echo_off 
+
     end
   
     # Cleans up Aniview, restoring terminal settings and safely exiting all
@@ -130,10 +122,13 @@ module Aniview
     # @return     nil
     #
     def cleanup
+      @view.pause
+      @statusthread.exit if @statusthread
       @mthread.exit if @mthread != nil
       @statusthread.exit if @statusthread != nil
       @term.reset
       @mpvbridge.quit!
+      @aio.cleanup
       exit
     end
 
@@ -161,8 +156,7 @@ module Aniview
         puts "Help"
         puts ""
       else
-        print "\033[" + String(@term.rows) + ";1H" + Aniview::View::Color.red + "error, unknown command"
-        @term.getKey
+        @statusline.message "unknown command"
       end
     end
   
@@ -173,48 +167,70 @@ module Aniview
     # @return     nil
     #
     def changeView newView
+      @view.delete_observers
+      @view.pause
+      newView.unpause
+      newView.add_observer(self, :drawview)
+      newView.change_screen_size redraw: false
+      newView.expand -1
       @view = newView
-      @view.change_screen_size
     end
   
+    def drawview
+      @view.draw
+      @rcount ||= 0
+      #puts "refreshed view #{@rcount+=1}"
+    end
+
+    def togglestatusline
+      return unless @mpvbridge.what_changed == "playing_status"
+      unless @statusthread
+        @statusthread = Thread.new do
+          while true
+            @statusline.draw
+            sleep 0.07
+          end
+        end
+      else
+        @statusthread.exit
+        @statusthread = nil
+      end
+    end
+
+    def drawmessage
+      unless @statusthread
+        @view.draw
+        Thread.new do
+          @statusline.draw
+          @statusline.draw
+        end
+      end
+    end
 
     # Runs the aniview application, this method starts all of the threads
     #
     # @return     nil
     #
     def run
-  
+
       @view = @aiomenu
-  
+      @view.add_observer(self, :drawview)
+      @statusline.draw
+
+      @mpvbridge.add_observer(self, :togglestatusline)
+      @statusline.add_observer(self, :drawmessage)
+
       mutex = Mutex.new
       Signal.trap('SIGWINCH', proc { 
-        Thread.new { mutex.synchronize { @view.change_screen_size } } 
+        Thread.new { mutex.synchronize {
+          @view.change_screen_size
+          @statusline.draw
+        } } 
       } )
-  
+
       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
-      end
-  
+
       while true
         @shoulddraw = true
         key = @term.getKey
@@ -228,14 +244,12 @@ module Aniview
           changeView @aiomenu
           @view.setName nm["unwatched"]
           @view.setFormat("format_library_unwatched")
-          @view.setRfunc(:getUnwatched)
-  
+          @view.setRfunc(:unwatched)
         when kb["goto_library"]
           changeView @aiomenu
           @view.setName nm["library"]
           @view.setFormat("format_library")
-          @view.setRfunc(:getAll)
-  
+          @view.setRfunc(:items)
         when kb["goto_torrents"]
           changeView @delugemenu
           @view.setName nm["torrents"]
@@ -249,7 +263,14 @@ module Aniview
           changeView @subscriptionmenu
           @view.setName nm["subscriptions"]
         when ":"
+          @view.pause
+          if @statusthread
+            togglestatusline
+            toggled = true
+          end
           runCommand Util.readline(@term, ":")
+          togglestatusline if toggled
+          @view.unpause
         when "q"
           cleanup
         end