multimedia_paradise 1.1.344 → 1.2.2

data/lib/multimedia_paradise/audio/compress.rb

@@ -2,19 +2,22 @@
 # Encoding: UTF-8
 # frozen_string_literal: true
 # =========================================================================== #
-# === MultimediaParadise::Compress
+# === MultimediaParadise::Audio::Compress
 #
 # This class will, right now, compress .mp3 files via lame.
 #
 # It will typically use a commandline variant such as 'lame -b 32'.
 # =========================================================================== #
 # require 'multimedia_paradise/audio/compress.rb'
+# MultimediaParadise.compress_this_audio_file
 # =========================================================================== #
 require 'multimedia_paradise/audio/base.rb'
 
 module MultimediaParadise
 
-class Compress < ::MultimediaParadise::AudioBase
+module Audio
+
+class Compress < ::MultimediaParadise::AudioBase # === MultimediaParadise::Audio::Compress
 
   # ========================================================================= #
   # === initialize
@@ -81,7 +84,7 @@ class Compress < ::MultimediaParadise::AudioBase
     system(_)
   end
 
-end
+end; end
 
 # =========================================================================== #
 # === MultimediaParadise.compress_this_audio_file
@@ -93,5 +96,5 @@ end
 end
 
 if __FILE__ == $PROGRAM_NAME
-  MultimediaParadise::Compress.new(ARGV)  
-end # compress_audio
+  MultimediaParadise::Audio::Compress.new(ARGV)  
+end # compressaudio

data/lib/multimedia_paradise/audio/create_m3u_playlist.rb

@@ -23,8 +23,6 @@ module MultimediaParadise
 
 class CreateM3uPlaylist < MultimediaParadise::AudioBase # === MultimediaParadise::CreateM3uPlaylist
 
-  require 'multimedia_paradise/toplevel_methods/files_and_directories.rb'
-
   # ========================================================================= #
   # === initialize
   #
@@ -106,7 +104,7 @@ class CreateM3uPlaylist < MultimediaParadise::AudioBase # === MultimediaParadise
       end
       set_dataset(dataset)
     end
-    _ = @dataset
+    _ = dataset?
     if (_.is_a?(String) or _.is_a?(Array)) and _.empty?
       _ = Dir['**/**'].select {|file|
         is_audio_song?(file)
@@ -115,7 +113,7 @@ class CreateM3uPlaylist < MultimediaParadise::AudioBase # === MultimediaParadise
         # Keep the full pathname always.
         # =================================================================== #
         unless file.include? '/'
-          file = rds("#{Dir.pwd}/#{file}")
+          file = rds("#{return_pwd}#{file}")
         end
         file
       }
@@ -185,9 +183,7 @@ class CreateM3uPlaylist < MultimediaParadise::AudioBase # === MultimediaParadise
     if debug?
       opnn; ecrimson('Debugging information: We will show the '\
             'dataset that will be used.')
-      e
-      pp i
-      e
+      e; pp i; e
     end
     @dataset = i
   end
@@ -201,7 +197,7 @@ class CreateM3uPlaylist < MultimediaParadise::AudioBase # === MultimediaParadise
       into = name_of_the_file?
     )
     what = dataset?
-    if @be_verbose
+    if be_verbose?
       if what.is_a? Hash
         n_entries = what.keys.size
       elsif what.is_a? Array
@@ -210,8 +206,8 @@ class CreateM3uPlaylist < MultimediaParadise::AudioBase # === MultimediaParadise
         n_entries = what.count(N)
       end
       into = File.absolute_path(into)
-      opnn; e "Will store into `#{sfile(into)}` "\
-              "(#{n_entries} entries)."
+      opne "#{rev}Will store into `#{sfile(into)}#{rev}` "\
+           "(#{n_entries} entries)."
     end
     if what.is_a? Hash
       # ===================================================================== #
@@ -236,7 +232,7 @@ class CreateM3uPlaylist < MultimediaParadise::AudioBase # === MultimediaParadise
   # ========================================================================= #
   # === MultimediaParadise::CreateM3uPlaylist[]
   # ========================================================================= #
-  def self.[](i = '')
+  def self.[](i = ARGV)
     new(i)
   end
 

data/lib/multimedia_paradise/audio/extract_audio/constants.rb

@@ -1,37 +0,0 @@
-#!/usr/bin/ruby -w
-# Encoding: UTF-8
-# frozen_string_literal: true
-# =========================================================================== #
-# Constants that are specific to class ExtractAudio are kept here.
-# =========================================================================== #
-module MultimediaParadise
-
-class ExtractAudio < ::MultimediaParadise::AudioBase
-
-  # ========================================================================= #
-  # === NAMESPACE
-  # ========================================================================= #
-  NAMESPACE = inspect
-
-  # ========================================================================= #
-  # === STORE_HERE
-  # ========================================================================= #
-  STORE_HERE = (Dir.pwd+'/').squeeze '/' # We store in the current directory.
-
-  # ========================================================================= #
-  # === FFMPEG_COMMAND_TO_USE
-  #
-  # This constant specifies which command we will use in particular, for
-  # the extract-audio operation.
-  # ========================================================================= #
-  FFMPEG_COMMAND_TO_USE = 'ffmpeg -y'
-
-  # ========================================================================= #
-  # === AUTOCONVERT_AAC_INTO_MP3
-  #
-  # If the following constant is set to true then we will autoconvert
-  # from .aac into .mp3 format, whenever we extract from a .mp4 file.
-  # ========================================================================= #
-  AUTOCONVERT_AAC_INTO_MP3 = true
-
-end; end

data/lib/multimedia_paradise/audio/extract_audio/extract_audio.rb

@@ -2,7 +2,7 @@
 # Encoding: UTF-8
 # frozen_string_literal: true
 # =========================================================================== #
-# === MultimediaParadise::ExtractAudio
+# === MultimediaParadise::Audio::ExtractAudio
 #
 # This class will extract audio data from a container, by using ffmpeg.
 #
@@ -11,14 +11,37 @@
 #
 # Of course we assume that you have ffmpeg installed.
 # =========================================================================== #
-# require 'multimedia_paradise/audio/extract_audio/extract_audio.rb' 
+# require 'multimedia_paradise/audio/extract_audio/extract_audio.rb'
+# MultimediaParadise.extract_audio(ARGV)
 # =========================================================================== #
 require 'multimedia_paradise/audio/base.rb'
-require 'multimedia_paradise/audio/extract_audio/constants.rb'
 
 module MultimediaParadise
 
-class ExtractAudio < ::MultimediaParadise::AudioBase # === MultimediaParadise::ExtractAudio
+module Audio
+
+class ExtractAudio < ::MultimediaParadise::AudioBase # === MultimediaParadise::Audio::ExtractAudio
+
+  # ========================================================================= #
+  # === STORE_HERE
+  # ========================================================================= #
+  STORE_HERE = (Dir.pwd+'/').squeeze '/' # We store in the current directory.
+
+  # ========================================================================= #
+  # === FFMPEG_COMMAND_TO_USE
+  #
+  # This constant specifies which command we will use in particular, for
+  # the extract-audio operation.
+  # ========================================================================= #
+  FFMPEG_COMMAND_TO_USE = 'ffmpeg -y'
+
+  # ========================================================================= #
+  # === AUTOCONVERT_AAC_INTO_MP3
+  #
+  # If the following constant is set to true then we will autoconvert
+  # from .aac into .mp3 format, whenever we extract from a .mp4 file.
+  # ========================================================================= #
+  AUTOCONVERT_AAC_INTO_MP3 = true
 
   # ========================================================================= #
   # === initialize
@@ -37,6 +60,9 @@ class ExtractAudio < ::MultimediaParadise::AudioBase # === MultimediaParadise::E
     reset
     set_files_to_process(these_files)
     set_store_where(store_where)
+    # ======================================================================= #
+    # === Handle blocks given to this method next
+    # ======================================================================= #
     if block_given?
       yielded = yield
       case yielded
@@ -55,10 +81,11 @@ class ExtractAudio < ::MultimediaParadise::AudioBase # === MultimediaParadise::E
   # ========================================================================= #
   def reset
     super()
+    infer_the_namespace
     # ======================================================================= #
-    # === @files_to_process
+    # === :files_to_process
     # ======================================================================= #
-    @files_to_process = []
+    @internal_hash[:files_to_process] = []
     # ======================================================================= #
     # === @output_filename
     # ======================================================================= #
@@ -71,13 +98,6 @@ class ExtractAudio < ::MultimediaParadise::AudioBase # === MultimediaParadise::E
     @always_overwrite_existing_files = false
   end
 
-  # ========================================================================= #
-  # === opnn
-  # ========================================================================= #
-  def opnn
-    super(NAMESPACE)
-  end
-
   # ========================================================================= #
   # === set_files_to_process
   # ========================================================================= #
@@ -85,7 +105,7 @@ class ExtractAudio < ::MultimediaParadise::AudioBase # === MultimediaParadise::E
     _ = []
     i = fetch_all_flv_files if i.nil?
     _ << i
-    @files_to_process = _.flatten
+    @internal_hash[:files_to_process] = _.flatten
   end
 
   # ========================================================================= #
@@ -121,7 +141,7 @@ class ExtractAudio < ::MultimediaParadise::AudioBase # === MultimediaParadise::E
   # === files_to_process?
   # ========================================================================= #
   def files_to_process?
-    @files_to_process
+    @internal_hash[:files_to_process]
   end
 
   # ========================================================================= #
@@ -145,11 +165,11 @@ class ExtractAudio < ::MultimediaParadise::AudioBase # === MultimediaParadise::E
   # ========================================================================= #
   # === cleanup_empty_files
   # ========================================================================= #
-  def cleanup_empty_files
-    if @output_filename
-      if File.exist?(@output_filename) and (File.size(@output_filename) == 0)
-        if File.empty? @output_filename
-          File.delete(@output_filename)
+  def cleanup_empty_files(output_filename = @output_filename)
+    if output_filename
+      if File.exist?(output_filename) and (File.size(@output_filename) == 0)
+        if File.empty? output_filename
+          remove_this_file(output_filename)
         end
       end
     end
@@ -196,8 +216,8 @@ class ExtractAudio < ::MultimediaParadise::AudioBase # === MultimediaParadise::E
       end
       return _
     else
-      opnn; e 'No "Audio:" string could be found. Are you sure that this file'
-      opnn; e 'has any audio data?'
+      opne rev+'No "Audio:" string could be found. Are you sure that this file'
+      opne 'has any audio data?'
       e 'Debug:'
       e 'splitted variable was:'
       pp splitted
@@ -320,7 +340,8 @@ class ExtractAudio < ::MultimediaParadise::AudioBase # === MultimediaParadise::E
           notify_user_where_we_will_store
           cleanup_empty_files
         else
-          opnn; e 'The file ('+sfancy(_.to_s)+') does not appear to exist.'
+          opne rev+'The file ('+sfancy(_.to_s)+rev+
+               ') does not appear to exist.'
         end
       end
     end
@@ -356,62 +377,63 @@ class ExtractAudio < ::MultimediaParadise::AudioBase # === MultimediaParadise::E
   end
 
   # ========================================================================= #
-  # === MultimediaParadise::ExtractAudio[]
+  # === MultimediaParadise::Audio::ExtractAudio[]
   # ========================================================================= #
-  def self.[](i)
+  def self.[](i = ARGV)
     new(i)
   end
 
-end
+end; end
 
-  # ========================================================================= #
-  # === MultimediaParadise.extract_audio                        (extract tag)
-  #
-  # Class method to extract audio from a given multimedia file.
-  #
-  # Please note - we can not strip away any extensions from this method
-  # here, so we must ensure that the data passed to our method is sane
-  # before continuing. (The reason we cant yet strip away stuff is that
-  # other methods rely on the follow-up input/output)
-  #
-  # To test this method, try:
-  #
-  #   require 'multimedia_paradise'; MultimediaParadise.extract_audio 'break-741.wmv'
-  #
-  # An alternative way would be this:
-  #
-  #   ffmpeg -i Ivanhoe.avi audio.mp3
-  #
-  # Most of the time we will use ffmpeg, but via mencoder we can also extract
-  # the audio.
-  #
-  # Another usage example:
-  #
-  #   require 'multimedia_paradise'; x = MultimediaParadise.extract_audio('/Depot/j/Ozzy_Man.mkv'); pp x # => "/Depot/j/Ozzy_Man.mkv.mp3"
-  #
-  # ========================================================================= #
-  def self.extract_audio(
-      i,
-      optional_store_where = :default,
-      &block
-    )
-    if i.is_a? Array
-      i.each {|entry| # Recursive-call here.
-        MultimediaParadise.extract_audio(entry, optional_store_where, &block)
-      }
-    else
-      _ = ::MultimediaParadise::ExtractAudio.new(i, optional_store_where, &block)
-      return _.file_location?
-    end
+# =========================================================================== #
+# === MultimediaParadise.extract_audio                          (extract tag)
+#
+# Class method to extract audio from a given multimedia file.
+#
+# Please note - we can not strip away any extensions from this method
+# here, so we must ensure that the data passed to our method is sane
+# before continuing. (The reason we cant yet strip away stuff is that
+# other methods rely on the follow-up input/output)
+#
+# To test this method, try:
+#
+#   require 'multimedia_paradise'; MultimediaParadise.extract_audio 'break-741.wmv'
+#
+# An alternative way would be this:
+#
+#   ffmpeg -i Ivanhoe.avi audio.mp3
+#
+# Most of the time we will use ffmpeg, but via mencoder we can also extract
+# the audio.
+#
+# Another usage example:
+#
+#   require 'multimedia_paradise'; x = MultimediaParadise.extract_audio('/Depot/j/Ozzy_Man.mkv'); pp x # => "/Depot/j/Ozzy_Man.mkv.mp3"
+#
+# =========================================================================== #
+def self.extract_audio(
+    i,
+    optional_store_where = :default,
+    &block
+  )
+  if i.is_a? Array
+    i.each {|entry| # Recursive-call here.
+      MultimediaParadise.extract_audio(entry, optional_store_where, &block)
+    }
+  else
+    _ = MultimediaParadise::Audio::ExtractAudio.new(i, optional_store_where, &block)
+    return _.file_location?
   end
-  
+
+end
+
 end
 
 if __FILE__ == $PROGRAM_NAME
-  _ = MultimediaParadise::ExtractAudio.new(ARGV, nil, false)
+  _ = MultimediaParadise::Audio::ExtractAudio.new(ARGV, nil, false)
   if ARGV[2] # Assume that a '*' was used in this case.
     _.files = ARGV
     _.store_in_default_directory
   end
   _.run
-end # extract_audio
+end # extractaudio