aniview 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5133f4271bdb6e94799eb492eb7b0b4b6e979bf
-  data.tar.gz: bb5a1a3ecc62de7ec23cb107b4754d7d5772a60b
+  metadata.gz: 5a1bad844f503c4a144cfee3edfbaf0298accf39
+  data.tar.gz: 229fb0fc773870c98b4ba70cfcb967bd50f2c990
 SHA512:
-  metadata.gz: ff10e4467ecc4fb3c641053910a6d302fdd5073a8a641b03a71837b8d8ad7a0d8342f10abe8636429c75affe998d230fac39d6f6eda2b3b19a9de12c52f185d0
-  data.tar.gz: 0eed2442834d09f373e2fe0cec793eaa242759457856f3995e89440eea4419e9fc40d25730fdb1b7ac4671d85d4f48531cbb0fc7556c9db49c71f4335de5016f
+  metadata.gz: 6e62de1566a48fda77f5b315d3db4b7997f8f54cf7366ed610e9c39e30e1f2ba9164d872ca6491f408aee2b1b2ab48c49976e115f94dcd4c4129be30bbecbd74
+  data.tar.gz: cb54c2628f3cf600f827d899b3ea4609496bb82a54cb2a4ff99889b52c44cdd05598b9845080c7f246f845f82baeda88db98fa3e99b7996cf87cb049d2ed22c0

data/bin/aniview

@@ -1,22 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-module Zashoku
-  AppConf = {
-    app: {
-      root: File.expand_path('../', __dir__),
-      name: 'aniview',
-      modules: {
-        viewer: %w[AnimeIO Mpv MPVCSide],
-        daemon: %w[AnimeIO Mpv MPVCSide]
-      },
-      save_config: true,
-      save_history: true,
-      persistent_daemon: true
-    }
-  }
-end
-
+require_relative '../lib/aniview'
 require 'zashoku'
 
 Zashoku.main(ARGV)

data/lib/aniview.rb

@@ -1,3 +1,21 @@
+# frozen_string_literal: true
+
 module Aniview
-  Version = [5, 2, 0].freeze
+  Version = [5, 3, 0].freeze
+end
+
+module Zashoku
+  AppConf = {
+    app: {
+      root: File.expand_path('../', __dir__),
+      name: 'aniview',
+      modules: {
+        viewer: %w[AnimeIO Mpv MPVCSide],
+        daemon: %w[AnimeIO Mpv MPVCSide]
+      },
+      save_config: true,
+      save_history: true,
+      persistent_daemon: true
+    }
+  }
 end

data/modules/{mpv_cside → mpvcside}/lib/mpv_cside/mpv_cside_controller.rb

@@ -8,6 +8,7 @@ module Zashoku
       end
 
       def watch(file)
+        Zashoku.logger.info("pulling file #{file} for mpvcside")
         File.open(file, 'r', &:read)
       end
     end

data/modules/mpvcside/lib/mpv_cside/mpv_cside_view.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+require 'securerandom'
+require 'fileutils'
+
+module Zashoku
+  module MPVCSide
+    class MPVCSideView < Zashoku::View
+      TMP_FILE = '/tmp/cside-stream-' + SecureRandom.uuid
+
+      def initialize
+        @tmp_file = TMP_FILE + '-' + SecureRandom.uuid
+        super
+      end
+
+      def cleanup
+        FileUtils.rm(@tmp_file)
+      rescue Errno::ENOENT
+        Zashoku.logger.warn("mpvcside: file #{@tmp_file} does not exist")
+      end
+
+      def watch(file)
+        Zashoku::Util.alert(TMP_FILE)
+        Thread.new do
+          Zashoku.command(
+            mod: 'remote::mpvcside',
+            meth: 'watch',
+            args: [file],
+            to_file: @tmp_file
+          )
+        end
+        sleep 0.1
+        while File.stat(@tmp_file).size < 1
+          sleep 0.1
+        end
+        play_tmp
+      end
+
+      def play_tmp
+        connect
+        @mpv.client.command('loadfile', @tmp_file)
+      end
+
+      def connect
+        return unless @mpv&.client&.get_property('idle-active') == nil
+
+        @mpv = MPV::Session.new(
+          user_args: []
+        )
+      end
+
+      def refresh_attributes; end
+      def refresh_items; {} end
+      def get_format; {'title' => ''} end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aniview
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - annacrombie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg
@@ -95,12 +95,12 @@ files:
 - "./modules/mpv/lib/mpv/filename_widget.rb"
 - "./modules/mpv/lib/mpv/mpv_controller.rb"
 - "./modules/mpv/lib/mpv/time_widget.rb"
-- "./modules/mpv_cside/README.md"
-- "./modules/mpv_cside/config/daemon.yml"
-- "./modules/mpv_cside/config/view.yml"
-- "./modules/mpv_cside/lib/mpv_cside.rb"
-- "./modules/mpv_cside/lib/mpv_cside/mpv_cside_controller.rb"
-- "./modules/mpv_cside/lib/mpv_cside/mpv_cside_view.rb"
+- "./modules/mpvcside/README.md"
+- "./modules/mpvcside/config/daemon.yml"
+- "./modules/mpvcside/config/view.yml"
+- "./modules/mpvcside/lib/mpv_cside/mpv_cside_controller.rb"
+- "./modules/mpvcside/lib/mpv_cside/mpv_cside_view.rb"
+- "./modules/mpvcside/lib/mpvcside.rb"
 - bin/aniview
 homepage: https://github.com/annacrombie/aniview/
 licenses:

data/modules/mpv_cside/lib/mpv_cside/mpv_cside_view.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-module Zashoku
-  module MPVCSide
-    class MPVCSideView < Zashoku::View
-      TMP_FILE = '/tmp/cside_stream'
-
-      def refresh_attributes
-        @attributes = {
-          't' => Zashoku.conf.get(%w[title mpv_cside]),
-        }
-      end
-
-      def watch(file)
-        Thread.new do
-          Zashoku.command(
-            mod: 'remote::mpv_cside',
-            meth: 'watch',
-            args: [file],
-            to_file: TMP_FILE
-          )
-        end
-        sleep 1
-        connect
-        @mpv.client.command('loadfile', TMP_FILE)
-      end
-
-      def connect
-        return unless @mpv&.client&.get_property('idle-active') == nil
-
-        @mpv = MPV::Session.new(
-          user_args: []
-        )
-      end
-
-      def refresh_items
-        {}
-      end
-
-      def get_format
-        {'title' => ''}
-      end
-    end
-  end
-end