aniview 1.1.0 → 1.3.0

data/lib/aniview/view/statusline.rb

@@ -0,0 +1,18 @@
+require_relative '../util/format'
+require_relative 'color'
+
+class StatusLine
+  def initialize pref, term, mpvbridge
+    @term = term
+    @pref = pref
+    @mpvbridge = mpvbridge
+    @clr = Color.public_send(@pref.get("clr")["main"])
+  end
+
+  def draw
+    status_row = @term.rows - 1
+    line = Format.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"
+  end
+end

data/lib/aniview/view/subscriptionmenu.rb

@@ -5,13 +5,16 @@ require_relative '../util/command'
 class SubscriptionMenu < Menu
 
   def refresh
+    @last_checked = Time.now.to_i if @last_checked == nil
+    
     @items = @interface.makeHash @interface.send(@refresh_func)
 
-    @attributes = {
-      "t" => @attributes["t"],
-      "l" => @interface.getLastChecked,
-      "d" => @interface.checkDaemon
-    }
+    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

data/lib/aniviewd.rb

@@ -10,6 +10,7 @@ require_relative 'aniview/interface/schedule/schedule'
 require_relative 'aniview/interface/subscription/subscription'
 require_relative 'aniview/client/aniclient'
 require_relative 'aniview/util/format'
+require_relative 'aniview/util/serializer'
 
 require_relative 'aniview/util/alogger'
 
@@ -39,8 +40,8 @@ class AniViewd
     @matches = 0
     @lastchecked = "never"
 
-    $stdout.reopen(@pref.parseDir(@pref.get("daemon_log_file")), "a")
-    $stderr.reopen(@pref.parseDir(@pref.get("daemon_log_file")), "a")
+    $stdout.reopen(@pref.parseDir(@pref.get("daemon_log_file")), "w")
+    $stderr.reopen(@pref.parseDir(@pref.get("daemon_log_file")), "w")
     $stdout.sync = true
     $stderr.sync = true
 
@@ -80,6 +81,9 @@ class AniViewd
       when "nani"
         puts @c.sendMsg("what?")
         quit
+      when "items"
+        p @c.getItems
+        quit
       else
         puts "unknown command, dude!"
         quit
@@ -103,10 +107,10 @@ class AniViewd
           @lastchecked = "offline"
         else
           @lastchecked = Time.now.to_s
-          @matches += @subscription.matchAll
+          @schedule.load
+          @matches += @subscription.matchAll(verbose: true)
         end
 
-        
         #p @schedule.getAll
         @looped += 1
         sleep Integer(@pref.get("rss_feed")["refresh_interval"])
@@ -138,24 +142,32 @@ class AniViewd
       lastloop = false
       client = @s.accept
       
-      message = client.gets.chomp
+      message = client.gets.chomp.split(" ")
       puts "got msg #{message} from client"
       response = "okay."
 
-      case message
-      when "up?"
-        response = "true"
-      when "quit"
-        lastloop = true
-        response = "quitting"
-      when "info"
-        response = "uptime: #{uptime}, loops: #{@looped}, matches, #{@matches}"
-      when "lastchecked"
-        response = @lastchecked
-      else
-        response = "what?"
-      end
-      
+      message.each_with_index { |m, i|
+        case m
+        when "up?"
+          response = "true"
+        when "quit"
+          lastloop = true
+          response = "quitting"
+        when "info"
+          response = "uptime: #{uptime}, loops: #{@looped}, matches, #{@matches}"
+        when "lastchecked"
+          response = @lastchecked
+        when "items"
+          response = Serializer.e(@schedule.getAll)
+        when "itemshash"
+          response = @schedule.getAllCereal
+        else
+          response = "what?"
+        end
+      }
+
+      response += "\n"
+
       puts "responding with #{response}"
       client.puts response
       client.close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aniview
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - annacrombie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg
@@ -111,29 +111,30 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.1
 - !ruby/object:Gem::Dependency
-  name: net-ping
+  name: mpv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 1.2.1
 description: Browse local anime, based on cmus
 email: meotleft@gmail.com
 executables:
 - aniview
+- aniviewd
 extensions: []
 extra_rdoc_files: []
 files:
@@ -145,6 +146,7 @@ files:
 - "./lib/aniview/interface/deluge/delugec.rb"
 - "./lib/aniview/interface/deluge/torrentitem.rb"
 - "./lib/aniview/interface/item.rb"
+- "./lib/aniview/interface/mpv/mpvbridge.rb"
 - "./lib/aniview/interface/pref/defaults.json"
 - "./lib/aniview/interface/pref/pref.rb"
 - "./lib/aniview/interface/pref/prefitem.rb"
@@ -152,22 +154,25 @@ files:
 - "./lib/aniview/interface/schedule/schedule.rb"
 - "./lib/aniview/interface/schedule/scheduleitem.rb"
 - "./lib/aniview/interface/subscription/subscription.rb"
-- "./lib/aniview/interface/subscription/subscriptiondaemon.rb"
 - "./lib/aniview/util/alogger.rb"
 - "./lib/aniview/util/command.rb"
 - "./lib/aniview/util/format.rb"
 - "./lib/aniview/util/online.rb"
+- "./lib/aniview/util/serializer.rb"
 - "./lib/aniview/util/stringhelp.rb"
 - "./lib/aniview/util/term.rb"
 - "./lib/aniview/view/aiomenu.rb"
+- "./lib/aniview/view/color.rb"
 - "./lib/aniview/view/delugemenu.rb"
 - "./lib/aniview/view/emote.rb"
 - "./lib/aniview/view/menu.rb"
 - "./lib/aniview/view/prefmenu.rb"
 - "./lib/aniview/view/schedulemenu.rb"
+- "./lib/aniview/view/statusline.rb"
 - "./lib/aniview/view/subscriptionmenu.rb"
 - "./lib/aniviewd.rb"
 - bin/aniview
+- bin/aniviewd
 homepage: https://github.com/annacrombie/aniview/
 licenses:
 - MIT

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

@@ -1,42 +0,0 @@
-require 'socket'
-
-class SubscriptionDaemon
-
-  def initialize pref, subscription
-    @subscription = subscription
-    @pref = pref
-
-  end
-
-  def match
-    @subscription.updateFeed
-    @subscription.matchAll
-  end
-
-  def run
-  
-    while true
-    
-      match
-
-      sleep Integer(@pref.get("rss_feed")["refresh_interval"])
-    
-    end
-  
-  end
-
-  def start(mode="s")
-    
-    puts "started daemon" if mode == "v"
-
-    @thread = Thread.new do
-      run
-    end
-
-  end
-
-  def exit
-    @thread.exit if @thread != nil
-  end
-
-end