aniview 3.2.1 → 5.1.0

data/modules/animeio/lib/animeio/animeio_view.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative 'animefile'
+require_relative 'animeseries'
+
+module Zashoku
+  module AnimeIO
+    class AnimeIOView < Zashoku::View
+      def refresh_attributes
+        unformatted_p =
+          !@items.empty? ? sum_attribute('p') / @items.length : 0
+
+        sum_d = sum_attribute('d')
+        unformatted_q =
+          sum_d.positive? ? sum_attribute('W') * 100.0 / sum_d : 0
+
+        @attributes = {
+          't' => Zashoku.conf.get(%w[title animeio]),
+          'D' => Zashoku::Formatter.duration(sum_attribute('d')),
+          'S' => Zashoku::Formatter.size(sum_attribute('s')),
+          'P' => Zashoku::Formatter.progress(unformatted_p),
+          'Q' => Zashoku::Formatter.progress(unformatted_q),
+          'c' => sum_attribute('c'),
+          'w' => sum_attribute('w')
+        }
+      end
+
+      def sum_attribute(k)
+        @items.inject(0) { |mem, c| mem + c[0].attr[k] }
+      end
+
+      def refresh_items
+        Zashoku.command(mod: 'remote::animeio', meth: 'items')
+      end
+
+      def get_format
+        Zashoku.conf.get(%w[format animeio])
+      end
+    end
+  end
+end

data/modules/animeio/lib/animeio/animeseries.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'date'
+
+module Zashoku
+  module AnimeIO
+    class AnimeSeries < Zashoku::Item
+      include Zashoku::Util
+
+      attr_accessor :attr
+
+      def initialize(path, children = [])
+        @path = path
+
+        @attr = {
+          't' => String(@path),
+          'c' => 0,
+          'd' => 0,
+          's' => 0,
+          'p' => 0,
+          'w' => 0,
+          'W' => 0
+        }
+
+        @children = children
+        @children.each { |c| self + c }
+      end
+
+      def +(other)
+        @attr['d'] += other.attr['d']
+        @attr['D']  = Zashoku::Formatter.duration(@attr['d'])
+        @attr['s'] += other.attr['s']
+        @attr['S']  = Zashoku::Formatter.size(@attr['s'])
+        @attr['c'] += 1
+        @attr['w'] += 1 if other.watched?
+        @attr['W'] += other.attr['d'] if other.watched?
+      end
+
+      def <<(af)
+        @children << af
+        self + af
+        average
+      end
+
+      def average
+        @attr['p'] = @attr['w'] * 100.0 / @attr['c']
+        @attr['q'] = @attr['d'].positive? ? @attr['W'] * 100.0 / @attr['d'] : 0
+        @attr['Q'] = Zashoku::Formatter.progress @attr['q']
+        @attr['P'] = Zashoku::Formatter.progress @attr['p']
+      end
+
+      def title
+        @path
+      end
+
+      def attributes
+        @attr
+      end
+    end
+  end
+end

data/modules/mpv/README.md

@@ -0,0 +1,2 @@
+# zashoku-mpv
+zashoku interface for mpv gem

data/modules/mpv/config/daemon.yml

@@ -0,0 +1,2 @@
+---
+mpv_args: "--alang=jpn --slang=eng"

data/modules/mpv/lib/mpv.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'mpv'
+
+module Zashoku
+  module Mpv
+    extend Zashoku::Module
+
+    Version = [1, 0, 0].freeze
+    Root    = File.expand_path('../', __dir__)
+
+    autoload :MpvController, File.join(Root, 'lib/mpv/mpv_controller')
+
+    def self.controller
+      MpvController.new
+    end
+
+    def self.widgets
+      require_relative 'mpv/filename_widget'
+      require_relative 'mpv/time_widget'
+      {
+        'filename' => FilenameWidget.new,
+        'time'     => TimeWidget.new,
+      }
+    end
+  end
+end

data/modules/mpv/lib/mpv/filename_widget.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Zashoku
+  module Mpv
+    class FilenameWidget < Zashoku::Statusline::Widget
+      def refresh
+        file = Zashoku.command(mod: 'remote::mpv', meth: 'filename')
+
+        @attr = {
+          'f' => file,
+          'F' => Zashoku::Formatter.media_file(file)
+        }
+      end
+    end
+  end
+end

data/modules/mpv/lib/mpv/mpv_controller.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Zashoku
+  module Mpv
+    class MpvController
+      include Observable
+
+      DefaultFilename = '.'
+      DefaultTimeHash = { pos: 0, end: 0, pct: 0, lu: Time.now}
+
+      attr_accessor :mpv, :filename, :time
+
+      def initialize
+        defaults
+        connect
+      end
+
+      def defaults
+        @filename = DefaultFilename
+        @time = DefaultTimeHash.dup
+      end
+
+      def refresh_filename
+        changed
+        notify_observers(
+          sender: 'mpv',
+          event: 'refresh_widget',
+          statusline: true,
+          widget: 'filename'
+        )
+      end
+
+      def refresh_time
+        changed
+        notify_observers(
+          sender: 'mpv',
+          event: 'refresh_widget',
+          statusline: true,
+          widget: 'time'
+        )
+      end
+
+      def connect
+        return unless @mpv&.client&.get_property("idle-active") == nil
+
+        @mpv = MPV::Session.new(
+          user_args: Zashoku.conf.get(['mpv_args']).split
+        )
+        @mpv.callbacks << method(:event_handler)
+        @mpv.client.command('observe_property_string', 2, 'time-pos')
+        @mpv.client.command('observe_property_string', 1, 'path')
+      end
+
+      def event_handler(e)
+        # p e
+        case e['event']
+        when 'property-change'
+          case e['name']
+          when 'path'
+            @filename = e['data'] || DefaultFilename
+            refresh_filename
+          when 'time-pos'
+            return if Time.now < @time[:lu] + 1
+            @time[:pos] = e['data']
+            @time[:end] = @mpv.client.get_property('duration')
+            @time[:pct] = @mpv.client.get_property('percent-pos')
+            @time[:lu] = Time.now
+            refresh_time
+          end
+        when "end-file"
+          defaults
+          refresh_time
+          refresh_filename
+        end
+      end
+
+      def watch(file)
+        connect
+        @mpv.client.command('loadfile', file)
+        Zashoku.command(mod: 'animeio', meth: 'watched!', args: [file])
+      end
+    end
+  end
+end
+

data/modules/mpv/lib/mpv/time_widget.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Zashoku
+  module Mpv
+    class TimeWidget < Zashoku::Statusline::Widget
+      def refresh
+        time = to_f(Zashoku.command(mod: 'remote::mpv', meth: 'time'))
+        @attr = {
+          't' => Zashoku::Formatter.duration(time[:pos]),
+          'e' => Zashoku::Formatter.duration(time[:end]),
+          'p' => Zashoku::Formatter.progress(time[:pct])
+        }
+      end
+
+      def to_f(h)
+        h.map do |k, d|
+          [
+            k,
+            begin
+              Float(d)
+            rescue TypeError
+              0
+            end
+          ]
+        end.to_h
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aniview
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 5.1.0
 platform: ruby
 authors:
 - annacrombie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg
@@ -31,106 +31,46 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.2
 - !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.8
-- !ruby/object:Gem::Dependency
-  name: deluge-rpc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-- !ruby/object:Gem::Dependency
-  name: warning
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: simple-rss
+  name: mpv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
-  name: mpv
+  name: zashoku
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
-description: Browse local anime, based on cmus
+        version: 1.5.0
+description: Browse local media, based on cmus
 email: meotleft@gmail.com
 executables:
 - aniview
@@ -138,37 +78,23 @@ extensions: []
 extra_rdoc_files: []
 files:
 - "./README.md"
+- "./config/view.yml"
 - "./lib/aniview.rb"
-- "./lib/aniview/client/aniclient.rb"
-- "./lib/aniview/interface/animeio/animefile.rb"
-- "./lib/aniview/interface/animeio/animeio.rb"
-- "./lib/aniview/interface/animeio/animeseries.rb"
-- "./lib/aniview/interface/bridge.rb"
-- "./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"
-- "./lib/aniview/interface/pref/validate.json"
-- "./lib/aniview/interface/schedule/schedule.rb"
-- "./lib/aniview/interface/schedule/scheduleitem.rb"
-- "./lib/aniview/interface/subscription/subscription.rb"
-- "./lib/aniview/util/error.rb"
-- "./lib/aniview/util/folder_listen.rb"
-- "./lib/aniview/util/term.rb"
-- "./lib/aniview/util/util.rb"
-- "./lib/aniview/view/aiomenu.rb"
-- "./lib/aniview/view/color.rb"
-- "./lib/aniview/view/delugemenu.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/application.rb"
-- "./lib/daemon.rb"
+- "./modules/animeio/README.md"
+- "./modules/animeio/config/daemon.yml"
+- "./modules/animeio/config/view.yml"
+- "./modules/animeio/lib/animeio.rb"
+- "./modules/animeio/lib/animeio/anime_indexer.rb"
+- "./modules/animeio/lib/animeio/animefile.rb"
+- "./modules/animeio/lib/animeio/animeio.rb"
+- "./modules/animeio/lib/animeio/animeio_view.rb"
+- "./modules/animeio/lib/animeio/animeseries.rb"
+- "./modules/mpv/README.md"
+- "./modules/mpv/config/daemon.yml"
+- "./modules/mpv/lib/mpv.rb"
+- "./modules/mpv/lib/mpv/filename_widget.rb"
+- "./modules/mpv/lib/mpv/mpv_controller.rb"
+- "./modules/mpv/lib/mpv/time_widget.rb"
 - bin/aniview
 homepage: https://github.com/annacrombie/aniview/
 licenses:
@@ -180,9 +106,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.99
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -190,8 +116,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: command line anime library manager
+summary: command line media library manager
 test_files: []