srt 0.0.2 → 0.0.3

data/README.md

@@ -27,6 +27,22 @@ You can parse an SRT file with the following code:
   end
 ```
 
+`timeshift` let's you constantly shift all subtitle timecodes:
+
+```ruby
+  file.timeshift(-2.5) # resynchronize subtitles so they show up 2.5 seconds earlier 
+```
+
+`linear_progressive_timeshift` allows progressive timeshifting, e.g. to account for time-drift  
+caused by subtitles that were created for a video version with a different framerate:
+
+```ruby
+  file.linear_progressive_timeshift(60, 70, 2700, 2760) 
+ ```
+
+This applies a timeshift of 10 seconds at minute #1 (60 => 70),  
+then progressively more towards a 60 second shift by minute #45 (2700 => 2760)
+
 ## Contributing
 
 1. Fork it

data/lib/srt.rb

@@ -1,3 +1,3 @@
 require "srt/file"
 require "srt/line"
-require "srt/version"
+require "srt/version"

data/lib/srt/file.rb

@@ -17,10 +17,10 @@ module SRT
             elsif line.sequence.nil?
               line.sequence = str.to_i
             elsif line.start_time.nil?
-              matcher = str.match(/(.*) -+> (.*)/)
-              if matcher
-                line.start_time = DateTime.strptime(matcher[1].strip, "%H:%M:%S,%L")
-                line.end_time = DateTime.strptime(matcher[2].strip, "%H:%M:%S,%L")
+              mres = str.match(/(\d+):(\d+):(\d+),(\d+) -+> (\d+):(\d+):(\d+),(\d+)/)
+              if mres
+                line.start_time = "#{mres[1].to_i * 3600 + mres[2].to_i * 60 + mres[3].to_i}.#{mres[4]}".to_f
+                line.end_time = "#{mres[5].to_i * 3600 + mres[6].to_i * 60 + mres[7].to_i}.#{mres[8]}".to_f
               else
                 line.error = "#{line}, Invalid Time String, [#{str}]"
               end
@@ -36,18 +36,31 @@ module SRT
       result
     end
 
-    def to_s
-      result = []
+    def timeshift(seconds)
+      lines.each do |line|
+        line.start_time += seconds unless  line.start_time + seconds < 0
+        line.end_time += seconds unless  line.end_time + seconds < 0
+      end
+    end
+
+    def linear_progressive_timeshift(reference_time_a, target_time_a, reference_time_b, target_time_b)
+      time_rescale_factor = (target_time_b - target_time_a) / (reference_time_b - reference_time_a)
+      time_rebase_shift = target_time_a - reference_time_a * time_rescale_factor
+
       lines.each do |line|
-        result << line.sequence
-        result << line.time_str
-        result += line.text
-        result << ""
+        line.start_time *= time_rescale_factor
+        line.start_time += time_rebase_shift
+        line.end_time *= time_rescale_factor
+        line.end_time += time_rebase_shift
       end
-      result.join("\n")
+    end
+
+    def to_s
+      lines.map{ |l| [l.sequence, l.time_str, l.text, ""] }.flatten.join("\n")
     end
 
     attr_writer :lines
+
     def lines
       @lines ||= []
     end
@@ -56,4 +69,4 @@ module SRT
       lines.collect { |l| l.error if l.error }.compact
     end
   end
-end
+end

data/lib/srt/line.rb

@@ -5,6 +5,7 @@ module SRT
     attr_accessor :end_time
     attr_accessor :error
     attr_writer :text
+
     def text
       @text ||= []
     end
@@ -20,9 +21,7 @@ module SRT
     end
 
     def time_str
-      s = start_time ? start_time.strftime("%H:%M:%S,%L") : ""
-      e = end_time ? end_time.strftime("%H:%M:%S,%L") : ""
-      "#{s} --> #{e}"
+      [@start_time, @end_time].map { |t| sprintf("%02d:%02d:%02d,%s", t / 3600, (t % 3600) / 60, t % 60, sprintf("%.3f", t)[-3, 3]) }.join(" --> ")
     end
   end
 end

data/lib/srt/version.rb

@@ -1,3 +1,3 @@
 module SRT
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/srt_spec.rb

@@ -3,23 +3,23 @@ require 'srt'
 describe SRT do
   context "A single line" do
     let(:line) { SRT::Line.new }
-    it "should be empty" do
+    it "should initially be empty" do
       line.should be_empty
     end
 
-    it "should not be empty" do
-      line.text = "This is a test"
+    it "should not be empty after inserting text" do
+      line.text = ["This is a test"]
       line.should_not be_empty
     end
 
-    it "should have the correct time string" do
-      line.start_time = DateTime.strptime("00:00:02,110", "%H:%M:%S,%L")
-      line.end_time = DateTime.strptime("00:00:04,578", "%H:%M:%S,%L")
+    it "should print a time string that corresponds to its internal time values" do
+      line.start_time = 2.110
+      line.end_time = 4.578
       line.time_str.should == "00:00:02,110 --> 00:00:04,578"
     end
   end
 
-  context "A properly formatted SRT file" do
+  context "This given, properly formatted BSG SRT file" do
     let(:file) { SRT::File.parse(File.open("./spec/bsg-s01e01.srt")) }
 
     it "should parse" do
@@ -34,46 +34,31 @@ describe SRT do
       file.errors.should be_empty
     end
 
-    context "the first line" do
-      let(:line) { file.lines.first }
-
-      it "should have the proper text" do
-        line.text.should == ["<i>(male narrator) Previously", "on Battlestar Galactica.</i>"]
-      end
-
-      it "should have the proper sequence" do
-        line.sequence.should == 1
-      end
-
-      it "should have the proper start time" do
-        line.start_time.strftime("%H:%M:%S,%L").should == "00:00:02,110"
-      end
-
-      it "should have the proper end time" do
-        line.end_time.strftime("%H:%M:%S,%L").should == "00:00:04,578"
-      end
+    it "should have the expected data on the first line" do
+      file.lines.first.sequence.should == 1
+      file.lines.first.time_str.should == "00:00:02,110 --> 00:00:04,578"
+      file.lines.first.text.should == ["<i>(male narrator) Previously", "on Battlestar Galactica.</i>"]
     end
-
-    context "the last line" do
-      let(:line) { file.lines.last }
       
-      it "should have the proper text" do
-        line.text.should == ["Thank you."]
-      end
-
-      it "should have the proper sequence" do
-        line.sequence.should == 600
-      end
+    it "should have the expected data on the last line" do
+      file.lines.last.sequence.should == 600
+      file.lines.last.time_str.should == "00:43:26,808 --> 00:43:28,139"
+      file.lines.last.text.should == ["Thank you."]
+    end
 
-      it "should have the proper start time" do
-        line.start_time.strftime("%H:%M:%S,%L").should == "00:43:26,808"
-      end
+    it "should have equally shifted time strings on every line after a timeshift" do
+      file.timeshift(2.5)
+      file.lines[23].time_str.should == "00:01:59,291 --> 00:02:00,815"
+      file.lines[42].time_str.should == "00:03:46,164 --> 00:03:47,631"
+    end
 
-      it "should have the proper end time" do
-        line.end_time.strftime("%H:%M:%S,%L").should == "00:43:28,139"
-      end
+    it "should have inequally shifted time strings on every line after a linear progressive timeshift" do
+      file.linear_progressive_timeshift(116.791, 233.582, 223.664, 894.656)
+      file.lines[23].time_str.should == "00:03:53,582 --> 00:04:03,009"
+      file.lines[42].time_str.should == "00:14:54,656 --> 00:15:03,730"
     end
   end
+
   context "A short SRT file" do
     let(:file) { 
       file = SRT::File.parse(File.open("./spec/bsg-s01e01.srt"))
@@ -100,4 +85,4 @@ END
       file.to_s.should == OUTPUT
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: srt
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -78,7 +78,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -853641562359327815
+      hash: 1537061197580400019
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -853641562359327815
+      hash: 1537061197580400019
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24