aniview 2.1.2 → 3.0.1

data/lib/aniview/interface/subscription/subscription.rb

@@ -2,15 +2,21 @@ require 'simple-rss'
 require 'open-uri'
 
 require_relative "../schedule/scheduleitem"
+require_relative '../bridge'
 
 module Aniview
   module Interface
-    class Subscription
+    class Subscription < Bridge
+
+      include Observable
+
     	def initialize pref, schedule, delugec, client
         @c = client
     		@pref = pref
         @schedule = schedule
         @delugec = delugec
+        #SimpleRSS.feed_tags << :"torrent:magnetURI"
+        #&lt;![CDATA[
     	end
     
       def log s
@@ -28,6 +34,10 @@ module Aniview
       def getLastChecked
         @c.lastchecked
       end
+
+      def getNextCheck
+        @c.sendMsg "nextcheck"
+      end
     
       def syncMatches
         @schedule.mergeItems @c.getItems
@@ -35,6 +45,7 @@ module Aniview
     
     	def updateFeed
         begin
+          SimpleRSS.item_tags << :"torrent:magnetURI"
     		  @rss = SimpleRSS.parse open(@pref.get("rss_feed")["url"])
     
         rescue SocketError
@@ -67,11 +78,11 @@ module Aniview
         log "matching all" if verbose
     
         total_matches = 0
-        getAll.each { |subs|
+        @schedule.schedule.each { |subs|
           log "matching #{subs.attributes["r"]}" if verbose
           matches = match subs.attributes["r"], verbose
           log "found #{matches.length} matches"  if verbose
-          log "#{matches}"  if verbose
+          #log "#{matches}"  if verbose
     
           if matches.length >= 1
     
@@ -79,8 +90,10 @@ module Aniview
             newfile = downloaddir + matches[0][:title]
     
             next if File.exist? newfile
+            log "attempting to downloading file" if verbose
             log "set download dir to #{newfile}" if verbose
-            s = @delugec.addTorrent matches[0][:link], @pref.parseDir(subs.attributes["p"]), verbose: true
+            log "#{matches[0].link}" if verbose
+            s = @delugec.addTorrent matches[0].link, @pref.parseDir(subs.attributes["p"]), verbose: true
             log "adding torrent, status #{s}" if verbose
             subs.setSeen if s
             @schedule.save
@@ -98,23 +111,16 @@ module Aniview
         end
       end
     
-      def getAll
-        @schedule.getAll
+      def items
+        @schedule.items
       end
     
       def editItem loc, newval
-        @schedule.getAll[loc].setRegexp newval
+        @schedule.schedule[loc].setRegexp newval
         @schedule.save
+        changed
+        notify_observers
       end
-    
-      def makeHash(arr)
-        ret = {}
-        arr.each{ |subs|
-          ret.merge!(subs => subs)
-        }
-        return ret
-      end
-    
     end
   end
 end

data/lib/aniview/util/util.rb

@@ -19,8 +19,8 @@ module Aniview
     end
 
     def self.error_message
+      #use statusline to show error messages
       print "\e[#{Term.rows};2H Message"
-      sleep 1
     end
 
     def self.format_duration v

data/lib/aniview/view/aiomenu.rb

@@ -5,28 +5,18 @@ module Aniview
   module View
     class AioMenu < Menu
       include Aniview::Util
-    	def setmal malanime
-    		@malanime = malanime
-    	end
-    
-    	def refresh
-    		@items = @interface.makeHash @interface.send(@refresh_function)
-    
-    		@attributes = {
-    			"t" => @attributes["t"],
-    			"D" => Util.format_duration(getDuration),
-    			"S" => Util.format_size(getSize)
-    		}
-    
-    		@expanded = -1 if @items.values[@expanded] == nil
-    		fixCursor
-    	end
+
+      def refresh_attributes
+        @attributes = {
+          "t" => @attributes["t"],
+          "D" => Util.format_duration(getDuration),
+          "S" => Util.format_size(getSize)
+        }
+      end
     
     	def getDuration
-    		dur = 0
-    		@items.each{ |child| 
-    			dur += child[0].attributes["d"]
-    		}
+        dur = 0
+    		@items.each{ |p, c| dur += p.attr["d"] }
     		return dur
     	end
     	
@@ -39,6 +29,7 @@ module Aniview
     	end
     
     	def customControl(key, sel)
+        return if @items == {}
     		path = @items.values[sel["out"]][sel["in"]].path
 
         empty = path == "empty"
@@ -56,14 +47,15 @@ module Aniview
     			refresh
     		elsif key == @pref.get("keybindings")["anime_set_watched"] and not empty
     			@interface.addWatched(path)
-    			refresh
     		elsif key == @pref.get("keybindings")["anime_undo_set_watched"]
     			@interface.rmWatched()
-    			refresh
     		elsif key == @pref.get("keybindings")["anime_set_unwatched"] and not empty
     			@interface.rmWatched(path)
-    				
+    			moveCursor("down")
     		end
+
+        changed
+        notify_observers
     	end
     end
   end

data/lib/aniview/view/delugemenu.rb

@@ -5,43 +5,34 @@ module Aniview
   module View
     class DelugeMenu < Menu
       include Aniview::Util
-    
-    	def refresh
-    		@items = @interface.makeHash @interface.send(@refresh_function)
-    
-    		@attributes = {
-    			"t" => @attributes["t"],
+      def refresh_attributes
+        @attributes = {
+          "t" => @attributes["t"],
           "s" => @interface.getStatus
-    		}
-    
-    		@expanded = -1 if @items.values[@expanded] == nil
-    		fixCursor
-    	end
+        }
+      end
     
-    	def customControl(key, sel)
+      def customControl(key, sel)
     
         if @items != nil and @items.length > 0
           item = @items.values[sel["out"]]
         else
           item = ""
         end
-    
-    		if key == @pref.get("keybindings")["torrents_pause"]
+
+        if key == @pref.get("keybindings")["torrents_pause"]
           @interface.toggleTorrent(item)
         elsif key == @pref.get("keybindings")["torrents_remove"]
           @interface.removeTorrent(item, false)
         elsif key == @pref.get("keybindings")["torrents_remove_data"]
           @interface.removeTorrent(item, true)
-    		elsif key == "enter"
-    
         elsif key == "+"
+          pause
           newval = Util.readline(@term, "mag:", "")
           @interface.addTorrent newval, Dir.home + "/downloads/"
-    
-    		end
-    	end
-    
+          unpause
+        end
+      end   
     end
   end
 end
-    

data/lib/aniview/view/menu.rb

@@ -1,3 +1,5 @@
+require 'benchmark'
+
 require_relative 'color'
 require_relative '../util/util'
 
@@ -5,9 +7,15 @@ module Aniview
   module View
     class Menu
       include Aniview::Util
-      def initialize(refresh_function:,interface:,name:,pref:,format:,term:,children: true)
+      include Observable
+
+      attr_accessor :visible
+
+      def initialize(refresh_function: :items, interface:, name:, pref:, format:, term:, children: true, visible: false)
         @attributes       = {}
 
+        @visible = visible
+
         @refresh_function = refresh_function
         @interface        = interface
         setName name
@@ -15,7 +23,7 @@ module Aniview
         @format           = format
         @term             = term
         @children         = children
-        
+
         @expanded         = -1
         @selected         = 0
 
@@ -23,13 +31,44 @@ module Aniview
         @items_hash       = {}
         @hashmap          = {}
         @lu               = 0
-    
+
         @oldRows          = @term.rows
-    
+
         refresh
-    
+
         @view             = [0, @term.rows - 3]
-    
+
+        @updated = true
+
+        if @interface.singleton_class.include? Observable
+          @interface.add_observer(self, :refresh)
+        end
+      end
+
+      def unpause
+        unless @interface.singleton_class.include? Observable
+          auto_update s: :start
+        end
+      end
+
+      def pause
+        auto_update s: :stop
+      end
+
+      def auto_update s: :start
+        case s
+        when :start
+          @update_thread = Thread.new do
+            while true
+              refresh
+              changed
+              notify_observers
+              sleep 0.07
+            end
+          end
+        when :stop
+          @update_thread.exit if @update_thread
+        end
       end
     
       def setRfunc(new_method)
@@ -41,7 +80,7 @@ module Aniview
         refreshFormats
       end
     
-      def change_screen_size
+      def change_screen_size redraw: true
         #@term.rows = lines
         #@term.cols = cols
         @items_formatted = {}
@@ -50,14 +89,14 @@ module Aniview
         refresh
         
         #if @term.rows > @oldRows
-    
+
         diff = @term.rows - @oldRows
         #@view[0] += diff
         @view[1] += diff
     
         @oldRows = @term.rows
         adjustView
-        draw
+        draw if redraw
       end
     
       def setName(name)
@@ -69,9 +108,13 @@ module Aniview
       end
     
       def refresh
-        @items = @interface.makeHash @interface.send(@refresh_function)
+        @items = @interface.send(@refresh_function)
+        refreshFormats
+        refresh_attributes
         @expanded = -1 if @items.values[@expanded] == nil
         fixCursor
+        changed
+        notify_observers
       end
     
       def expand(i)
@@ -85,6 +128,8 @@ module Aniview
         end
         fixCursor
         adjustView
+        changed
+        notify_observers
       end
       
       def resolveSelected(resolve_me=@selected)
@@ -135,123 +180,105 @@ module Aniview
         end
       end
     
-      def refreshFormats
-        now = Integer(DateTime.now.strftime('%Q'))
-        return if now - @lu < 100
-        @lu = now
+      def adjustView
+        buffer = 2
+        bottom = @term.rows-3
+    
+        diff = 0
+        if @selected < @view[0] + buffer #and @selected > buffer
+          while @selected < @view[0] + buffer
+            @view[0]-=1
+            @view[1]-=1
+          end
+        elsif @selected > @view[1] - (buffer+1) and @selected < getLen - buffer
+          while @selected > @view[1] - (buffer+1) and @selected < getLen - buffer
+            @view[0]+=1
+            @view[1]+=1
+          end
+        end
     
+        diff = 0      - @view[0] if @view[0] < 0
+        diff = bottom - @view[1] if @view[1] < bottom
+    
+        @view[0] += diff
+        @view[1] += diff
+      end
+
+      def updated?
+        @updated and !(@updated = !@updated)
+      end
+
+      def updated!
+        @updated = true
+      end
+
+      def interface
+        @interface
+      end
+
+      def refreshFormats
         @cl = {
           "s" => Aniview::View::Color.public_send(@pref.get("clr")["selected"]),
           "1" => Aniview::View::Color.public_send(@pref.get("clr")["primary"]),
           "2" => Aniview::View::Color.public_send(@pref.get("clr")["secondary"]),
           "m" => Aniview::View::Color.public_send(@pref.get("clr")["main"]),
         }
-    
-        #@items_formatted = {}
-        new_items_formatted = {}
-        new_items_hash      = {}
-        new_hashmap         = {}
-        @items.each_with_index { |item, i|
-    
-          #@l.log @items.keys[i]
-          #
-          babble = item[0].cereal #Digest::SHA256.bubblebabble String(item[0])
-    
-          if @items_hash.key? babble
-            val = @items_hash[babble]
-            new_items_hash.merge!(babble => val)
-            new_items_formatted.merge!(@hashmap[babble] => @items_formatted[@hashmap[babble]])
-            new_hashmap.merge!(babble => @hashmap[babble])
-            next
-          end
-    
-          parent = Util.parse_format(
+
+        nif = {}
+
+        @items.each { |parent, children|
+
+          parent_formatted = Util.parse_format(
             @pref.get(@format)["parent"],
-            item[0].attributes,
+            parent.attributes,
             @term.cols
           )
           
-          children = []
-          children_hash = []
-          
+          children_formatted = []
           if @children
-            item[1].each { |subitem|
-    
-              child_babble = subitem.cereal
-    
-              if @items_hash.key? child_babble
-                val = @items_hash[babble]
-                new_items_hash.merge!(child_babble => val)
-                children<<@hashmap[babble]
-                new_hashmap.merge!(babble => @hashmap[babble])
-                next
-              end
-    
-              children << Util.parse_format(
+            children.each { |child|
+              children_formatted << Util.parse_format(
                 @pref.get(@format)["child"],
-                subitem.attributes,
+                child.attributes,
                 @term.cols
               )
-              children_hash << subitem.hash
-    
             }
           end
     
-          new_items_hash.merge!(babble => children_hash)
-          new_items_formatted.merge!(parent => children)
-          new_hashmap.merge!(babble => parent)
+          nif.merge!(parent_formatted => children_formatted)
         }
     
-        @items_formatted = new_items_formatted
-        @items_hash      = new_items_hash
-        @hashmap         = new_hashmap
+        @items_formatted = nif
     
         @title_formatted = Util.parse_format(
           @pref.get(@format)["title"],
           @attributes,
           @term.cols
         )
-      end
-    
-      def adjustView
-        buffer = 2
-        bottom = @term.rows-3
-    
-        diff = 0
-        if @selected < @view[0] + buffer #and @selected > buffer
-          while @selected < @view[0] + buffer
-            @view[0]-=1
-            @view[1]-=1
-          end
-        elsif @selected > @view[1] - (buffer+1) and @selected < getLen - buffer
-          while @selected > @view[1] - (buffer+1) and @selected < getLen - buffer
-            @view[0]+=1
-            @view[1]+=1
-          end
-        end
-    
-        diff = 0      - @view[0] if @view[0] < 0
-        diff = bottom - @view[1] if @view[1] < bottom
-    
-        @view[0] += diff
-        @view[1] += diff
+
+        changed
+        notify_observers
       end
     
       def draw
-        refreshFormats
-        drawFrom(@view[0], @view[1])
-      end
-    
-      def drawFrom(line_on, lines_to_draw)
-        #print menu header
+
+        #refresh @items_formatted
+        #refreshFormats
+
+        #set the view
+        line_on = @view[0]
+        lines_to_draw = @view[1]
+
+        #print the menu title
         lo="\e[1;1H"
         print lo + @cl["m"] + @title_formatted + "\e[K"
     
+        #get the resolved start positions
         resolved_start_position = resolveSelected line_on
-    
         outer_index = resolved_start_position["out"]
         inner_index = resolved_start_position["in"]
         
+        # if we are starting in the expanded portion, skip its parent
         if resolved_start_position["in_expanded"]
           outer_index+=1
         end
@@ -292,9 +319,14 @@ module Aniview
         else
           customControl(key, sel)
         end
+        changed
+        notify_observers
       end
     
       def customControl(key, sel); end
+
+      def refresh_attributes; end
+    
     end
   end
 end