change: move GetVersion() from mp4 to internal

Eyevinn · Nov 12, 2024 · 5db7c0a · 5db7c0a
1 parent bdcff7e
commit 5db7c0a
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 12 deletions.
diff --git a/cmd/mp4ff-crop/main.go b/cmd/mp4ff-crop/main.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"sort"
 
+	"github.com/Eyevinn/mp4ff/internal"
 	"github.com/Eyevinn/mp4ff/mp4"
 )
 
@@ -62,7 +63,7 @@ func run(args []string, stdout io.Writer) error {
 	}
 
 	if o.version {
-		fmt.Fprintf(stdout, "%s %s\n", appName, mp4.GetVersion())
+		fmt.Fprintf(stdout, "%s %s\n", appName, internal.GetVersion())
 		return nil
 	}
 

diff --git a/cmd/mp4ff-decrypt/main.go b/cmd/mp4ff-decrypt/main.go
@@ -8,6 +8,7 @@ import (
 	"io"
 	"os"
 
+	"github.com/Eyevinn/mp4ff/internal"
 	"github.com/Eyevinn/mp4ff/mp4"
 )
 
@@ -61,7 +62,7 @@ func run(args []string) error {
 	}
 
 	if opts.version {
-		fmt.Printf("%s %s\n", appName, mp4.GetVersion())
+		fmt.Printf("%s %s\n", appName, internal.GetVersion())
 		return nil
 	}
 

diff --git a/cmd/mp4ff-encrypt/main.go b/cmd/mp4ff-encrypt/main.go
@@ -8,6 +8,7 @@ import (
 	"io"
 	"os"
 
+	"github.com/Eyevinn/mp4ff/internal"
 	"github.com/Eyevinn/mp4ff/mp4"
 )
 
@@ -72,7 +73,7 @@ func run(args []string) error {
 	}
 
 	if opts.version {
-		fmt.Printf("%s %s\n", appName, mp4.GetVersion())
+		fmt.Printf("%s %s\n", appName, internal.GetVersion())
 		return nil
 	}
 

diff --git a/cmd/mp4ff-info/main.go b/cmd/mp4ff-info/main.go
@@ -7,6 +7,7 @@ import (
 	"io"
 	"os"
 
+	"github.com/Eyevinn/mp4ff/internal"
 	"github.com/Eyevinn/mp4ff/mp4"
 )
 
@@ -59,7 +60,7 @@ func run(args []string, w io.Writer) error {
 	}
 
 	if opts.version {
-		fmt.Printf("%s %s\n", appName, mp4.GetVersion())
+		fmt.Printf("%s %s\n", appName, internal.GetVersion())
 		return nil
 	}
 

diff --git a/cmd/mp4ff-nallister/main.go b/cmd/mp4ff-nallister/main.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/Eyevinn/mp4ff/avc"
 	"github.com/Eyevinn/mp4ff/hevc"
+	"github.com/Eyevinn/mp4ff/internal"
 	"github.com/Eyevinn/mp4ff/mp4"
 	"github.com/Eyevinn/mp4ff/sei"
 )
@@ -80,7 +81,7 @@ func run(args []string, stdout io.Writer) error {
 	}
 
 	if o.version {
-		fmt.Fprintf(stdout, "%s %s\n", appName, mp4.GetVersion())
+		fmt.Fprintf(stdout, "%s %s\n", appName, internal.GetVersion())
 		return nil
 	}
 

diff --git a/cmd/mp4ff-pslister/main.go b/cmd/mp4ff-pslister/main.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/Eyevinn/mp4ff/avc"
 	"github.com/Eyevinn/mp4ff/hevc"
+	"github.com/Eyevinn/mp4ff/internal"
 	"github.com/Eyevinn/mp4ff/mp4"
 )
 
@@ -75,7 +76,7 @@ func run(args []string, stdout io.Writer) error {
 	}
 
 	if o.version {
-		fmt.Fprintf(stdout, "%s %s\n", appName, mp4.GetVersion())
+		fmt.Fprintf(stdout, "%s %s\n", appName, internal.GetVersion())
 		return nil
 	}
 

diff --git a/cmd/mp4ff-subslister/main.go b/cmd/mp4ff-subslister/main.go
@@ -8,6 +8,7 @@ import (
 	"io"
 	"os"
 
+	"github.com/Eyevinn/mp4ff/internal"
 	"github.com/Eyevinn/mp4ff/mp4"
 )
 
@@ -64,7 +65,7 @@ func run(args []string, stdout io.Writer) error {
 	}
 
 	if o.version {
-		fmt.Fprintf(stdout, "%s %s\n", appName, mp4.GetVersion())
+		fmt.Fprintf(stdout, "%s %s\n", appName, internal.GetVersion())
 		return nil
 	}
 

diff --git a/examples/add-sidx/main.go b/examples/add-sidx/main.go
@@ -7,6 +7,7 @@ import (
 	"io"
 	"os"
 
+	"github.com/Eyevinn/mp4ff/internal"
 	"github.com/Eyevinn/mp4ff/mp4"
 )
 
@@ -67,7 +68,7 @@ func run(args []string, stdout io.Writer) error {
 	}
 
 	if o.version {
-		fmt.Fprintf(stdout, "%s %s\n", appName, mp4.GetVersion())
+		fmt.Fprintf(stdout, "%s %s\n", appName, internal.GetVersion())
 		return nil
 	}
 

diff --git a/mp4/version.go → internal/version.go b/mp4/version.go → internal/version.go
@@ -1,4 +1,4 @@
-package mp4
+package internal
 
 import (
 	"fmt"
@@ -8,7 +8,7 @@ import (
 
 var (
 	commitVersion string = "v0.46"      // May be updated using build flags
-	commitDate    string = "1723143113" // commitDate in Epoch seconds (may be overridden using build flags)
+	commitDate    string = "1731409630" // commitDate in Epoch seconds (may be overridden using build flags)
 )
 
 // GetVersion - get version and also commitHash and commitDate if inserted via Makefile

diff --git a/mp4/version_test.go → internal/version_test.go b/mp4/version_test.go → internal/version_test.go
@@ -1,8 +1,8 @@
-package mp4
+package internal
 
 import "fmt"
 
 func ExampleGetVersion() {
 	fmt.Println(GetVersion())
-	// Output: v0.46, date: 2024-08-08
+	// Output: v0.46, date: 2024-11-12
 }