Refactor: encapsulate custom url manipulation function into object me…

…thod.
keuin · Jul 1, 2023 · 8f07f6f · 8f07f6f
1 parent 5aba05d
commit 8f07f6f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/common/urlparse.go → common/myurl/urlparse.go b/common/urlparse.go → common/myurl/urlparse.go
@@ -1,15 +1,21 @@
-package common
+package myurl
 
 import (
 	"errors"
 	"net/url"
 	"strings"
 )
 
-// GetFileExtensionFromUrl
+type Url string
+
+func (o Url) Url() string {
+	return string(o)
+}
+
+// FileExtension returns file extension of file name from this url.
 // copied from https://elisegev.medium.com/get-a-file-extension-from-a-url-in-golang-5061d4a298a
-func GetFileExtensionFromUrl(rawUrl string) (string, error) {
-	u, err := url.Parse(rawUrl)
+func (o Url) FileExtension() (string, error) {
+	u, err := url.Parse(o.Url())
 	if err != nil {
 		return "", err
 	}

diff --git a/common/urlparse_test.go → common/myurl/urlparse_test.go b/common/urlparse_test.go → common/myurl/urlparse_test.go
@@ -1,4 +1,4 @@
-package common
+package myurl
 
 import "testing"
 
@@ -12,15 +12,15 @@ func TestGetFileExtensionFromUrl(t *testing.T) {
 		{Expected: "flv"},
 	}
 	var err error
-	tests[0].Actual, err = GetFileExtensionFromUrl("http://www.example.com/index.html")
+	tests[0].Actual, err = Url("http://www.example.com/index.html").FileExtension()
 	if err != nil {
 		t.Fatalf("GetFileExtensionFromUrl: %v", err)
 	}
-	tests[1].Actual, err = GetFileExtensionFromUrl("https://www.example.com/index.htm")
+	tests[1].Actual, err = Url("https://www.example.com/index.htm").FileExtension()
 	if err != nil {
 		t.Fatalf("GetFileExtensionFromUrl: %v", err)
 	}
-	tests[2].Actual, err = GetFileExtensionFromUrl("https://www.example.com/video.flv?a=1&b=2flv")
+	tests[2].Actual, err = Url("https://www.example.com/video.flv?a=1&b=2flv").FileExtension()
 	if err != nil {
 		t.Fatalf("GetFileExtensionFromUrl: %v", err)
 	}

diff --git a/recording/runner.go b/recording/runner.go
@@ -12,6 +12,7 @@ import (
 	"fmt"
 	"github.com/keuin/slbr/bilibili"
 	"github.com/keuin/slbr/common"
+	"github.com/keuin/slbr/common/myurl"
 	"github.com/keuin/slbr/logging"
 	"github.com/samber/mo"
 	"io"
@@ -277,7 +278,7 @@ func record(
 	var extName string
 
 	// the real extension name (without renaming)
-	originalExtName := mo.TupleToResult(common.GetFileExtensionFromUrl(streamSource.URL)).OrElse("flv")
+	originalExtName := mo.TupleToResult(myurl.Url(streamSource.URL).FileExtension()).OrElse("flv")
 
 	if task.Download.UseSpecialExtNameBeforeFinishing {
 		extName = kSpecialExtName