renamed package from subber to subtitles

martinlindhe · Jan 4, 2016 · 94f7507 · 94f7507
1 parent e78a3ae
commit 94f7507
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 21 deletions.
diff --git a/caps.go b/caps.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import (
 	"log"

diff --git a/caps_test.go b/caps_test.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import (
 	"testing"

diff --git a/caption.go b/caption.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import "time"
 

diff --git a/caption_test.go b/caption_test.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import (
 	"testing"

diff --git a/cleaner.go b/cleaner.go
@@ -1,12 +1,14 @@
-package subber
+package subtitles
 
 import (
+	"fmt"
 	"log"
 	"strings"
+	"time"
 )
 
 // CleanupSub parses .srt or .ssa, performs cleanup and renders to a .srt, returning a string. caller is responsible for passing UTF8 string
-func CleanupSub(utf8 string, filterName string, keepAds bool) (string, error) {
+func CleanupSub(utf8 string, filterName string, keepAds bool, sync int) (string, error) {
 
 	var captions []caption
 
@@ -21,13 +23,30 @@ func CleanupSub(utf8 string, filterName string, keepAds bool) (string, error) {
 		captions = removeAds(captions)
 	}
 
+	if sync != 0 {
+		captions = resyncSubs(captions, sync)
+	}
+
 	captions = filterSubs(captions, filterName)
 
 	out := renderSrt(captions)
 
 	return out, nil
 }
 
+func resyncSubs(subs []caption, sync int) []caption {
+
+	//	var res []caption
+	fmt.Printf("resyncing with %d\n", sync)
+
+	for i := range subs {
+		subs[i].Start = subs[i].Start.Add(time.Duration(sync) * time.Millisecond)
+		subs[i].End = subs[i].End.Add(time.Duration(sync) * time.Millisecond)
+	}
+
+	return subs
+}
+
 // RemoveAds removes advertisement from the subtitles
 func removeAds(subs []caption) []caption {
 

diff --git a/cleaner_test.go b/cleaner_test.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import (
 	"testing"

diff --git a/encoding.go b/encoding.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import (
 	"bytes"

diff --git a/encoding_test.go b/encoding_test.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import (
 	"testing"

diff --git a/filter.go b/filter.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import (
 	"fmt"

diff --git a/helpers.go b/helpers.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import "os"
 

diff --git a/html.go b/html.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import (
 	"log"

diff --git a/html_test.go b/html_test.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import (
 	"testing"

diff --git a/parser.go b/parser.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 // parse tries to parse a subtitle from the data stream
 func parse(b []byte) []caption {

diff --git a/srt.go b/srt.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import (
 	"fmt"

diff --git a/srt_test.go b/srt_test.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import (
 	"testing"

diff --git a/ssa.go b/ssa.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import (
 	"fmt"

diff --git a/ssa_test.go b/ssa_test.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import (
 	"testing"

diff --git a/testextras.go b/testextras.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import (
 	"fmt"

diff --git a/thesubdb.go b/thesubdb.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import (
 	"crypto/md5"

diff --git a/thesubdb_test.go b/thesubdb_test.go
@@ -1,4 +1,4 @@
-package subber
+package subtitles
 
 import (
 	"os"