midi_lyrics 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d996919ed3cfcda1dcfda3adc2280ceb1681a5b1
-  data.tar.gz: 3fe6246949062d40b66c03df9c68d279da5ded7e
+  metadata.gz: 8091e1c24da61a2790de90896d716a9f2960bc36
+  data.tar.gz: 4cae82d9652f322c1951d227d3f2b0fac5a4499a
 SHA512:
-  metadata.gz: 5aec8699ca8f49b4ed1637e5a329b79f4c7941028fa4058af5572425a3b8e85d62f358b20e1c8a0e14cb850575dd54eb0a53095ba1ec2671af3445c640beb715
-  data.tar.gz: 415d7b89ecfe943be95089f60c3f28c8a5bb2f840aa911f81bc322cfc3844a29748e04599a8e426634d7b03fa039ee07b36f9e246bf815dea2e056d9dbd85dd8
+  metadata.gz: 73c50e8170abeb02e49dcb2b7f58aa4119e2ed451623d98a176b0f872bdb047349e83f6b6c6790094e2fdae4d74fb8d55a857e1126759d569f7822fc06afc9e4
+  data.tar.gz: 741c155d2f592a7ebbc0390567a32a2ce2a991f405f050d69920f75adabfa0f0e4d3082aa124f69dda199d8ddbd2ef7c7a0d44ad3ccd5282096c341c517700cf

data/lib/midi_lyrics/version.rb

@@ -1,3 +1,3 @@
 module MidiLyrics
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/midi_lyrics.rb

@@ -5,11 +5,12 @@ module MidiLyrics
   class FileNotFound < StandardError; end
 
   class LyricSyllable
-    attr_accessor :text, :start_in_pulses, :duration_in_pulses
+    attr_accessor :text, :start_in_pulses, :start2_in_pulses, :duration_in_pulses
     attr_writer :sequence
 
     def initialize(fields = {})
       self.start_in_pulses = fields[:start_in_pulses]
+      self.start2_in_pulses = fields[:start2_in_pulses]
       self.duration_in_pulses = fields[:duration_in_pulses]
       self.text = fields[:text]
       self.sequence = fields[:sequence]
@@ -19,10 +20,18 @@ module MidiLyrics
       format_time(start_in_pulses)
     end
 
+    def start2
+      format_time(start2_in_pulses)
+    end
+
     def duration
       format_time(duration_in_pulses)
     end
 
+    def similar_to?(another)
+      self.duration_in_pulses == another.duration_in_pulses && self.text == another.text
+    end
+
     private
     def format_time(time)
       @sequence.pulses_to_seconds(time.to_f).round(3)
@@ -30,17 +39,21 @@ module MidiLyrics
   end
 
   class Parser
-    def initialize(file)
+    attr_reader :file, :repeating
+
+    def initialize(file, options = {})
+      options = { repeating: false }.merge(options)
       @file = file
+      @repeating = options[:repeating]
 
-      unless File.exists?(@file)
+      unless File.exists?(file)
         raise MidiLyrics::FileNotFound
       end
     end
 
     def read_sequence_from_file
       @sequence = ::MIDI::Sequence.new()
-      File.open(@file, "rb") do | file |
+      File.open(file, "rb") do | file |
         @sequence.read(file)
       end
       @sequence
@@ -72,10 +85,10 @@ module MidiLyrics
     def load_lyrics
       @lyrics = @lyrics_track.collect do |event|
         LyricSyllable.new(
-          :sequence => @sequence,
-          :start_in_pulses => event.time_from_start,
-          :duration_in_pulses => @durations[event.time_from_start],
-          :text => event.data.collect{|x| x.chr(Encoding::UTF_8)}.join,
+          sequence: @sequence,
+          start_in_pulses: event.time_from_start,
+          duration_in_pulses: @durations[event.time_from_start],
+          text: event.data.collect{|x| x.chr(Encoding::UTF_8)}.join,
         )
       end
     end
@@ -100,6 +113,29 @@ module MidiLyrics
       @lyrics = new_lyrics
     end
 
+    def half_is_equal
+      half = @lyrics.count / 2
+      (0..(half-1)).each do |x|
+        unless @lyrics[x].similar_to?(@lyrics[x + half])
+          return false
+        end
+      end
+      return true
+    end
+
+    def merge_half_lyrics
+      half = @lyrics.count / 2
+      (0..(half-1)).collect do |x|
+        @lyrics[x].start2_in_pulses = @lyrics.delete_at(half).start_in_pulses
+      end
+    end
+
+    def remove_repeating
+      if half_is_equal
+        merge_half_lyrics
+      end
+    end
+
     def extract
       read_sequence_from_file
       load_tracks
@@ -107,6 +143,7 @@ module MidiLyrics
       load_lyrics
       remove_heading_blank_lines
       consolidate_carriage_returns
+      remove_repeating unless repeating
       @lyrics
     end
   end

data/spec/midi_lyrics_spec.rb

@@ -11,49 +11,120 @@ describe MidiLyrics do
   context "parsing" do
     it "parses one_note_one_syllable.mid correctly" do
       lyrics = MidiLyrics::Parser.new("spec/fixtures/one_note_one_syllable.mid").extract
-      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, duration: x.duration } }
+      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, start2: x.start2, duration: x.duration } }
       expect(lyrics).to eq([
-        { :text => "Test ", :start => 0.0, :duration => QUARTER_NOTE_DURATION },
-        { :text => "\r", :start => QUARTER_NOTE_DURATION, :duration => 0.0 },
-        { :text => "\n", :start => QUARTER_NOTE_DURATION, :duration => 0.0 }
+        { text: "Test ", start: 0.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "\r", start: QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "\n", start: QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 }
       ])
     end
 
     it "parses two_notes_one_syllable.mid correctly" do
       lyrics = MidiLyrics::Parser.new("spec/fixtures/two_notes_one_syllable.mid").extract
-      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, duration: x.duration } }
+      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, start2: x.start2, duration: x.duration } }
       expect(lyrics).to eq([
-        { text: "Test ", start: 0, duration: 0.5 + QUARTER_NOTE_DURATION },
-        { text: "\r", start: 0.5 + QUARTER_NOTE_DURATION, duration: 0 },
-        { text: "\n", start: 0.5 + QUARTER_NOTE_DURATION, duration: 0 }
+        { text: "Test ", start: 0, start2: 0.0, duration: 0.5 + QUARTER_NOTE_DURATION },
+        { text: "\r", start: 0.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0 },
+        { text: "\n", start: 0.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0 }
       ])
     end
 
     it "parses two_notes_two_syllables.mid correctly" do
       lyrics = MidiLyrics::Parser.new("spec/fixtures/two_notes_two_syllables.mid").extract
-      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, duration: x.duration } }
+      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, start2: x.start2, duration: x.duration } }
       expect(lyrics).to eq([
-        { text: "Test", start: 0, duration: QUARTER_NOTE_DURATION },
-        { text: "ing ", start: 0.5, duration: QUARTER_NOTE_DURATION },
-        { text: "\r", start: 0.5 + QUARTER_NOTE_DURATION, duration: 0 },
-        { text: "\n", start: 0.5 + QUARTER_NOTE_DURATION, duration: 0 }
+        { text: "Test", start: 0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "ing ", start: 0.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "\r", start: 0.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0 },
+        { text: "\n", start: 0.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0 }
       ])
     end
 
     it "parses spaces_and_returns.mid correctly" do
       lyrics = MidiLyrics::Parser.new("spec/fixtures/spaces_and_returns.mid").extract
-      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, duration: x.duration } }
+      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, start2: x.start2, duration: x.duration } }
       expect(lyrics).to eq([
-        { text: "Test", start: 0.5, duration: QUARTER_NOTE_DURATION },
-        { text: "ing ", start: 1, duration: QUARTER_NOTE_DURATION },
-        { text: "\r", start: 1 + QUARTER_NOTE_DURATION, duration: 0 },
-        { text: "One", start: 1.5, duration: HALF_NOTE_DURATION },
-        { text: "Two", start: 2.5, duration: HALF_NOTE_DURATION },
-        { text: "Three ", start: 3.5, duration: HALF_NOTE_DURATION },
-        { text: "\r", start: 3.5 + HALF_NOTE_DURATION, duration: 0 },
-        { text: "\n", start: 3.5 + HALF_NOTE_DURATION, duration: 0 }
+        { text: "Test", start: 0.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "ing ", start: 1, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "\r", start: 1 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0 },
+        { text: "One", start: 1.5, start2: 0.0, duration: HALF_NOTE_DURATION },
+        { text: "Two", start: 2.5, start2: 0.0, duration: HALF_NOTE_DURATION },
+        { text: "Three ", start: 3.5, start2: 0.0, duration: HALF_NOTE_DURATION },
+        { text: "\r", start: 3.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0 },
+        { text: "\n", start: 3.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0 }
       ])
     end
+
+    it "parses repeating_lyrics.mid correctly repeating" do
+      lyrics = MidiLyrics::Parser.new("spec/fixtures/repeating_lyrics.mid", repeating: true).extract
+      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, start2: x.start2, duration: x.duration } }
+      expect(lyrics).to eq([
+        { text: "Test", start: 0.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "ing ", start: 0.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "\r", start: 0.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "One", start: 1.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "Two", start: 1.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "Three ", start: 2.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "\r", start: 2.0 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "\n", start: 2.0 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "Test", start: 2.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "ing ", start: 3.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "\r", start: 3.0 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "One", start: 3.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "Two", start: 4.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "Three ", start: 4.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "\r", start: 4.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "\n", start: 4.5 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+      ])
+    end
+
+    it "parses repeating_lyrics.mid correctly not repeating" do
+      lyrics = MidiLyrics::Parser.new("spec/fixtures/repeating_lyrics.mid").extract
+      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, start2: x.start2, duration: x.duration } }
+      expect(lyrics).to eq([
+        { text: "Test", start: 0.0, start2: 2.5, duration: QUARTER_NOTE_DURATION },
+        { text: "ing ", start: 0.5, start2: 3.0, duration: QUARTER_NOTE_DURATION },
+        { text: "\r", start: 0.5 + QUARTER_NOTE_DURATION, start2: 3.0 + QUARTER_NOTE_DURATION, duration: 0.0 },
+        { text: "One", start: 1.0, start2: 3.5, duration: QUARTER_NOTE_DURATION },
+        { text: "Two", start: 1.5, start2: 4.0, duration: QUARTER_NOTE_DURATION },
+        { text: "Three ", start: 2.0, start2: 4.5, duration: QUARTER_NOTE_DURATION },
+        { text: "\r", start: 2.0 + QUARTER_NOTE_DURATION, start2: 4.5 + QUARTER_NOTE_DURATION, duration: 0.0 },
+        { text: "\n", start: 2.0 + QUARTER_NOTE_DURATION, start2: 4.5 + QUARTER_NOTE_DURATION, duration: 0.0 },
+      ])
+    end
+
+    let :parsed_complete_example do
+      [
+        { text: "Test", start: 0.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "ing ", start: 1.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "\r", start: 1.0 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "One", start: 1.5, start2: 0.0, duration: HALF_NOTE_DURATION },
+        { text: "Two", start: 2.5, start2: 0.0, duration: HALF_NOTE_DURATION },
+        { text: "Three ", start: 3.5, start2: 0.0, duration: HALF_NOTE_DURATION },
+        { text: "\r", start: 3.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "\n", start: 3.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "Test", start: 4.5, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "ing ", start: 5.0, start2: 0.0, duration: QUARTER_NOTE_DURATION },
+        { text: "\r", start: 5.0 + QUARTER_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "Four", start: 5.5, start2: 0.0, duration: HALF_NOTE_DURATION },
+        { text: "Five", start: 6.5, start2: 0.0, duration: HALF_NOTE_DURATION },
+        { text: "Six ", start: 7.5, start2: 0.0, duration: HALF_NOTE_DURATION },
+        { text: "\r", start: 7.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+        { text: "\n", start: 7.5 + HALF_NOTE_DURATION, start2: 0.0, duration: 0.0 },
+      ]
+    end
+
+    it "parses complete_example.mid correctly repeating" do
+      lyrics = MidiLyrics::Parser.new("spec/fixtures/complete_example.mid").extract
+      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, start2: x.start2, duration: x.duration } }
+      expect(lyrics).to eq(parsed_complete_example)
+    end
+
+    it "parses complete_example.mid correctly not repeating" do
+      lyrics = MidiLyrics::Parser.new("spec/fixtures/complete_example.mid", repeating: true).extract
+      lyrics = lyrics.collect{|x| { text: x.text, start: x.start, start2: x.start2, duration: x.duration } }
+      expect(lyrics).to eq(parsed_complete_example)
+    end
   end
 
   context "error handling" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: midi_lyrics
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mateus Del Bianco