wip migrate to module

api.go

@@ -1,13 +1,14 @@
 package main
 
 import (
-	"gomark/bookmarks"
-	"gomark/database"
 	"io"
 	"net/http"
 	"os"
 	"strings"
 
+	"git.sp4ke.com/sp4ke/gomark/bookmarks"
+	"git.sp4ke.com/sp4ke/gomark/database"
+
 	"git.sp4ke.com/sp4ke/gum"
 	"github.com/gin-gonic/gin"
 )

browsers/base.go

@@ -10,17 +10,18 @@ package browsers
 
 import (
 	"fmt"
-	"gomark/database"
-	"gomark/index"
-	"gomark/logging"
-	"gomark/parsing"
-	"gomark/tree"
-	"gomark/watch"
 	"io"
 	"path"
 	"path/filepath"
 	"reflect"
 
+	"git.sp4ke.com/sp4ke/gomark/database"
+	"git.sp4ke.com/sp4ke/gomark/index"
+	"git.sp4ke.com/sp4ke/gomark/logging"
+	"git.sp4ke.com/sp4ke/gomark/parsing"
+	"git.sp4ke.com/sp4ke/gomark/tree"
+	"git.sp4ke.com/sp4ke/gomark/watch"
+
 	"github.com/fsnotify/fsnotify"
 	"github.com/sp4ke/hashmap"
 )

chrome.go

@@ -1,17 +1,18 @@
 package main
 
 import (
-	"gomark/browsers"
-	"gomark/chrome"
-	"gomark/database"
-	"gomark/parsing"
-	"gomark/tree"
-	"gomark/utils"
-	"gomark/watch"
 	"io/ioutil"
 	"path"
 	"time"
 
+	"git.sp4ke.com/sp4ke/gomark/browsers"
+	"git.sp4ke.com/sp4ke/gomark/chrome"
+	"git.sp4ke.com/sp4ke/gomark/database"
+	"git.sp4ke.com/sp4ke/gomark/parsing"
+	"git.sp4ke.com/sp4ke/gomark/tree"
+	"git.sp4ke.com/sp4ke/gomark/utils"
+	"git.sp4ke.com/sp4ke/gomark/watch"
+
 	"github.com/OneOfOne/xxhash"
 	"github.com/buger/jsonparser"
 	"github.com/fsnotify/fsnotify"

cmd/config_commands.go

@@ -1,11 +1,11 @@
 package cmd
 
 import (
-	"gomark/config"
+	"git.sp4ke.com/sp4ke/gomark/config"
-	"gomark/logging"
+	"git.sp4ke.com/sp4ke/gomark/logging"
-	"gomark/utils"
+	"git.sp4ke.com/sp4ke/gomark/utils"
 
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli/v2"
 )
 
 var log = logging.GetLogger("CMD")

cmd/firefox_commands.go

@@ -7,7 +7,7 @@ import (
 	"gomark/mozilla"
 	"path/filepath"
 
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli/v2"
 )
 
 var fflog = logging.GetLogger("FF")

cmd/firefox_flags.go

@@ -1,12 +1,13 @@
 package cmd
 
 import (
-	"gomark/config"
-	"gomark/mozilla"
 	"strings"
 
+	"git.sp4ke.com/sp4ke/gomark/config"
+	"git.sp4ke.com/sp4ke/gomark/mozilla"
+
 	"github.com/gobuffalo/flect"
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli/v2"
 )
 
 const (
@@ -14,7 +15,7 @@ const (
 )
 
 var FirefoxGlobalFlags = []cli.Flag{
-	cli.StringFlag{
+	&cli.StringFlag{
 		Name:  FirefoxDefaultProfileFlag,
 		Usage: "Set the default firefox `PROFILE` to use",
 	},

commands.go

@@ -6,7 +6,7 @@ import (
 
 	"git.sp4ke.com/sp4ke/gum"
 
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli/v2"
 )
 
 var startServerCmd = cli.Command{

config.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"gomark/config"
+	"git.sp4ke.com/sp4ke/gomark/config"
-	"gomark/utils"
+	"git.sp4ke.com/sp4ke/gomark/utils"
 )
 
 func InitDefaultConfig() {

database/utils.go

@@ -1,8 +1,9 @@
 package database
 
 import (
-	"gomark/utils"
 	"path/filepath"
+
+	"git.sp4ke.com/sp4ke/gomark/utils"
 )
 
 func GetDBFullPath() string {

db.go

@@ -1,9 +1,10 @@
 package main
 
 import (
-	"gomark/database"
-	"gomark/utils"
 	"path/filepath"
+
+	"git.sp4ke.com/sp4ke/gomark/database"
+	"git.sp4ke.com/sp4ke/gomark/utils"
 )
 
 type DB = database.DB

firefox.go

@@ -6,17 +6,18 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
-	"gomark/browsers"
-	"gomark/database"
-	"gomark/mozilla"
-	"gomark/parsing"
-	"gomark/tree"
-	"gomark/utils"
-	"gomark/watch"
 	"path"
 	"path/filepath"
 	"time"
 
+	"git.sp4ke.com/sp4ke/gomark/browsers"
+	"git.sp4ke.com/sp4ke/gomark/database"
+	"git.sp4ke.com/sp4ke/gomark/mozilla"
+	"git.sp4ke.com/sp4ke/gomark/parsing"
+	"git.sp4ke.com/sp4ke/gomark/tree"
+	"git.sp4ke.com/sp4ke/gomark/utils"
+	"git.sp4ke.com/sp4ke/gomark/watch"
+
 	"github.com/fsnotify/fsnotify"
 	"github.com/jmoiron/sqlx"
 	sqlite3 "github.com/mattn/go-sqlite3"

log.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"gomark/logging"
+	"git.sp4ke.com/sp4ke/gomark/logging"
 )
 
 var (

main.go

@@ -6,12 +6,14 @@
 package main
 
 import (
-	"gomark/cmd"
-	"gomark/config"
 	"os"
 
+	"git.sp4ke.com/sp4ke/gomark/config"
+
+	"git.sp4ke.com/sp4ke/gomark/cmd"
+
 	"github.com/urfave/cli/altsrc"
-	cli "gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli/v2"
 )
 
 func main() {
@@ -19,12 +21,12 @@ func main() {
 	app.Name = "gomark"
 	app.Version = "1.0"
 
-	flags := []cli.Flag{
+	flags := []*cli.Flag{
-		altsrc.NewStringFlag(cli.StringFlag{
+		&altsrc.NewStringFlag(cli.StringFlag{
 			Name: "firefox.DefaultProfile",
 		}),
 
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "config-file",
 			Value: config.ConfigFile,
 			Usage: "TOML config `FILE` path",

mozilla/config.go

@@ -1,8 +1,8 @@
 package mozilla
 
 import (
-	"gomark/database"
+	"git.sp4ke.com/sp4ke/gomark/database"
-	"gomark/logging"
+	"git.sp4ke.com/sp4ke/gomark/logging"
 )
 
 const (

mozilla/firefox_config.go

@@ -2,8 +2,9 @@ package mozilla
 
 import (
 	"fmt"
-	"gomark/config"
+
-	"gomark/database"
+	"git.sp4ke.com/sp4ke/gomark/config"
+	"git.sp4ke.com/sp4ke/gomark/database"
 
 	"github.com/fatih/structs"
 	"github.com/mitchellh/mapstructure"

mozilla/firefox_profiles.go

@@ -3,13 +3,14 @@ package mozilla
 import (
 	"errors"
 	"fmt"
-	"gomark/config"
-	"gomark/profiles"
-	"gomark/utils"
 	"os"
 	"path/filepath"
 	"regexp"
 
+	"git.sp4ke.com/sp4ke/gomark/config"
+	"git.sp4ke.com/sp4ke/gomark/profiles"
+	"git.sp4ke.com/sp4ke/gomark/utils"
+
 	ini "gopkg.in/ini.v1"
 )
 

mozilla/firefox_vfs.go

@@ -3,8 +3,9 @@ package mozilla
 import (
 	"errors"
 	"fmt"
-	"gomark/utils"
 	"path"
+
+	"git.sp4ke.com/sp4ke/gomark/utils"
 )
 
 const (

tree/tree.go

@@ -2,9 +2,10 @@ package tree
 
 import (
 	"fmt"
-	"gomark/bookmarks"
+
-	"gomark/index"
+	"git.sp4ke.com/sp4ke/gomark/bookmarks"
-	"gomark/logging"
+	"git.sp4ke.com/sp4ke/gomark/index"
+	"git.sp4ke.com/sp4ke/gomark/logging"
 
 	"github.com/xlab/treeprint"
 )

utils/events.go

@@ -1,10 +1,11 @@
 package utils
 
 import (
-	"gomark/logging"
-	"gomark/watch"
 	"time"
 
+	"git.sp4ke.com/sp4ke/gomark/logging"
+	"git.sp4ke.com/sp4ke/gomark/watch"
+
 	"github.com/fsnotify/fsnotify"
 )