duo_splitter 0.1.0 → 0.2.0

data/lib/duo_splitter/services/create_overlapping_sentences.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module DuoSplitter
+  module Services
+    class CreateOverlappingSentences
+      def initialize(context:)
+        @context = context
+      end
+
+      def run
+        TempDirWrapper.new(context: @context).run do
+          Support::SplitTracks.new(context: @context).run
+          Support::OverlappingConcatenate.new(context: @context).run
+          Support::Encode.new(context: @context).run
+        end
+      end
+    end
+  end
+end

data/lib/duo_splitter/services/create_repeating_sentences.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module DuoSplitter
+  module Services
+    class CreateRepeatingSentences
+      def initialize(context:)
+        @context = context
+      end
+
+      def run
+        TempDirWrapper.new(context: @context).run do
+          Support::SplitTracks.new(context: @context).run
+          Support::CreateBlankSentences.new(context: @context).run
+          Support::RepeatingConcatenate.new(context: @context).run
+          Support::Encode.new(context: @context).run
+        end
+      end
+    end
+  end
+end

data/lib/duo_splitter/services/create_sentences.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module DuoSplitter
+  module Services
+    class CreateSentences
+      def initialize(context:)
+        @context = context
+      end
+
+      def run
+        TempDirWrapper.new(context: @context).run do
+          Support::SplitTracks.new(context: @context).run
+          Support::Encode.new(context: @context).run
+        end
+      end
+    end
+  end
+end

data/lib/duo_splitter/services/support/base_concatenate.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module DuoSplitter
+  module Services
+    module Support
+      class BaseConcatenate
+        attr_reader :context, :commands
+
+        def initialize(context:)
+          @context = context
+          @commands = build_commands
+        end
+
+        def run
+          return if @commands.empty?
+
+          BatchProcessor.new(message: 'concatenating...', show_progress: @context.show_progress).run(@commands)
+        end
+
+        private
+
+        def build_commands
+          sentences.map do |sentence|
+            output_path = @context.temp_dir.join(sentence.output_basename(prefix_section_number: @context.prefix_section_number, concatenated: true, ext: 'wav'))
+
+            sentence.source_audio_path = output_path
+
+            command = [@context.sox_path]
+            command += source_paths(sentence)
+            command += [output_path.to_s]
+
+            command
+          end
+        end
+
+        def sentences
+          raise Error, '#sentences must be defined in sub classes'
+        end
+
+        def source_paths(_sentence)
+          raise Error, '#source_paths must be defined in sub classes'
+        end
+      end
+    end
+  end
+end

data/lib/duo_splitter/services/support/create_blank_sentences.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module DuoSplitter
+  module Services
+    module Support
+      class CreateBlankSentences
+        attr_reader :commands
+
+        def initialize(context:)
+          @context = context
+          @commands = build_commands
+        end
+
+        def run
+          return if @commands.empty?
+
+          BatchProcessor.new(message: 'creating blank sentences...', show_progress: @context.show_progress).run(@commands)
+        end
+
+        private
+
+        def build_commands
+          sentences = @context.album.sentences(intro: @context.output_intro).select(&:audio_path)
+
+          sentences.map do |sentence|
+            output_path = @context.temp_dir.join(sentence.output_basename(prefix_section_number: @context.prefix_section_number, blank: true, ext: 'wav'))
+
+            sentence.blank_audio_path = output_path
+
+            command = [@context.sox_path]
+            command += %w[-n -c 2 -e signed-integer -r 44100 -b 16]
+            command += [output_path.to_s, 'trim', '0.0', sentence.duration.to_s]
+
+            command
+          end
+        end
+      end
+    end
+  end
+end

data/lib/duo_splitter/services/support/encode.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module DuoSplitter
+  module Services
+    module Support
+      class Encode
+        def initialize(context:)
+          @context = context
+        end
+
+        def run
+          output_format = @context.output_format.to_sym
+
+          encoder_class = Encoders::BaseEncoder.known_encoders[output_format]
+
+          raise Error, "unknown output format: #{output_format}" unless encoder_class
+
+          encoder_class.new(context: @context).run
+        end
+      end
+    end
+  end
+end

data/lib/duo_splitter/services/support/overlapping_concatenate.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module DuoSplitter
+  module Services
+    module Support
+      class OverlappingConcatenate < BaseConcatenate
+        private
+
+        def sentences
+          context.album.sentences(intro: context.output_intro).select(&:audio_path)
+        end
+
+        def source_paths(sentence)
+          [context.notification_sound_path.to_s, sentence.audio_path.to_s]
+        end
+      end
+    end
+  end
+end

data/lib/duo_splitter/services/support/repeating_concatenate.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module DuoSplitter
+  module Services
+    module Support
+      class RepeatingConcatenate < BaseConcatenate
+        private
+
+        def sentences
+          context.album.sentences(intro: context.output_intro).select {|sentence| sentence.audio_path && sentence.blank_audio_path }
+        end
+
+        def source_paths(sentence)
+          paths = [sentence.audio_path.to_s]
+          paths += [context.notification_sound_path.to_s] if context.use_notification_sound
+          paths += [sentence.blank_audio_path.to_s]
+          paths
+        end
+      end
+    end
+  end
+end

data/lib/duo_splitter/services/support/split_tracks.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module DuoSplitter
+  module Services
+    module Support
+      class SplitTracks
+        attr_reader :commands
+
+        def initialize(context:)
+          @context = context
+          @commands = build_commands
+        end
+
+        def run
+          return if @commands.empty?
+
+          BatchProcessor.new(message: 'splitting...', show_progress: @context.show_progress).run(@commands)
+        end
+
+        private
+
+        def build_commands
+          sentences = @context.album.sentences(intro: @context.output_intro).select {|sentence| sentence.section.audio_path }
+
+          sentences.map do |sentence|
+            output_path = @context.temp_dir.join(sentence.output_basename(prefix_section_number: @context.prefix_section_number, ext: 'wav'))
+
+            sentence.source_audio_path = sentence.audio_path = output_path
+
+            command = [@context.ffmpeg_path, '-y']
+            command += ['-i', sentence.section.audio_path.to_s]
+            command += ['-ss', sentence.start_pos, '-to', sentence.end_pos]
+            command += %w[-codec:a pcm_s16le -ar 44100 -ac 2]
+            command += [output_path.to_s]
+
+            command
+          end
+        end
+      end
+    end
+  end
+end

data/lib/duo_splitter/temp_dir_wrapper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'pathname'
+require 'tmpdir'
+
+module DuoSplitter
+  class TempDirWrapper
+    def initialize(context:)
+      @context = context
+    end
+
+    def run
+      Dir.mktmpdir do |dirname|
+        @context.temp_dir = Pathname.new(dirname)
+
+        yield
+      end
+    end
+  end
+end

data/lib/duo_splitter/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DuoSplitter
-  VERSION = "0.1.0"
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duo_splitter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - healthypackrat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2020-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +60,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.ja.md
 - README.md
 - data/labels/01.txt
 - data/labels/02.txt
@@ -108,15 +109,31 @@ files:
 - data/labels/45.txt
 - exe/duo_splitter
 - lib/duo_splitter.rb
-- lib/duo_splitter/aac_encoder.rb
-- lib/duo_splitter/album.rb
-- lib/duo_splitter/encoder.rb
-- lib/duo_splitter/mp3_encoder.rb
+- lib/duo_splitter/batch_processor.rb
+- lib/duo_splitter/commands/base_command.rb
+- lib/duo_splitter/commands/overlapping_command.rb
+- lib/duo_splitter/commands/repeating_command.rb
+- lib/duo_splitter/commands/split_command.rb
+- lib/duo_splitter/context.rb
+- lib/duo_splitter/encoders/aac_encoder.rb
+- lib/duo_splitter/encoders/base_encoder.rb
+- lib/duo_splitter/encoders/mp3_encoder.rb
+- lib/duo_splitter/encoders/wav_encoder.rb
+- lib/duo_splitter/models/album.rb
+- lib/duo_splitter/models/section.rb
+- lib/duo_splitter/models/sentence.rb
 - lib/duo_splitter/runner.rb
-- lib/duo_splitter/section.rb
-- lib/duo_splitter/sentence.rb
+- lib/duo_splitter/services/create_overlapping_sentences.rb
+- lib/duo_splitter/services/create_repeating_sentences.rb
+- lib/duo_splitter/services/create_sentences.rb
+- lib/duo_splitter/services/support/base_concatenate.rb
+- lib/duo_splitter/services/support/create_blank_sentences.rb
+- lib/duo_splitter/services/support/encode.rb
+- lib/duo_splitter/services/support/overlapping_concatenate.rb
+- lib/duo_splitter/services/support/repeating_concatenate.rb
+- lib/duo_splitter/services/support/split_tracks.rb
+- lib/duo_splitter/temp_dir_wrapper.rb
 - lib/duo_splitter/version.rb
-- lib/duo_splitter/wav_encoder.rb
 homepage: https://github.com/healthypackrat/duo_splitter
 licenses:
 - MIT
@@ -129,15 +146,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
-rubygems_version: 3.0.1
+requirements:
+- ffmpeg
+- sox
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Split "DUO 3.0 CD" into separate tracks
+summary: Split "DUO 3.0 CD" tracks into separate sentences
 test_files: []

data/lib/duo_splitter/aac_encoder.rb

@@ -1,13 +0,0 @@
-module DuoSplitter
-  class AACEncoder < Encoder
-    attr_reader :ext, :encoding_options
-
-    def initialize(**)
-      super
-      @ext = 'm4a'
-      @encoding_options = ['-codec:a', 'aac', '-b:a', '256k']
-    end
-  end
-
-  Encoder.register(:aac, AACEncoder)
-end

data/lib/duo_splitter/album.rb

@@ -1,21 +0,0 @@
-module DuoSplitter
-  class Album
-    attr_reader :sections
-
-    def initialize
-      @sections = load_sections
-    end
-
-    def sentences(intro: true)
-      sections.map(&:sentences).flatten.reject do |sentence|
-        !intro && sentence.intro?
-      end
-    end
-
-    private
-
-    def load_sections
-      1.upto(NUMBER_OF_SECTIONS).map {|n| Section.new(number: n) }
-    end
-  end
-end

data/lib/duo_splitter/encoder.rb

@@ -1,71 +0,0 @@
-require 'pathname'
-
-module DuoSplitter
-  class Encoder
-    class << self
-      def known_encoders
-        @known_encoders ||= {}
-      end
-
-      def register(key, encoder)
-        known_encoders[key] = encoder
-      end
-    end
-
-    def initialize(album:, output_dir:, output_intro:, add_section_prefix:, ffmpeg_path:)
-      @album = album
-      @output_dir = Pathname.new(output_dir)
-      @output_intro = output_intro
-      @add_section_prefix = add_section_prefix
-      @ffmpeg_path = ffmpeg_path
-    end
-
-    def run
-      commands = to_commands
-
-      return if commands.empty?
-
-      @output_dir.mkpath
-
-      commands.each.with_index(1) do |command, index|
-        $stderr.print "proccessing #{index}/#{commands.size}\r"
-
-        shell_output = IO.popen(command, err: [:child, :out]) {|io| io.read }
-
-        status = $?.exitstatus
-
-        unless status.zero?
-          $stderr.print "\n"
-          $stderr.print "#{shell_output}\n"
-          raise Error, "process exit with #{status}"
-        end
-      end
-
-      $stderr.print "\n"
-      $stderr.print "\u{1F37A} done.\n"
-    end
-
-    def to_commands
-      sentences = @album.sentences(intro: @output_intro).select {|sentence| sentence.section.source_path }
-
-      sentences.map do |sentence|
-        output_name = sentence.output_name(add_section_prefix: @add_section_prefix, ext: ext)
-
-        command = [@ffmpeg_path, '-y']
-        command += ['-i', sentence.section.source_path.to_s]
-        command += ['-ss', sentence.start_pos, '-to', sentence.end_pos]
-        command += encoding_options
-        command += [@output_dir.join(output_name).to_s]
-        command
-      end
-    end
-
-    def ext
-      raise NotImplementedError, '#ext must be defined in a sub class'
-    end
-
-    def encoding_options
-      raise NotImplementedError, '#encoding_options must be defined in a sub class'
-    end
-  end
-end