zashoku 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e99bb8738a8d367c416d66c40130b91e07e9a76
-  data.tar.gz: f45b7cef607b9e640d89dec4999976c178918cd8
+  metadata.gz: 36127e84b436a6174ad67764767744b9f3950c7c
+  data.tar.gz: ede097cbf3e0dafd9b6ccfd9e88c57f67d94d586
 SHA512:
-  metadata.gz: ab0df30b379d34a69274ca6ba17f63a1dd42ada0d52f1a1413fb7039d40d900bc9bf888b0faa4b1e41b5fbd419c6a9168b809e13032b9dff45032877e7252ed0
-  data.tar.gz: a40c62b9937bd0a060285324667d88b9498e7d8992cb3e849543cb5e98a98bdc31312285eace7c57ee09896324d48e8993f8d58ec221c2a17559c8605cb3ac08
+  metadata.gz: b94e35a3a766bb973f70480c17a9cdcca2c9bf502668c5540292f318da512e0e4cdf4dbeb0faf2d81d15cde5d3b3192aec9a6b2bc94d8c30fed367e78c44c973
+  data.tar.gz: 3041135e992d7b6f880b10c0f990e65dda2c374c7387222d3dfd44e0ef2fe211cd581004d197370a624841ed70a12cee17102efa28a7e7753fdbf167b556c9ba

data/lib/core/formatter.rb

@@ -14,14 +14,22 @@ module Zashoku
       1                 => ''
     }.freeze
 
+    STRIP_BRACKETS = /\s*\[.+?\]\s*/
+    STRIP_EXT      = /(\.mkv)|(\.avi)|(\.mp4)/
+    STRIP_PARENS   = /\s*\(.+?\)\s*/
+
     def self.round(n, precision = 10.0)
       (Float(n) * precision).round / precision
     end
 
     def self.duration(secs)
-      [secs / 3_600, (secs / 60) % 60, secs % 60].map do |i|
-        i.round.to_s.rjust(2, '0')
-      end.join(":")
+      [
+        secs >= 3_600 ? secs / 3_600 : nil,
+        (secs / 60) % 60,
+        secs % 60
+      ].map do |i|
+        i.round.to_s.rjust(2, '0') if i
+      end.compact.join(":")
     end
 
     def self.size(bytes)
@@ -35,6 +43,14 @@ module Zashoku
       "#{Integer(progress)}.#{Integer(progress * 10.0) % 10}"
     end
 
+    def self.media_file(path)
+       File.basename(path.to_s)
+         .gsub(STRIP_BRACKETS) {}
+         .gsub(STRIP_EXT, '')
+         .tr('_', ' ')
+         .gsub(STRIP_PARENS) {}
+    end
+
     def self.items(format, items)
       items.map do |parent, children|
         [

data/lib/core/net/client.rb

@@ -99,7 +99,9 @@ module Zashoku
         else
           @result_queue << response
         end
-      rescue
+      rescue JSON::ParserError
+        Zashoku.logger.debug("discarding #{response}, JSON::ParserError")
+      rescue EOFError
         lost_connection
       end
 

data/lib/core/statusline/statusline.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require_relative 'widget'
+
+module Zashoku
+  module Statusline
+    def self.new
+      Zashoku.logger.debug('statusline.new')
+      Zashoku::Statusline::Statusline.new
+    end
+
+    class Statusline
+      include Observable
+
+      def initialize
+        Zashoku.logger.debug('hhh')
+        @widgets = Zashoku.modules.keys.zip(Zashoku.modules.map do |_k, m|
+          m.widgets if m.respond_to?(:widgets)
+        end).to_h.compact
+        Zashoku.logger.debug(@widgets)
+        refresh
+      end
+
+      def changed!
+        changed
+        notify_observers
+      end
+
+      def event(event)
+        case event['event']
+        when 'refresh_widget'
+          @widgets[event['sender']][event['widget']].refresh
+          refresh
+          changed!
+        end
+      end
+
+      def refresh
+        @items = @widgets.map do |_k, m|
+          m.map { |_j, w| w.item }
+        end.flatten
+
+        @items_formatted = @items.join(' | ')
+      end
+
+      def draw
+        print "\e[#{Util::Term.rows - 1};1H\e[0m#{@items_formatted}\e[K"
+      end
+    end
+  end
+end

data/lib/core/statusline/widget.rb

@@ -0,0 +1,13 @@
+module Zashoku
+  module Statusline
+    class Widget
+      def intiailize; end
+
+      def refresh; end
+
+      def item
+        ''
+      end
+    end
+  end
+end

data/lib/core/util/util.rb

@@ -40,7 +40,6 @@ module Zashoku
     def self.get_yaml(file)
       YAML.safe_load(File.open(file, 'r', &:read)) || {}
     rescue Errno::ENOENT
-      puts 'failed'
       {}
     end
   end

data/lib/daemon.rb

@@ -57,9 +57,9 @@ module Zashoku
       sleep
     end
 
-    def update(sender:, event:)
-      Zashoku.logger.debug("controller #{sender} sent update #{event}")
-      @server.event(sender: sender, event: event)
+    def update(e)
+      Zashoku.logger.debug("controller #{e['sender']} sent update #{e['event']}")
+      @server.event(e)
     end
 
     def respond(message)

data/lib/viewer.rb

@@ -10,6 +10,7 @@ require 'thread'
 require_relative 'core/controller'
 require_relative 'core/config/view_config'
 require_relative 'core/net/client'
+require_relative 'core/statusline/statusline'
 require_relative 'core/util/term'
 require_relative 'core/util/util'
 require_relative 'core/formatter'
@@ -70,12 +71,16 @@ module Zashoku
       end).to_h
       @view = @views.keys.first
 
+      @statusline = Statusline.new
+      @statusline.add_observer(self, :draw_statusline)
+
       init_screen
       lay_traps!
       Thread.abort_on_exception = true
       Thread.new { scan_keyboard! }
 
       init_view(@view) if @view
+      @statusline.draw
       sleep
     end
 
@@ -118,6 +123,8 @@ module Zashoku
     end
 
     def handle_event(event)
+      return @statusline.event(event) if event['statusline']
+
       case event['event']
       when 'items'
         command(event['sender'], :refresh)
@@ -140,7 +147,6 @@ module Zashoku
         return send(COMMANDS[cmd]) if COMMANDS.key?(cmd)
 
         mod, meth, *args = cmd.split
-        # puts "#{key} #{mod} #{meth} #{args}"
         mod = mod == 'current_view' ? @view : mod
         args.map! do |arg|
           if arg.chr == '$'
@@ -178,5 +184,9 @@ module Zashoku
     def draw_view
       @views[@view].draw
     end
+
+    def draw_statusline
+      @statusline.draw
+    end
   end
 end

data/lib/zashoku.rb

@@ -3,7 +3,7 @@
 require_relative 'core/options'
 
 module Zashoku
-  Version = [1, 1, 0].freeze
+  Version = [1, 2, 0].freeze
   Root    = File.expand_path('../', __dir__)
 
   AppRoot = Root      unless const_defined?(:AppRoot)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zashoku
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - annacrombie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-13 00:00:00.000000000 Z
+date: 2017-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -110,6 +110,8 @@ files:
 - "./lib/core/net/client.rb"
 - "./lib/core/net/server.rb"
 - "./lib/core/options.rb"
+- "./lib/core/statusline/statusline.rb"
+- "./lib/core/statusline/widget.rb"
 - "./lib/core/util/folder_listen.rb"
 - "./lib/core/util/term.rb"
 - "./lib/core/util/util.rb"