* Follow golang project structures convention

edward-yakop · Dec 29, 2020 · 1f1ab33 · 1f1ab33
1 parent 6c87c06
commit 1f1ab33
Show file tree

Hide file tree

Showing 22 changed files with 24 additions and 22 deletions.
diff --git a/app/dukapp.go → internal/app/dukapp.go b/app/dukapp.go → internal/app/dukapp.go
@@ -10,12 +10,12 @@ import (
 	"sync"
 	"time"
 
-	"ed-fx/go-duka/bi5"
-	"ed-fx/go-duka/core"
-	"ed-fx/go-duka/csv"
-	"ed-fx/go-duka/fxt4"
-	"ed-fx/go-duka/hst"
-	"ed-fx/go-duka/misc"
+	"ed-fx/go-duka/internal/bi5"
+	"ed-fx/go-duka/internal/core"
+	"ed-fx/go-duka/internal/export/csv"
+	"ed-fx/go-duka/internal/export/fxt4"
+	"ed-fx/go-duka/internal/export/hst"
+	"ed-fx/go-duka/internal/misc"
 )
 
 var (

diff --git a/app/dukapp_test.go → internal/app/dukapp_test.go b/app/dukapp_test.go → internal/app/dukapp_test.go
diff --git a/bi5/bi5.go → internal/bi5/bi5.go b/bi5/bi5.go → internal/bi5/bi5.go
@@ -11,8 +11,8 @@ import (
 	"path/filepath"
 	"time"
 
-	"ed-fx/go-duka/core"
-	"ed-fx/go-duka/misc"
+	"ed-fx/go-duka/internal/core"
+	"ed-fx/go-duka/internal/misc"
 	//"github.com/kjk/lzma"
 	"github.com/ulikunitz/xz/lzma"
 )

diff --git a/bi5/bi5_test.go → internal/bi5/bi5_test.go b/bi5/bi5_test.go → internal/bi5/bi5_test.go
diff --git a/core/downld.go → internal/core/downld.go b/core/downld.go → internal/core/downld.go
diff --git a/core/fetch.go → internal/core/fetch.go b/core/fetch.go → internal/core/fetch.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"time"
 
-	"ed-fx/go-duka/misc"
+	"ed-fx/go-duka/internal/misc"
 )
 
 const (

diff --git a/core/parser.go → internal/core/parser.go b/core/parser.go → internal/core/parser.go
diff --git a/core/tickdata.go → internal/core/tickdata.go b/core/tickdata.go → internal/core/tickdata.go
@@ -18,8 +18,10 @@ type TickData struct {
 
 // UTC convert timestamp to UTC time
 //
+const timeMillisecond int64 = int64(time.Millisecond)
+
 func (t *TickData) UTC() time.Time {
-	tm := time.Unix(t.Timestamp/1000, (t.Timestamp%1000)*int64(time.Millisecond))
+	tm := time.Unix(t.Timestamp/1000, (t.Timestamp%1000)*timeMillisecond)
 	return tm.UTC()
 }
 

diff --git a/core/timeframe.go → internal/core/timeframe.go b/core/timeframe.go → internal/core/timeframe.go
diff --git a/csv/csv.go → internal/export/csv/csv.go b/csv/csv.go → internal/export/csv/csv.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"time"
 
-	"ed-fx/go-duka/core"
-	"ed-fx/go-duka/misc"
+	"ed-fx/go-duka/internal/core"
+	"ed-fx/go-duka/internal/misc"
 )
 
 var (

diff --git a/csv/csv_test.go → internal/export/csv/csv_test.go b/csv/csv_test.go → internal/export/csv/csv_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"ed-fx/go-duka/bi5"
+	"ed-fx/go-duka/internal/bi5"
 )
 
 func TestCloseChan(t *testing.T) {

diff --git a/fxt4/FXT_HEADER_405.h → internal/export/fxt4/FXT_HEADER_405.h b/fxt4/FXT_HEADER_405.h → internal/export/fxt4/FXT_HEADER_405.h
diff --git a/fxt4/convert_csv_to_mt.py → internal/export/fxt4/convert_csv_to_mt.py b/fxt4/convert_csv_to_mt.py → internal/export/fxt4/convert_csv_to_mt.py
diff --git a/fxt4/fxt4.go → internal/export/fxt4/fxt4.go b/fxt4/fxt4.go → internal/export/fxt4/fxt4.go
@@ -3,15 +3,15 @@ package fxt4
 import (
 	"bufio"
 	"bytes"
-	"ed-fx/go-duka/misc"
+	"ed-fx/go-duka/internal/misc"
 	"encoding/binary"
 	"fmt"
 	"io"
 	"math"
 	"os"
 	"path/filepath"
 
-	"ed-fx/go-duka/core"
+	"ed-fx/go-duka/internal/core"
 )
 
 var (

diff --git a/fxt4/fxt4_test.go → internal/export/fxt4/fxt4_test.go b/fxt4/fxt4_test.go → internal/export/fxt4/fxt4_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"ed-fx/go-duka/core"
+	"ed-fx/go-duka/internal/core"
 )
 
 func TestFxtFile(t *testing.T) {

diff --git a/fxt4/header.go → internal/export/fxt4/header.go b/fxt4/header.go → internal/export/fxt4/header.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"ed-fx/go-duka/misc"
+	"ed-fx/go-duka/internal/misc"
 )
 
 var (

diff --git a/hst/header.go → internal/export/hst/header.go b/hst/header.go → internal/export/hst/header.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"ed-fx/go-duka/misc"
+	"ed-fx/go-duka/internal/misc"
 )
 
 const (

diff --git a/hst/hst401.go → internal/export/hst/hst401.go b/hst/hst401.go → internal/export/hst/hst401.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"ed-fx/go-duka/core"
-	"ed-fx/go-duka/misc"
+	"ed-fx/go-duka/internal/core"
+	"ed-fx/go-duka/internal/misc"
 )
 
 var (

diff --git a/hst/hst401_test.go → internal/export/hst/hst401_test.go b/hst/hst401_test.go → internal/export/hst/hst401_test.go
diff --git a/misc/bytes.go → internal/misc/bytes.go b/misc/bytes.go → internal/misc/bytes.go
diff --git a/misc/logger.go → internal/misc/logger.go b/misc/logger.go → internal/misc/logger.go
diff --git a/main.go b/main.go
@@ -1,13 +1,13 @@
 package main
 
 import (
-	"ed-fx/go-duka/app"
+	"ed-fx/go-duka/internal/app"
 	"flag"
 	"fmt"
 	"path/filepath"
 	"time"
 
-	"ed-fx/go-duka/fxt4"
+	"ed-fx/go-duka/internal/export/fxt4"
 	"unknwon.dev/clog/v2"
 )