srt 0.0.5 → 0.0.6

data/README.md

@@ -78,19 +78,24 @@ Other example options, e.g.: `:all => "+700mil"`, `:all => "1.34m"`, `:all => "0
  **Progressive timeshift**
 
 ```ruby
-  file.timeshift({ 1 => "00:02:12,000", 843 => "01:38:06,000" }) # Correct drifting-out-of-sync
+  file.timeshift({ "#1" => "00:02:12,000", "#843" => "01:38:06,000" }) # Correct drifting-out-of-sync
 ```
 
 This example call would shift the **first subtitle** to `00:02:12`, the **last subtitle** (assuming here that `#843` is the last one in your file) to `01:38:06`, and all the ones before, after, and in between those two reference points seamlessly to their own resulting earlier or later begin times.
 
-To make this work pass two `original timecode/id => target timecode` pairs where each takes any of these 4 forms: 
+To make this work pass two `origin timecode => target timecode` pairs, where the *origin timecodes* can be supplied as:
 
-* `[id] => "[hh]:[mm]:[ss],[mil]"`
-* `[id] => "[+/-][amount][h|m|s|mil]"`
-* `"[hh]:[mm]:[ss],[mil]" => "[hh]:[mm]:[ss],[mil]"`
-* `"[hh]:[mm]:[ss],[mil]" => "[+/-][amount][h|m|s|mil]"`
+* `float` providing the raw timecode in *seconds*, e.g.:  `195.65`
+* `"[hh]:[mm]:[ss],[mil]"` string, which is a timecode in SRT notation, e.g.: `"00:02:12,000"`
+* `"#[id]"` string, which references the timecode of the subtitle with the supplied id, e.g.:  `"#317"`
 
-Another full example: `{ "00:00:51,400" => "+13s", "01:12:44,320" => "+2.436m" }`
+... and the *target timecodes* can be supplied as:
+
+* `float` providing the raw timecode in *seconds*, e.g.:  `3211.3`
+* `"[hh]:[mm]:[ss],[mil]"` string, which is a timecode in SRT notation, e.g.: `"01:01:03,300"`
+* `"[+/-][amount][h|m|s|mil]"` string, describing the amount by which to shift the origin timecode, e.g.: `"+1.5s"`
+
+So for example: `{ "00:00:51,400" => "+13s", "01:12:44,320" => "+2.436m" }`
 
 This method can be used to fix subtitles that are *at different times differently out of sync*,
 and comes in handy especially if you have no idea what framerate your video or the video for which your subtitles

data/lib/srt/file.rb

@@ -164,13 +164,24 @@ module SRT
           end
         end
       elsif options.length == 2
-        original_timecode_a = (options.keys[0].is_a?(String) ? SRT::File.parse_timecode(options.keys[0]) : lines[options.keys[0] - 1].start_time)
-        original_timecode_b = (options.keys[1].is_a?(String) ? SRT::File.parse_timecode(options.keys[1]) : lines[options.keys[1] - 1].start_time)
-        target_timecode_a = SRT::File.parse_timecode(options.values[0]) || (original_timecode_a + SRT::File.parse_timespan(options.values[0]))
-        target_timecode_b = SRT::File.parse_timecode(options.values[1]) || (original_timecode_b + SRT::File.parse_timespan(options.values[1]))
+        origins, targets = options.keys, options.values
 
-        time_rescale_factor = (target_timecode_b - target_timecode_a) / (original_timecode_b - original_timecode_a)
-        time_rebase_shift = target_timecode_a - original_timecode_a * time_rescale_factor
+        [0,1].each do |i|
+          if origins[i].is_a?(String) && SRT::File.parse_id(origins[i])
+            origins[i] = lines[SRT::File.parse_id(origins[i]) - 1].start_time
+          elsif origins[i].is_a?(String) && SRT::File.parse_timecode(origins[i])
+            origins[i] = SRT::File.parse_timecode(origins[i])
+          end
+
+          if targets[i].is_a?(String) && SRT::File.parse_timecode(targets[i])
+            targets[i] = SRT::File.parse_timecode(targets[i])
+          elsif targets[i].is_a?(String) && SRT::File.parse_timespan(targets[i])
+            targets[i] = origins[i] + SRT::File.parse_timespan(targets[i])
+          end
+        end
+
+        time_rescale_factor = (targets[1] - targets[0]) / (origins[1] - origins[0])
+        time_rebase_shift = targets[0] - origins[0] * time_rescale_factor
 
         lines.each do |line|
           line.start_time = line.start_time * time_rescale_factor + time_rebase_shift
@@ -208,6 +219,11 @@ module SRT
       mres ? mres["fps"].to_f : nil
     end
 
+    def self.parse_id(id_string)
+      mres = id_string.match(/#(?<id>\d+)/)
+      mres ? mres["id"].to_i : nil
+    end
+
     def self.parse_timecode(timecode_string)
       mres = timecode_string.match(/(?<h>\d+):(?<m>\d+):(?<s>\d+),(?<mil>\d+)/)
       mres ? "#{mres["h"].to_i * 3600 + mres["m"].to_i * 60 + mres["s"].to_i}.#{mres["mil"]}".to_f : nil
@@ -218,10 +234,10 @@ module SRT
         "mil" => 0.001,
         "s" => 1,
         "m" => 60,
-        "h" => 3600 
+        "h" => 3600
       }
 
-      mres = timespan_string.match(/(?<amount>(\+|-)?\d+((\.)?\d+))(?<unit>mil|s|m|h)/)
+      mres = timespan_string.match(/(?<amount>(\+|-)?\d+((\.)?\d+)?)(?<unit>mil|s|m|h)/)
       mres ? mres["amount"].to_f * factors[mres["unit"]] : nil
     end
   end

data/lib/srt/version.rb

@@ -1,3 +1,3 @@
 module SRT
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/srt_spec.rb

@@ -26,6 +26,13 @@ describe SRT do
   end
 
   describe SRT::File do
+
+    describe ".parse_id" do
+      it "should convert the id string (#[id]) to an int representing the sequence number" do
+        SRT::File.parse_id("#317").should eq(317)
+      end
+    end
+
     describe ".parse_timecode" do
       it "should convert the SRT timecode format to a float representing seconds" do
         SRT::File.parse_timecode("01:03:44,200").should eq(3824.2)
@@ -36,6 +43,10 @@ describe SRT do
       it "should convert a timespan string ([+|-][amount][h|m|s|mil]) to a float representing seconds" do
         SRT::File.parse_timespan("-3.5m").should eq(-210)
       end
+
+      it "should convert a timespan string ([+|-][amount][h|m|s|mil]) to a float representing seconds" do
+        SRT::File.parse_timespan("-1s").should eq(-1)
+      end
     end
 
     describe ".parse_framerate" do
@@ -297,8 +308,8 @@ describe SRT do
           end
         end
 
-        context "when passing { 24 => \"00:03:53,582\", 42 => \"00:04:24,656\" }" do
-          before { file.timeshift({ 24 => "00:03:53,582", 42 => "00:04:24,656" }) }
+        context "when passing { \"#24\" => \"00:03:53,582\", \"#42\" => \"00:04:24,656\" }" do
+          before { file.timeshift({ "#24" => "00:03:53,582", "#42" => "00:04:24,656" }) }
 
           it "should have shifted timecodes for subtitle #24" do
             file.lines[23].time_str.should eq("00:03:53,582 --> 00:03:54,042")
@@ -308,6 +319,18 @@ describe SRT do
             file.lines[41].time_str.should eq("00:04:24,656 --> 00:04:25,298")
           end
         end
+
+        context "when passing { 180 => \"+1s\", 264 => \"+1.5s\" }" do
+          before { file.timeshift({ 180 => "+1s", 264 => "+1.5s" }) }
+
+          it "should have shifted by +1s at 180 seconds" do
+            file.lines[23].time_str.should eq("00:01:57,415 --> 00:01:58,948")
+          end
+          
+          it "should have shifted by +1.5s at 264 seconds" do
+            file.lines[41].time_str.should eq("00:03:40,997 --> 00:03:43,136")
+          end
+        end        
       end
 
       context "when calling it on a spanish language WOTW SRT file with unknown encoding" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: srt
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake