kaede 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 763474045525030a9ac8d0ef492f763f325dee9b
-  data.tar.gz: 03949c0dfd3f2c3e6c7764b36c08c2c9943d79e7
+  metadata.gz: 0698a5193297bca2036eaaaf8bab6af7751653c9
+  data.tar.gz: 79fd8fab1adfe6bd0e31406daed1af3438881e90
 SHA512:
-  metadata.gz: a513df57390c5a072726e9c9aeeaffe62400f3fe69dd0a2d91f191d2bf8d058edda6b0c7487d8168ce48eadd20345c1dc69a5a2d0937021966d80217c774e8cc
-  data.tar.gz: b5dc2c6b26e45d3b81e7bf34b72b1ac161d2b63567a8684e55b49b38b274af1aab7d04d7298861441cf30514627691b1b78ae802ede2378405b5623de21967b0
+  metadata.gz: 5d3760d621577b1afb34a8c610cbeeb9f8e9dcc8c7be6e7a8eb81b7b370a02a6077f7715dcf57bff2887a33f001b300f6161ff93d2b9dc3fc7b6588f2bf8b123
+  data.tar.gz: a6b336df58a7627d596ea0aac04fcb79ab222acbae432d05a9a72e8549673e06cf362eb2dcfed8fec22f58a4323addc4855a827b91d463305a47e33aa85bca0d

data/.travis.yml

@@ -2,13 +2,18 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.2
   - ruby-head
+env:
+  - DB=sqlite
+  - DB=postgres
 before_install:
   - export NOKOGIRI_USE_SYSTEM_LIBRARIES=1
 before_script:
   - bundle exec bin/kaede dbus-policy $USER > kaede.conf
   - sudo mv kaede.conf /etc/dbus-1/system.d/kaede.conf
+  - psql -c "CREATE ROLE kaede WITH LOGIN" -U postgres
+  - psql -c "CREATE DATABASE kaede_test WITH OWNER = kaede ENCODING = 'UTF-8' TEMPLATE = template0" -U postgres
 matrix:
   allow_failures:
     - rvm: ruby-head

data/README.md

@@ -1,4 +1,5 @@
 # Kaede
+[![Gem Version](https://badge.fury.io/rb/kaede.svg)](http://badge.fury.io/rb/kaede)
 [![Build Status](https://api.travis-ci.org/eagletmt/kaede.svg)](https://travis-ci.org/eagletmt/kaede)
 [![Coverage Status](https://coveralls.io/repos/eagletmt/kaede/badge.png)](https://coveralls.io/r/eagletmt/kaede)
 [![Code Climate](https://codeclimate.com/github/eagletmt/kaede.png)](https://codeclimate.com/github/eagletmt/kaede)
@@ -21,7 +22,7 @@ Or install it yourself as:
 
 ## Usage
 ### Requirements
-- sqlite3
+- SQLite3 or PostgreSQL
 - redis
 - dbus
 - recpt1
@@ -39,6 +40,8 @@ sudo mv kaede.conf /etc/dbus-1/system.d/kaede.conf
 
 cp kaede.rb.sample kaede.rb
 vim kaede.rb
+gem install pg  # gem install sqlite3
+kaede db-prepare
 
 cp kaede.service.sample kaede.service
 vim kaede.service

data/kaede.gemspec

@@ -20,17 +20,19 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "pg"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.0.0.beta2"
+  spec.add_development_dependency "rspec", ">= 3.0.0"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
-  spec.add_dependency "ruby-dbus"
   spec.add_dependency "nokogiri"
   spec.add_dependency "redis"
+  spec.add_dependency "ruby-dbus"
+  spec.add_dependency "sequel"
   spec.add_dependency "sleepy_penguin"
-  spec.add_dependency "sqlite3"
   spec.add_dependency "thor"
   spec.add_dependency "twitter"
 end

data/kaede.service.sample

@@ -5,7 +5,7 @@ Description=Kaede Recorder
 WorkingDirectory=/home/eagletmt/work/kaede
 User=eagletmt
 ExecStart=/usr/bin/bundle exec bin/kaede scheduler -c kaede.rb
-ExecReload=/usr/bin/kill -HUP $MAINPID
+ExecReload=/usr/bin/dbus-send --print-reply --system --dest=cc.wanko.kaede1 /cc/wanko/kaede1/scheduler cc.wanko.kaede1.Scheduler.Reload
 ExecStop=/usr/bin/dbus-send --print-reply --system --dest=cc.wanko.kaede1 /cc/wanko/kaede1/scheduler cc.wanko.kaede1.Scheduler.Stop
 Restart=always
 KillMode=none

data/lib/kaede/cli.rb

@@ -16,7 +16,7 @@ module Kaede
       require 'kaede/scheduler'
       load_config
 
-      db = Kaede::Database.new(Kaede.config.database_path)
+      db = Kaede::Database.new(Kaede.config.database_url)
       Kaede::Scheduler.setup(db)
       Kaede::Scheduler.start
     end
@@ -37,7 +37,7 @@ module Kaede
       require 'kaede/channel'
       load_config
 
-      db = Kaede::Database.new(Kaede.config.database_path)
+      db = Kaede::Database.new(Kaede.config.database_url)
       db.add_channel(Channel.new(nil, name, options[:recorder], options[:syoboi]))
     end
 
@@ -46,7 +46,7 @@ module Kaede
       require 'kaede/database'
       load_config
 
-      db = Kaede::Database.new(Kaede.config.database_path)
+      db = Kaede::Database.new(Kaede.config.database_url)
       db.add_tracking_title(tid.to_i)
     end
 
@@ -57,7 +57,7 @@ module Kaede
       require 'kaede/updater'
       load_config
 
-      db = Kaede::Database.new(Kaede.config.database_path)
+      db = Kaede::Database.new(Kaede.config.database_url)
       syobocal = Kaede::SyoboiCalendar.new
       Kaede::Updater.new(db, syobocal).update
     end
@@ -69,6 +69,15 @@ module Kaede
       puts DBus::Generator.new.generate_policy(user)
     end
 
+    desc 'db-prepare', 'Create tables'
+    def db_prepare
+      require 'kaede/database'
+      load_config
+
+      db = Kaede::Database.new(Kaede.config.database_url)
+      db.prepare_tables
+    end
+
     private
 
     def load_config

data/lib/kaede/config.rb

@@ -3,9 +3,9 @@ require 'redis'
 
 module Kaede
   class Config
-    attr_accessor :redis, :redis_queue, :twitter, :twitter_target
+    attr_accessor :database_url, :redis, :redis_queue, :twitter, :twitter_target
 
-    path_attrs = [:b25, :recpt1, :assdumper, :clean_ts, :statvfs, :database_path, :record_dir, :cache_dir, :cabinet_dir]
+    path_attrs = [:b25, :recpt1, :assdumper, :clean_ts, :statvfs, :record_dir, :cache_dir, :cabinet_dir]
     attr_reader *path_attrs
     path_attrs.each do |attr|
       define_method("#{attr}=") do |arg|
@@ -20,7 +20,7 @@ module Kaede
       self.clean_ts = '/usr/bin/clean-ts'
       self.statvfs = '/usr/bin/statvfs'
       basedir = Pathname.new(ENV['HOME']).join('kaede')
-      self.database_path = basedir.join('kaede.db')
+      self.database_url = "sqlite://#{basedir.join('kaede.db')}"
       self.record_dir = basedir.join('records')
       self.cache_dir = basedir.join('cache')
       self.cabinet_dir = basedir.join('cabinet')

data/lib/kaede/database.rb

@@ -1,5 +1,5 @@
 require 'forwardable'
-require 'sqlite3'
+require 'sequel'
 require 'kaede/channel'
 require 'kaede/program'
 
@@ -9,74 +9,56 @@ module Kaede
     def_delegators :@db, :transaction
 
     def initialize(path)
-      @db = SQLite3::Database.new(path.to_s)
-      @db.send(:set_boolean_pragma, 'foreign_keys', true)
-      prepare_tables
+      @db = Sequel.connect(path)
     end
 
     def prepare_tables
-      @db.execute_batch <<-SQL
-CREATE TABLE IF NOT EXISTS channels (
-  id integer PRIMARY KEY AUTOINCREMENT,
-  name varchar(255) NOT NULL UNIQUE,
-  for_recorder integer NOT NULL UNIQUE,
-  for_syoboi integer NOT NULL UNIQUE
-);
-CREATE TABLE IF NOT EXISTS programs (
-  pid integer PRIMARY KEY ON CONFLICT REPLACE,
-  tid integer NOT NULL,
-  start_time datetime NOT NULL,
-  end_time datetime NOT NULL,
-  channel_id integer NOT NULL,
-  count varchar(16),
-  start_offset integer NOT NULL,
-  subtitle varchar(255),
-  title varchar(255),
-  comment varchar(255),
-  FOREIGN KEY(channel_id) REFERENCES channels(id)
-);
-CREATE TABLE IF NOT EXISTS jobs (
-  pid integer PRIMARY KEY,
-  enqueued_at datetime NOT NULL,
-  finished_at datetime,
-  created_at datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  FOREIGN KEY(pid) REFERENCES programs(pid)
-);
-CREATE TABLE IF NOT EXISTS tracking_titles (
-  tid integer NOT NULL UNIQUE,
-  created_at datetime NOT NULL DEFAULT CURRENT_TIMESTAMP
-);
-      SQL
-    end
-    private :prepare_tables
-
-    DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S'
-
-    def to_db_datetime(time)
-      time.utc.strftime(DATETIME_FORMAT)
-    end
-
-    def from_db_datetime(str)
-      Time.parse("#{str} UTC").localtime
-    end
-
-    def current_timestamp
-      to_db_datetime(Time.now)
+      @db.create_table?(:channels) do
+        primary_key :id
+        String :name, size: 255, null: false, unique: true
+        Integer :for_recorder, null: false, unique: true
+        Integer :for_syoboi, null: false, unique: true
+      end
+      @db.create_table?(:programs) do
+        primary_key :pid
+        Integer :tid, null: false
+        DateTime :start_time, null: false
+        DateTime :end_time, null: false
+        foreign_key :channel_id, :channels
+        String :count, size: 16, null: false
+        Integer :start_offset, null: false
+        String :subtitle, size: 255
+        String :title, size: 255
+        String :comment, size: 255
+      end
+      @db.create_table?(:jobs) do
+        foreign_key :pid, :programs, primary_key: true
+        DateTime :enqueued_at, null: false
+        DateTime :finished_at
+        DateTime :created_at, null: false
+      end
+      @db.create_table?(:tracking_titles) do
+        Integer :tid, primary_key: true
+        DateTime :created_at, null: false
+      end
     end
-    private :current_timestamp
 
     def get_jobs
-      @db.execute('SELECT pid, enqueued_at FROM jobs WHERE finished_at IS NULL AND enqueued_at >= ? ORDER BY enqueued_at', [current_timestamp]).map do |pid, enqueued_at|
-        { pid: pid, enqueued_at: from_db_datetime(enqueued_at) }
-      end
+      @db.from(:jobs).select(:pid, :enqueued_at).where(finished_at: nil).where(Sequel.qualify(:jobs, :enqueued_at) >= Time.now).order(:enqueued_at).to_a
     end
 
     def update_job(pid, enqueued_at)
-      @db.execute('INSERT OR REPLACE INTO jobs (pid, enqueued_at, created_at) VALUES (?, ?, ?)', [pid, to_db_datetime(enqueued_at), current_timestamp])
+      @db.transaction do
+        if @db.from(:jobs).where(pid: pid).select(1).first
+          @db.from(:jobs).where(pid: pid).update(enqueued_at: enqueued_at)
+        else
+          @db.from(:jobs).insert(pid: pid, enqueued_at: enqueued_at, created_at: Time.now)
+        end
+      end
     end
 
     def delete_job(pid)
-      @db.execute('DELETE FROM jobs WHERE pid = ?', pid)
+      @db.from(:jobs).where(pid: pid).delete
     end
 
     def get_program(pid)
@@ -84,62 +66,69 @@ CREATE TABLE IF NOT EXISTS tracking_titles (
     end
 
     def get_programs(pids)
-      rows = @db.execute(<<-SQL)
-SELECT pid, tid, start_time, end_time, channels.name, for_syoboi, for_recorder, count, start_offset, subtitle, title, comment
-FROM programs
-INNER JOIN channels ON programs.channel_id = channels.id
-WHERE programs.pid IN (#{pids.join(', ')})
-      SQL
       programs = {}
-      rows.each do |row|
-        program = Program.new(*row)
-        program.start_time = from_db_datetime(program.start_time)
-        program.end_time = from_db_datetime(program.end_time)
+      @db.from(:programs).inner_join(:channels, [[channel_id: :id]]).where(pid: pids).each do |row|
+        program = Program.new(
+          row[:pid],
+          row[:tid],
+          row[:start_time],
+          row[:end_time],
+          row[:name],
+          row[:for_syoboi],
+          row[:for_recorder],
+          row[:count],
+          row[:start_offset],
+          row[:subtitle],
+          row[:title],
+          row[:comment],
+        )
         programs[program.pid] = program
       end
       programs
     end
 
     def mark_finished(pid)
-      @db.execute('UPDATE jobs SET finished_at = ? WHERE pid = ?', [current_timestamp, pid])
+      @db.from(:jobs).where(pid: pid).update(finished_at: Time.now)
     end
 
     def get_channels
-      @db.execute('SELECT * FROM channels').map do |row|
-        Channel.new(*row)
+      @db.from(:channels).map do |row|
+        Channel.new(row[:id], row[:name], row[:for_recorder], row[:for_syoboi])
       end
     end
 
     def add_channel(channel)
-      @db.execute('INSERT INTO channels (name, for_recorder, for_syoboi) VALUES (?, ?, ?)', [channel.name, channel.for_recorder, channel.for_syoboi])
+      @db.from(:channels).insert(name: channel.name, for_recorder: channel.for_recorder, for_syoboi: channel.for_syoboi)
     end
 
     def update_program(program, channel)
-      row = [
-        program.pid,
-        program.tid,
-        to_db_datetime(program.start_time),
-        to_db_datetime(program.end_time),
-        channel.id,
-        program.count,
-        program.start_offset,
-        program.subtitle,
-        program.title,
-        program.comment,
-      ]
-      @db.execute(<<-SQL, row)
-INSERT INTO programs (pid, tid, start_time, end_time, channel_id, count, start_offset, subtitle, title, comment)
-VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-      SQL
+      attributes = {
+        tid: program.tid,
+        start_time: program.start_time,
+        end_time: program.end_time,
+        channel_id: channel.id,
+        count: program.count,
+        start_offset: program.start_offset,
+        subtitle: program.subtitle,
+        title: program.title,
+        comment: program.comment,
+      }
+      @db.transaction do
+        if @db.from(:programs).where(pid: program.pid).select(1).first
+          @db.from(:programs).where(pid: program.pid).update(attributes)
+        else
+          @db.from(:programs).insert(attributes.merge(pid: program.pid))
+        end
+      end
     end
 
     def add_tracking_title(tid)
-      @db.execute('INSERT INTO tracking_titles (tid, created_at) VALUES (?, ?)', [tid, current_timestamp])
+      @db.from(:tracking_titles).insert(tid: tid, created_at: Time.now)
     end
 
     def get_tracking_titles
-      @db.execute('SELECT tid FROM tracking_titles').map do |row|
-        row[0]
+      @db.from(:tracking_titles).select(:tid).map do |row|
+        row[:tid]
       end
     end
   end

data/lib/kaede/dbus/main.rb

@@ -0,0 +1,73 @@
+# Based on DBus::Main in ruby-dbus gem.
+# Stop the main loop as quick as possible.
+require 'sleepy_penguin'
+
+module Kaede
+  module DBus
+    class Main
+      def initialize
+        @buses = Hash.new
+        @quit_event = SleepyPenguin::EventFD.new(0, :SEMAPHORE)
+      end
+
+      def <<(bus)
+        @buses[bus.message_queue.socket] = bus
+      end
+
+      def quit
+        @quit_event.incr(1)
+      end
+
+      def loop
+        flush_buffers
+
+        epoll = prepare_epoll
+        begin
+          while !@buses.empty?
+            epoll.wait do |events, io|
+              if io == @quit_event
+                io.value
+                return
+              end
+              handle_socket(io)
+            end
+          end
+        ensure
+          epoll.close
+        end
+      end
+
+      def handle_socket(socket)
+        bus = @buses[socket]
+        begin
+          bus.message_queue.buffer_from_socket_nonblock
+        rescue EOFError, SystemCallError
+          @buses.delete(socket) # this bus died
+          return
+        end
+        while message = bus.message_queue.message_from_buffer_nonblock
+          bus.process(message)
+        end
+      end
+
+      def flush_buffers
+        # before blocking, empty the buffers
+        # https://bugzilla.novell.com/show_bug.cgi?id=537401
+        @buses.each_value do |b|
+          while m = b.message_queue.message_from_buffer_nonblock
+            b.process(m)
+          end
+        end
+      end
+
+      def prepare_epoll
+        SleepyPenguin::Epoll.new.tap do |epoll|
+          epoll.add(@quit_event, [:IN])
+          @buses.each_key do |socket|
+            epoll.add(socket, [:IN])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kaede/dbus/program.rb

@@ -1,6 +1,7 @@
 require 'dbus'
 require 'nokogiri'
 require 'time'
+require 'kaede/dbus/properties'
 
 module Kaede
   module DBus
@@ -16,6 +17,10 @@ module Kaede
         @enqueued_at = enqueued_at
       end
 
+      include Properties
+      properties_for PROGRAM_INTERFACE, :properties
+      define_properties
+
       def to_xml
         Nokogiri::XML::Builder.new do |xml|
           xml.doc.create_internal_subset(
@@ -30,64 +35,11 @@ module Kaede
               end
             end
 
-            xml.interface(name: PROPERTY_INTERFACE) do
-              xml.method_(name: 'Get') do
-                xml.arg(name: 'interface', direction: 'in', type: 's')
-                xml.arg(name: 'property', direction: 'in', type: 's')
-                xml.arg(name: 'value', direction: 'out', type: 'v')
-              end
-
-              xml.method_(name: 'GetAll') do
-                xml.arg(name: 'interface', direction: 'in', type: 's')
-                xml.arg(name: 'properties', direction: 'out', type: 'a{sv}')
-              end
-
-              xml.method_(name: 'Set') do
-                xml.arg(name: 'interface', direction: 'in', type: 's')
-                xml.arg(name: 'property', direction: 'in', type: 's')
-                xml.arg(name: 'value', direction: 'in', type: 'v')
-              end
-            end
-
-            xml.interface(name: PROGRAM_INTERFACE) do
-              properties.each_key do |key|
-                xml.property(name: key, type: 's', access: 'read')
-              end
-            end
+            xml_for_properties(xml)
           end
         end.to_xml
       end
 
-      dbus_interface PROPERTY_INTERFACE do
-        dbus_method :Get, 'in interface:s, in property:s, out value:v' do |iface, prop|
-          case iface
-          when PROGRAM_INTERFACE
-            if properties.has_key?(prop)
-              [properties[prop]]
-            else
-              raise_unknown_property!
-            end
-          else
-            raise_unknown_property!
-          end
-        end
-
-        dbus_method :GetAll, 'in interface:s, out properties:a{sv}' do |iface|
-          case iface
-          when PROGRAM_INTERFACE
-            [properties]
-          when PROGRAM_INTERFACE
-            [{}]
-          else
-            unknown_interface!
-          end
-        end
-
-        dbus_method :Set, 'in interface:s, in property:s, in value:v' do |iface, prop, val|
-          raise_access_denied!
-        end
-      end
-
       dbus_interface PROGRAM_INTERFACE do
       end
 
@@ -108,18 +60,6 @@ module Kaede
           'EnqueuedAt' => @enqueued_at.iso8601,
         }
       end
-
-      def raise_unknown_interface!
-        raise ::DBus.error('org.freedesktop.DBus.Error.UnknownInterface')
-      end
-
-      def raise_unknown_property!
-        raise ::DBus.error('org.freedesktop.DBus.Error.UnknownProperty')
-      end
-
-      def raise_access_denied!
-        raise ::DBus.error('org.freedesktop.DBus.Error.AccessDenied')
-      end
     end
   end
 end

data/lib/kaede/dbus/properties.rb

@@ -0,0 +1,96 @@
+module Kaede
+  module DBus
+    module Properties
+      PROPERTY_INTERFACE = 'org.freedesktop.DBus.Properties'
+
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def properties_method
+          @properties_method ||= {}
+        end
+
+        def properties_for(iface, method_sym)
+          self.properties_method[iface] = method_sym
+        end
+
+        def define_properties
+          dbus_interface PROPERTY_INTERFACE do
+            dbus_method :Get, 'in interface:s, in property:s, out value:v' do |iface, prop|
+              get_property(iface, prop)
+            end
+
+            dbus_method :GetAll, 'in interface:s, out properties:a{sv}' do |iface|
+              get_properties(iface)
+            end
+
+            dbus_method :Set, 'in interface:s, in property:s, in value:v' do |iface, prop, val|
+              raise_access_denied!
+            end
+          end
+        end
+      end
+
+      def xml_for_dbus_properties(xml)
+        xml.interface(name: PROPERTY_INTERFACE) do
+          xml.method_(name: 'GetAll') do
+            xml.arg(name: 'interface', direction: 'in', type: 's')
+            xml.arg(name: 'properties', direction: 'out', type: 'a{sv}')
+          end
+
+          helper = lambda do |verb, dir|
+            xml.method_(name: verb) do
+              xml.arg(name: 'interface', direction: 'in', type: 's')
+              xml.arg(name: 'property', direction: 'in', type: 's')
+              xml.arg(name: 'value', direction: dir, type: 'v')
+            end
+          end
+          helper.call('Get', 'out')
+          helper.call('Set', 'in')
+        end
+      end
+
+      def xml_for_properties(xml)
+        xml_for_dbus_properties(xml)
+        self.class.properties_method.each do |iface, method_sym|
+          xml.interface(name: iface) do
+            send(method_sym).each_key do |key|
+              xml.property(name: key, type: 's', access: 'read')
+            end
+          end
+        end
+      end
+
+      def get_property(iface, prop)
+        props = get_properties(iface).first
+        if props.has_key?(prop)
+          [props[prop]]
+        else
+          raise_unknown_property!
+        end
+      end
+
+      def get_properties(iface)
+        if sym = self.class.properties_method[iface]
+          [send(sym)]
+        else
+          unknown_interface!
+        end
+      end
+
+      def raise_unknown_interface!
+        raise ::DBus.error('org.freedesktop.DBus.Error.UnknownInterface')
+      end
+
+      def raise_unknown_property!
+        raise ::DBus.error('org.freedesktop.DBus.Error.UnknownProperty')
+      end
+
+      def raise_access_denied!
+        raise ::DBus.error('org.freedesktop.DBus.Error.AccessDenied')
+      end
+    end
+  end
+end

data/lib/kaede/notifier.rb

@@ -31,6 +31,22 @@ module Kaede
       tweet(msg)
     end
 
+    def notify_duration_error(program, got_duration)
+      msg = sprintf('%s (PID:%d) の長さが%g秒しか無いようだが……', format_title(program), program.pid, got_duration)
+      if @twitter_target
+        msg = "@#{@twitter_target} #{msg}"
+      end
+      tweet(msg)
+    end
+
+    def notify_redo_error(program)
+      msg = "再実行にも失敗した…… (PID:#{program.pid})"
+      if @twitter_target
+        msg = "@#{@twitter_target} #{msg}"
+      end
+      tweet(msg)
+    end
+
     def format_title(program)
       buf = "#{program.channel_name}で「#{program.title}"
       if program.count

data/lib/kaede/recorder.rb

@@ -1,6 +1,7 @@
 require 'date'
-require 'open3'
 require 'fileutils'
+require 'json'
+require 'open3'
 
 module Kaede
   class Recorder
@@ -90,7 +91,7 @@ module Kaede
       @ass_pipe_r.close
     end
 
-    BUFSIZ = 188 * 16
+    BUFSIZ = 188 * 1024
 
     def spawn_repeater
       @repeater_thread = Thread.start do
@@ -122,6 +123,9 @@ module Kaede
 
     def after_record(program)
       @notifier.notify_after_record(program)
+      unless verify_duration(program, cache_path(program))
+        redo_ts_process(program)
+      end
       move_ass_to_cabinet(program)
       clean_ts(program)
       enqueue_to_redis(program)
@@ -143,8 +147,50 @@ module Kaede
       end
     end
 
+    def redo_ts_process(program)
+      unless system(Kaede.config.b25.to_s, '-v0', '-s1', '-m1', record_path(program).to_s, cache_path(program).to_s)
+        @notifier.notify_redo_error(program)
+        return false
+      end
+      unless system(Kaede.config.assdumper.to_s, record_path(program).to_s, out: cache_ass_path(program).to_s)
+        @notifier.notify_redo_error(program)
+        return false
+      end
+      unless verify_duration(program, cache_path(program))
+        @notifier.notify_redo_error(program)
+        return false
+      end
+      true
+    end
+
     def enqueue_to_redis(program)
       Kaede.config.redis.rpush(Kaede.config.redis_queue, program.formatted_fname)
     end
+
+    ALLOWED_DURATION_ERROR = 20
+
+    def verify_duration(program, path)
+      expected_duration = calculate_duration(program)
+      json = ffprobe(path)
+      got_duration = json['duration'].to_f
+      if (got_duration - expected_duration).abs < ALLOWED_DURATION_ERROR
+        true
+      else
+        @notifier.notify_duration_error(program, got_duration)
+        false
+      end
+    end
+
+    class FFprobeError < StandardError
+    end
+
+    def ffprobe(path)
+      outbuf, errbuf, status = Open3.capture3('ffprobe', '-show_format', '-print_format', 'json', path.to_s)
+      if status.success?
+        JSON.parse(outbuf)['format']
+      else
+        raise FFprobeError.new("ffprobe exited with #{status.exitstatus}: #{errbuf}")
+      end
+    end
   end
 end

data/lib/kaede/scheduler.rb

@@ -2,6 +2,7 @@ require 'dbus'
 require 'thread'
 require 'sleepy_penguin'
 require 'kaede/dbus'
+require 'kaede/dbus/main'
 require 'kaede/dbus/program'
 require 'kaede/dbus/scheduler'
 require 'kaede/notifier'
@@ -12,7 +13,7 @@ module Kaede
 
     def setup(db)
       @db = db
-      setup_signals
+      prepare_events
       $stdout.sync = true
       $stderr.sync = true
       @recorder_queue = Queue.new
@@ -23,11 +24,13 @@ module Kaede
 
     POISON = Object.new
 
-    def setup_signals
+    def prepare_events
       @reload_event = SleepyPenguin::EventFD.new(0, :SEMAPHORE)
-
       @stop_event = SleepyPenguin::EventFD.new(0, :SEMAPHORE)
-      trap(:QUIT) { @stop_event.incr(1) }
+    end
+
+    def fire_stop
+      @stop_event.incr(1)
     end
 
     def start_recorder_waiter
@@ -50,18 +53,29 @@ module Kaede
       @recorder_waiter.join
     end
 
-    def start_epoll
-      epoll = SleepyPenguin::Epoll.new
-      epoll.add(@reload_event, [:IN])
-      epoll.add(@stop_event, [:IN])
-
+    def prepare_timerfds
       @timerfds = {}
       @db.get_jobs.each do |job|
         tfd = SleepyPenguin::TimerFD.new(:REALTIME)
         tfd.settime(:ABSTIME, 0, job[:enqueued_at].to_i)
-        epoll.add(tfd, [:IN])
         @timerfds[tfd.fileno] = [tfd, job[:pid]]
       end
+      @timerfds
+    end
+
+    def prepare_epoll
+      prepare_timerfds
+      SleepyPenguin::Epoll.new.tap do |epoll|
+        epoll.add(@reload_event, [:IN])
+        epoll.add(@stop_event, [:IN])
+        @timerfds.each_value do |tfd, _|
+          epoll.add(tfd, [:IN])
+        end
+      end
+    end
+
+    def start_epoll
+      epoll = prepare_epoll
       puts "Loaded #{@timerfds.size} schedules"
       start_dbus
 
@@ -99,7 +113,13 @@ module Kaede
     def start_dbus
       bus = ::DBus.system_bus
       service = bus.request_service(DBus::DESTINATION)
+      dbus_export_programs(service)
+      service.export(DBus::Scheduler.new(@reload_event, @stop_event))
+
+      @dbus_thread = start_dbus_loop(bus)
+    end
 
+    def dbus_export_programs(service)
       programs = @db.get_programs(@timerfds.values.map { |_, pid| pid })
       @timerfds.each_value do |tfd, pid|
         _, value = tfd.gettime
@@ -116,16 +136,16 @@ module Kaede
           end
         end
       end
+    end
 
-      service.export(DBus::Scheduler.new(@reload_event, @stop_event))
-
-      @dbus_main = ::DBus::Main.new
+    def start_dbus_loop(bus)
+      @dbus_main = DBus::Main.new
       @dbus_main << bus
-      @dbus_thread = Thread.start do
+      Thread.start do
         max_retries = 10
         retries = 0
         begin
-          @dbus_main.run
+          @dbus_main.loop
         rescue ::DBus::Connection::NameRequestError => e
           puts "#{e.class}: #{e.message}"
           if retries < max_retries

data/lib/kaede/version.rb

@@ -1,3 +1,3 @@
 module Kaede
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/kaede/recorder_spec.rb

@@ -8,7 +8,7 @@ require 'kaede/updater'
 describe Kaede::Recorder do
   let(:notifier) { double('Notifier') }
   let(:recorder) { described_class.new(notifier) }
-  let(:db) { Kaede::Database.new(':memory:') }
+  let(:db) { Kaede::Database.new(DatabaseHelper.database_url) }
   let(:job) { db.get_jobs.first }
   let(:program) { db.get_program(job[:pid]) }
   let(:duration) { 30 }
@@ -24,12 +24,15 @@ describe Kaede::Recorder do
   let(:cabinet_ass_path) { recorder.cabinet_ass_path(program) }
 
   before do
+    db.prepare_tables
     db.add_channel(Kaede::Channel.new(nil, 'MX', 9, 19))
     channel = db.get_channels.first
     program = Kaede::Program.new(1234, 5678, Time.now, Time.now + duration, nil, 19, 9, '6', 0, 'sub', 'title', 'comment')
     db.update_program(program, channel)
     db.update_job(program.pid, Time.now + 5)
 
+    allow(recorder).to receive(:verify_duration)
+
     Kaede.configure do |config|
       config.redis = double('redis')
       tools = @topdir.join('tools')
@@ -72,6 +75,7 @@ describe Kaede::Recorder do
 
       allow(Kaede.config.redis).to receive(:rpush)
       allow(notifier).to receive(:notify_after_record).with(program)
+      allow(recorder).to receive(:verify_duration).and_return(true)
     end
 
     it 'calls Notifier#notify_after_record' do
@@ -173,4 +177,30 @@ describe Kaede::Recorder do
       end
     end
   end
+
+  describe '#verify_duration' do
+    let(:duration) { 1800 }
+    let(:got_duration) { 1789.21 }
+
+    before do
+      # Unstub verify_duration
+      allow(recorder).to receive(:verify_duration).and_call_original
+
+      allow(recorder).to receive(:ffprobe).and_return('duration' => got_duration)
+    end
+
+    it 'verifies the duration of recorded MPEG2-TS' do
+      expect(recorder.verify_duration(program, double('path to MPEG2-TS'))).to eq(true)
+    end
+
+    context 'when the duration is too short' do
+      let(:got_duration) { 1750.45 }
+
+      it 'notifies the verification error' do
+        expect(notifier).to receive(:notify_duration_error)
+
+        expect(recorder.verify_duration(program, double('path to MPEG2-TS'))).to eq(false)
+      end
+    end
+  end
 end

data/spec/kaede/scheduler_spec.rb

@@ -6,10 +6,14 @@ require 'kaede'
 require 'kaede/database'
 require 'kaede/recorder'
 require 'kaede/scheduler'
+require 'kaede/dbus'
 
 describe Kaede::Scheduler do
-  let(:db_file) { Tempfile.open('kaede.db') }
-  let(:db) { Kaede::Database.new(db_file.path) }
+  let(:db) { Kaede::Database.new(DatabaseHelper.database_url) }
+
+  before do
+    db.prepare_tables
+  end
 
   describe '.start' do
     let(:program) { Kaede::Program.new(1234, 5678, Time.now, Time.now + 30, nil, 19, 9, '5.5', 0, 'sub', 'title', '') }
@@ -22,32 +26,23 @@ describe Kaede::Scheduler do
     end
 
     it 'works' do
-      r, w = IO.pipe
+      q = Queue.new
       allow_any_instance_of(Kaede::Recorder).to receive(:record) { |recorder, db, pid|
-        program = db.get_program(pid)
-        puts "Record #{program.pid}"
+        q.push(pid)
       }
-      pid = fork do
-        r.close
-        $stdout.reopen(w)
-        described_class.setup(db)
+      described_class.setup(db)
+      expect(db.get_jobs.size).to eq(1)
+      thread = Thread.start do
         described_class.start
       end
-      w.close
 
-      expect(db.get_jobs.size).to eq(1)
       begin
         Timeout.timeout(10) do
-          while s = r.gets.chomp
-            if s =~ /\ARecord (\d+)\z/
-              expect($1.to_i).to eq(program.pid)
-              break
-            end
-          end
+          expect(q.pop).to eq(program.pid)
         end
       ensure
-        Process.kill(:QUIT, pid)
-        Process.waitpid(pid)
+        described_class.fire_stop
+        thread.join
       end
       expect(db.get_jobs.size).to eq(0)
     end

data/spec/kaede/updater_spec.rb

@@ -5,10 +5,14 @@ require 'kaede/syoboi_calendar'
 require 'kaede/updater'
 
 describe Kaede::Updater do
-  let(:db) { Kaede::Database.new(':memory:') }
+  let(:db) { Kaede::Database.new(DatabaseHelper.database_url) }
   let(:syobocal) { Kaede::SyoboiCalendar.new }
   let(:updater) { described_class.new(db, syobocal) }
 
+  before do
+    db.prepare_tables
+  end
+
   describe '#update' do
     let(:channel) { Kaede::Channel.new(nil, 'MX', 9, 19) }
     let(:tracking_tid) { 3225 }

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'coveralls'
+require 'sequel'
 require 'simplecov'
 require 'timecop'
 require 'tmpdir'
@@ -12,9 +13,6 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
 SimpleCov.start do
   add_filter Bundler.bundle_path.to_s
   add_filter File.dirname(__FILE__)
-
-  # Kaede::Scheduler is tested in another process.
-  add_filter 'lib/kaede/scheduler.rb'
 end
 
 VCR.configure do |config|
@@ -41,6 +39,13 @@ RSpec.configure do |config|
     @topdir = Pathname.new(__FILE__).parent
   end
 
+  config.before :suite do
+    DatabaseHelper.clean
+  end
+  config.after :each do
+    DatabaseHelper.clean
+  end
+
   config.around :each do |example|
     Dir.mktmpdir('kaede') do |dir|
       @tmpdir = Pathname.new(dir)
@@ -48,3 +53,29 @@ RSpec.configure do |config|
     end
   end
 end
+
+module DatabaseHelper
+  module_function
+
+  def database_url
+    if ENV['DB'] == 'postgres'
+      "postgres://localhost/kaede_test?user=kaede"
+    else
+      'sqlite://kaede.db'
+    end
+  end
+
+  def clean
+    db = Sequel.connect(database_url)
+    [
+      :tracking_titles,
+      :jobs,
+      :programs,
+      :channels,
+    ].each do |table|
+      if db.table_exists?(table)
+        db.from(table).delete
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaede
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +70,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-dbus
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: ruby-dbus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sleepy_penguin
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: sleepy_penguin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -247,7 +275,9 @@ files:
 - lib/kaede/database.rb
 - lib/kaede/dbus.rb
 - lib/kaede/dbus/generator.rb
+- lib/kaede/dbus/main.rb
 - lib/kaede/dbus/program.rb
+- lib/kaede/dbus/properties.rb
 - lib/kaede/dbus/scheduler.rb
 - lib/kaede/notifier.rb
 - lib/kaede/program.rb