Change module path to relative, add check for empty tag on import

cmd/add.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"time"
 
+	"../model"
 	"github.com/RadhiFadlillah/go-readability"
-	"github.com/RadhiFadlillah/shiori/model"
 	"github.com/spf13/cobra"
 )
 

cmd/export.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/RadhiFadlillah/shiori/model"
+	"../model"
 	"github.com/spf13/cobra"
 )
 

cmd/import.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"
 
+	"../model"
 	"github.com/PuerkitoBio/goquery"
-	"github.com/RadhiFadlillah/shiori/model"
 	"github.com/spf13/cobra"
 )
 
@@ -73,7 +73,9 @@ func importBookmarks(pth string, generateTag bool) error {
 		// Get bookmark tags
 		tags := []model.Tag{}
 		for _, strTag := range strings.Split(strTags, ",") {
-			tags = append(tags, model.Tag{Name: strTag})
+			if strTag != "" {
+				tags = append(tags, model.Tag{Name: strTag})
+			}
 		}
 
 		// Get bookmark excerpt

cmd/print.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/RadhiFadlillah/shiori/model"
+	"../model"
 	"github.com/spf13/cobra"
 )
 

cmd/root.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/RadhiFadlillah/shiori/database"
+	"../database"
 	"github.com/spf13/cobra"
 )
 

cmd/serve.go

@@ -13,8 +13,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/RadhiFadlillah/shiori/assets"
+	"../assets"
-	"github.com/RadhiFadlillah/shiori/model"
+	"../model"
 	"github.com/dgrijalva/jwt-go"
 	"github.com/dgrijalva/jwt-go/request"
 	"github.com/julienschmidt/httprouter"

cmd/update.go

@@ -8,8 +8,8 @@ import (
 	"sync"
 	"time"
 
+	"../model"
 	"github.com/RadhiFadlillah/go-readability"
-	"github.com/RadhiFadlillah/shiori/model"
 	"github.com/spf13/cobra"
 )
 

database/database.go

@@ -3,7 +3,7 @@ package database
 import (
 	"database/sql"
 
-	"github.com/RadhiFadlillah/shiori/model"
+	"../model"
 )
 
 // Database is interface for manipulating data in database.

database/sqlite.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/RadhiFadlillah/shiori/model"
+	"../model"
 	"github.com/jmoiron/sqlx"
 	"golang.org/x/crypto/bcrypt"
 )

main.go

@@ -2,8 +2,8 @@
 package main
 
 import (
-	"github.com/RadhiFadlillah/shiori/cmd"
+	"./cmd"
-	db "github.com/RadhiFadlillah/shiori/database"
+	db "./database"
 	_ "github.com/mattn/go-sqlite3"
 )