Update import paths

This commit is contained in:
Daniel 2019-06-27 13:29:56 +02:00
parent 9cd2894afc
commit 8f3082f96f
78 changed files with 153 additions and 154 deletions

View file

@ -118,9 +118,9 @@ If you build everything with modules, your main program should be similar to thi
"os/signal"
"syscall"
"github.com/Safing/portbase/info"
"github.com/Safing/portbase/log"
"github.com/Safing/portbase/modules"
"github.com/safing/portbase/info"
"github.com/safing/portbase/log"
"github.com/safing/portbase/modules"
// include packages here
_ "path/to/my/custom/module"

View file

@ -5,7 +5,7 @@ import (
"sync"
"time"
"github.com/Safing/portbase/log"
"github.com/safing/portbase/log"
"github.com/gorilla/websocket"
"github.com/tevino/abool"
)

View file

@ -4,8 +4,8 @@ import (
"bytes"
"errors"
"github.com/Safing/portbase/container"
"github.com/Safing/portbase/formats/dsd"
"github.com/safing/portbase/container"
"github.com/safing/portbase/formats/dsd"
"github.com/tevino/abool"
)

View file

@ -4,7 +4,7 @@ import (
"fmt"
"sync"
"github.com/Safing/portbase/log"
"github.com/safing/portbase/log"
"github.com/tevino/abool"
"github.com/gorilla/websocket"

View file

@ -3,8 +3,8 @@ package api
import (
"flag"
"github.com/Safing/portbase/config"
"github.com/Safing/portbase/log"
"github.com/safing/portbase/config"
"github.com/safing/portbase/log"
)
var (

View file

@ -10,11 +10,11 @@ import (
"github.com/tevino/abool"
"github.com/tidwall/gjson"
"github.com/Safing/portbase/container"
"github.com/Safing/portbase/database"
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/record"
"github.com/Safing/portbase/log"
"github.com/safing/portbase/container"
"github.com/safing/portbase/database"
"github.com/safing/portbase/database/query"
"github.com/safing/portbase/database/record"
"github.com/safing/portbase/log"
)
const (

View file

@ -1,7 +1,7 @@
package api
import (
"github.com/Safing/portbase/modules"
"github.com/safing/portbase/modules"
)
func init() {

View file

@ -5,7 +5,7 @@ import (
"github.com/gorilla/mux"
"github.com/Safing/portbase/log"
"github.com/safing/portbase/log"
)
var (

View file

@ -3,7 +3,7 @@ package testclient
import (
"net/http"
"github.com/Safing/portbase/api"
"github.com/safing/portbase/api"
)
func init() {

View file

@ -7,16 +7,16 @@ import (
"syscall"
"time"
"github.com/Safing/portbase/info"
"github.com/Safing/portbase/log"
"github.com/Safing/portbase/modules"
"github.com/safing/portbase/info"
"github.com/safing/portbase/log"
"github.com/safing/portbase/modules"
// include packages here
_ "github.com/Safing/portbase/api"
_ "github.com/Safing/portbase/api/testclient"
"github.com/Safing/portbase/config"
_ "github.com/Safing/portbase/crypto/random"
_ "github.com/Safing/portbase/database/dbmodule"
_ "github.com/safing/portbase/api"
_ "github.com/safing/portbase/api/testclient"
"github.com/safing/portbase/config"
_ "github.com/safing/portbase/crypto/random"
_ "github.com/safing/portbase/database/dbmodule"
)
// var (

2
build
View file

@ -48,5 +48,5 @@ echo "This information is useful for debugging and license compliance."
echo "Run the compiled binary with the -version flag to see the information included."
# build
BUILD_PATH="github.com/Safing/portbase/info"
BUILD_PATH="github.com/safing/portbase/info"
go build -ldflags "-X ${BUILD_PATH}.commit=${BUILD_COMMIT} -X ${BUILD_PATH}.buildOptions=${BUILD_BUILDOPTIONS} -X ${BUILD_PATH}.buildUser=${BUILD_USER} -X ${BUILD_PATH}.buildHost=${BUILD_HOST} -X ${BUILD_PATH}.buildDate=${BUILD_DATE} -X ${BUILD_PATH}.buildSource=${BUILD_SOURCE}" $@

View file

@ -5,12 +5,12 @@ import (
"sort"
"strings"
"github.com/Safing/portbase/log"
"github.com/Safing/portbase/database"
"github.com/Safing/portbase/database/storage"
"github.com/Safing/portbase/database/record"
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/iterator"
"github.com/safing/portbase/log"
"github.com/safing/portbase/database"
"github.com/safing/portbase/database/storage"
"github.com/safing/portbase/database/record"
"github.com/safing/portbase/database/query"
"github.com/safing/portbase/database/iterator"
)
var (

View file

@ -3,7 +3,7 @@ package config
import (
"testing"
"github.com/Safing/portbase/log"
"github.com/safing/portbase/log"
)
func parseAndSetConfig(jsonData string) error {

View file

@ -5,7 +5,7 @@ import (
"sync"
"fmt"
"github.com/Safing/portbase/log"
"github.com/safing/portbase/log"
)
var (

View file

@ -4,8 +4,8 @@ import (
"os"
"path"
"github.com/Safing/portbase/database"
"github.com/Safing/portbase/modules"
"github.com/safing/portbase/database"
"github.com/safing/portbase/modules"
)
func init() {

View file

@ -7,7 +7,7 @@ import (
"github.com/tidwall/sjson"
"github.com/Safing/portbase/database/record"
"github.com/safing/portbase/database/record"
)
// Variable Type IDs for frontend Identification. Use ExternalOptType for extended types in the frontend.

View file

@ -6,7 +6,7 @@ import (
"io/ioutil"
"strings"
"github.com/Safing/portbase/log"
"github.com/safing/portbase/log"
)
var (

View file

@ -1,10 +1,9 @@
// Package container gives you a []byte slice on steroids, allowing for quick data appending, prepending and fetching as well as transparent error transportation.
package container
import (
"errors"
"github.com/Safing/portbase/formats/varint"
"github.com/safing/portbase/formats/varint"
)
// Container is []byte sclie on steroids, allowing for quick data appending, prepending and fetching as well as transparent error transportation. (Error transportation requires use of varints for data)

View file

@ -5,7 +5,7 @@ import (
"errors"
"testing"
"github.com/Safing/portbase/utils"
"github.com/safing/portbase/utils"
)
var (

View file

@ -10,7 +10,7 @@ import (
"fmt"
"io"
"github.com/Safing/portbase/formats/varint"
"github.com/safing/portbase/formats/varint"
)
type Hash struct {

View file

@ -5,8 +5,8 @@ import (
"github.com/tevino/abool"
"github.com/Safing/portbase/config"
"github.com/Safing/portbase/container"
"github.com/safing/portbase/config"
"github.com/safing/portbase/container"
)
var (

View file

@ -7,7 +7,7 @@ import (
"math"
"time"
"github.com/Safing/portbase/config"
"github.com/safing/portbase/config"
)
var (

View file

@ -4,7 +4,7 @@ import (
"crypto/rand"
"time"
"github.com/Safing/portbase/log"
"github.com/safing/portbase/log"
)
func osFeeder() {

View file

@ -9,8 +9,8 @@ import (
"github.com/aead/serpent"
"github.com/seehuhn/fortuna"
"github.com/Safing/portbase/config"
"github.com/Safing/portbase/modules"
"github.com/safing/portbase/config"
"github.com/safing/portbase/modules"
)
var (

View file

@ -3,7 +3,7 @@ package random
import (
"testing"
"github.com/Safing/portbase/config"
"github.com/safing/portbase/config"
)
func init() {

View file

@ -12,7 +12,7 @@ import (
"runtime"
"time"
"github.com/Safing/portbase/crypto/random"
"github.com/safing/portbase/crypto/random"
)
func noise() {

View file

@ -4,7 +4,7 @@ import (
"encoding/json"
"testing"
"github.com/Safing/portbase/utils"
"github.com/safing/portbase/utils"
)
type TestStruct struct {

View file

@ -4,7 +4,7 @@ import (
"fmt"
"sync"
"github.com/Safing/portbase/database/record"
"github.com/safing/portbase/database/record"
)
type Example struct {

View file

@ -5,10 +5,10 @@ import (
"github.com/tevino/abool"
"github.com/Safing/portbase/database/iterator"
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/record"
"github.com/Safing/portbase/database/storage"
"github.com/safing/portbase/database/iterator"
"github.com/safing/portbase/database/query"
"github.com/safing/portbase/database/record"
"github.com/safing/portbase/database/storage"
)
// A Controller takes care of all the extra database logic.

View file

@ -5,7 +5,7 @@ import (
"fmt"
"sync"
"github.com/Safing/portbase/database/storage"
"github.com/safing/portbase/database/storage"
)
var (

View file

@ -10,10 +10,10 @@ import (
"testing"
"time"
q "github.com/Safing/portbase/database/query"
_ "github.com/Safing/portbase/database/storage/badger"
_ "github.com/Safing/portbase/database/storage/bbolt"
_ "github.com/Safing/portbase/database/storage/fstree"
q "github.com/safing/portbase/database/query"
_ "github.com/safing/portbase/database/storage/badger"
_ "github.com/safing/portbase/database/storage/bbolt"
_ "github.com/safing/portbase/database/storage/fstree"
)
func makeKey(dbName, key string) string {

View file

@ -5,8 +5,8 @@ import (
"flag"
"sync"
"github.com/Safing/portbase/database"
"github.com/Safing/portbase/modules"
"github.com/safing/portbase/database"
"github.com/safing/portbase/modules"
)
var (

View file

@ -3,8 +3,8 @@ package dbmodule
import (
"time"
"github.com/Safing/portbase/database"
"github.com/Safing/portbase/log"
"github.com/safing/portbase/database"
"github.com/safing/portbase/log"
)
var (

View file

@ -1,8 +1,8 @@
package database
import (
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/record"
"github.com/safing/portbase/database/query"
"github.com/safing/portbase/database/record"
)
// Hook describes a hook

View file

@ -1,7 +1,7 @@
package database
import (
"github.com/Safing/portbase/database/record"
"github.com/safing/portbase/database/record"
)
// HookBase implements the Hook interface and provides dummy functions to reduce boilerplate.

View file

@ -7,10 +7,10 @@ import (
"github.com/bluele/gcache"
"github.com/Safing/portbase/database/accessor"
"github.com/Safing/portbase/database/iterator"
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/record"
"github.com/safing/portbase/database/accessor"
"github.com/safing/portbase/database/iterator"
"github.com/safing/portbase/database/query"
"github.com/safing/portbase/database/record"
)
const (

View file

@ -5,7 +5,7 @@ import (
"github.com/tevino/abool"
"github.com/Safing/portbase/database/record"
"github.com/safing/portbase/database/record"
)
// Iterator defines the iterator structure.

View file

@ -3,8 +3,8 @@ package database
import (
"time"
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/record"
"github.com/safing/portbase/database/query"
"github.com/safing/portbase/database/record"
)
// Maintain runs the Maintain method on all storages.

View file

@ -4,7 +4,7 @@ import (
"fmt"
"strings"
"github.com/Safing/portbase/database/accessor"
"github.com/safing/portbase/database/accessor"
)
// And combines multiple conditions with a logical _AND_ operator.

View file

@ -5,7 +5,7 @@ import (
"fmt"
"strconv"
"github.com/Safing/portbase/database/accessor"
"github.com/safing/portbase/database/accessor"
)
type boolCondition struct {

View file

@ -1,7 +1,7 @@
package query
import (
"github.com/Safing/portbase/database/accessor"
"github.com/safing/portbase/database/accessor"
)
type errorCondition struct {

View file

@ -4,7 +4,7 @@ import (
"errors"
"fmt"
"github.com/Safing/portbase/database/accessor"
"github.com/safing/portbase/database/accessor"
)
type existsCondition struct {

View file

@ -5,7 +5,7 @@ import (
"fmt"
"strconv"
"github.com/Safing/portbase/database/accessor"
"github.com/safing/portbase/database/accessor"
)
type floatCondition struct {

View file

@ -5,7 +5,7 @@ import (
"fmt"
"strconv"
"github.com/Safing/portbase/database/accessor"
"github.com/safing/portbase/database/accessor"
)
type intCondition struct {

View file

@ -4,7 +4,7 @@ import (
"fmt"
"strings"
"github.com/Safing/portbase/database/accessor"
"github.com/safing/portbase/database/accessor"
)
// Not negates the supplied condition.

View file

@ -4,7 +4,7 @@ import (
"fmt"
"strings"
"github.com/Safing/portbase/database/accessor"
"github.com/safing/portbase/database/accessor"
)
// Or combines multiple conditions with a logical _OR_ operator.

View file

@ -5,7 +5,7 @@ import (
"fmt"
"regexp"
"github.com/Safing/portbase/database/accessor"
"github.com/safing/portbase/database/accessor"
)
type regexCondition struct {

View file

@ -5,7 +5,7 @@ import (
"fmt"
"strings"
"github.com/Safing/portbase/database/accessor"
"github.com/safing/portbase/database/accessor"
)
type stringCondition struct {

View file

@ -4,8 +4,8 @@ import (
"fmt"
"strings"
"github.com/Safing/portbase/database/accessor"
"github.com/Safing/portbase/utils"
"github.com/safing/portbase/database/accessor"
"github.com/safing/portbase/utils"
)
type stringSliceCondition struct {

View file

@ -3,7 +3,7 @@ package query
import (
"fmt"
"github.com/Safing/portbase/database/accessor"
"github.com/safing/portbase/database/accessor"
)
// Condition is an interface to provide a common api to all condition types.

View file

@ -4,8 +4,8 @@ import (
"fmt"
"strings"
"github.com/Safing/portbase/database/accessor"
"github.com/Safing/portbase/database/record"
"github.com/safing/portbase/database/accessor"
"github.com/safing/portbase/database/record"
)
// Example:

View file

@ -3,8 +3,8 @@ package query
import (
"testing"
"github.com/Safing/portbase/database/record"
"github.com/Safing/portbase/formats/dsd"
"github.com/safing/portbase/database/record"
"github.com/safing/portbase/formats/dsd"
)
var (

View file

@ -4,9 +4,9 @@ import (
"errors"
"fmt"
"github.com/Safing/portbase/container"
"github.com/Safing/portbase/database/accessor"
"github.com/Safing/portbase/formats/dsd"
"github.com/safing/portbase/container"
"github.com/safing/portbase/database/accessor"
"github.com/safing/portbase/formats/dsd"
)
// Base provides a quick way to comply with the Model interface.

View file

@ -1,7 +1,7 @@
package record
import (
"github.com/Safing/portbase/formats/dsd"
"github.com/safing/portbase/formats/dsd"
)
// Reimport DSD storage types

View file

@ -21,11 +21,11 @@ import (
"testing"
"time"
"github.com/Safing/portbase/container"
"github.com/Safing/portbase/formats/dsd"
"github.com/Safing/portbase/formats/varint"
"github.com/safing/portbase/container"
"github.com/safing/portbase/formats/dsd"
"github.com/safing/portbase/formats/varint"
// Colfer
// "github.com/Safing/portbase/database/model/model"
// "github.com/safing/portbase/database/model/model"
// XDR
// xdr2 "github.com/davecgh/go-xdr/xdr2"
)

View file

@ -1,7 +1,7 @@
package record
import (
"github.com/Safing/portbase/database/accessor"
"github.com/safing/portbase/database/accessor"
)
// Record provides an interface for uniformally handling database records.

View file

@ -5,10 +5,10 @@ import (
"fmt"
"sync"
"github.com/Safing/portbase/container"
"github.com/Safing/portbase/database/accessor"
"github.com/Safing/portbase/formats/dsd"
"github.com/Safing/portbase/formats/varint"
"github.com/safing/portbase/container"
"github.com/safing/portbase/database/accessor"
"github.com/safing/portbase/formats/dsd"
"github.com/safing/portbase/formats/varint"
)
// Wrapper wraps raw data and implements the Record interface.

View file

@ -4,7 +4,7 @@ import (
"bytes"
"testing"
"github.com/Safing/portbase/formats/dsd"
"github.com/safing/portbase/formats/dsd"
)
func TestWrapper(t *testing.T) {

View file

@ -7,11 +7,11 @@ import (
"github.com/dgraph-io/badger"
"github.com/Safing/portbase/database/iterator"
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/record"
"github.com/Safing/portbase/database/storage"
"github.com/Safing/portbase/log"
"github.com/safing/portbase/database/iterator"
"github.com/safing/portbase/database/query"
"github.com/safing/portbase/database/record"
"github.com/safing/portbase/database/storage"
"github.com/safing/portbase/log"
)
// Badger database made pluggable for portbase.

View file

@ -7,8 +7,8 @@ import (
"sync"
"testing"
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/record"
"github.com/safing/portbase/database/query"
"github.com/safing/portbase/database/record"
)
type TestRecord struct {

View file

@ -9,10 +9,10 @@ import (
"go.etcd.io/bbolt"
"github.com/Safing/portbase/database/iterator"
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/record"
"github.com/Safing/portbase/database/storage"
"github.com/safing/portbase/database/iterator"
"github.com/safing/portbase/database/query"
"github.com/safing/portbase/database/record"
"github.com/safing/portbase/database/storage"
)
var (

View file

@ -7,8 +7,8 @@ import (
"sync"
"testing"
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/record"
"github.com/safing/portbase/database/query"
"github.com/safing/portbase/database/record"
)
type TestRecord struct {

View file

@ -13,10 +13,10 @@ import (
"strings"
"time"
"github.com/Safing/portbase/database/iterator"
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/record"
"github.com/Safing/portbase/database/storage"
"github.com/safing/portbase/database/iterator"
"github.com/safing/portbase/database/query"
"github.com/safing/portbase/database/record"
"github.com/safing/portbase/database/storage"
"github.com/google/renameio"
)

View file

@ -3,9 +3,9 @@ package storage
import (
"errors"
"github.com/Safing/portbase/database/iterator"
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/record"
"github.com/safing/portbase/database/iterator"
"github.com/safing/portbase/database/query"
"github.com/safing/portbase/database/record"
)
var (

View file

@ -1,9 +1,9 @@
package storage
import (
"github.com/Safing/portbase/database/iterator"
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/record"
"github.com/safing/portbase/database/iterator"
"github.com/safing/portbase/database/query"
"github.com/safing/portbase/database/record"
)
// Interface defines the database storage API.

View file

@ -3,10 +3,10 @@ package sinkhole
import (
"errors"
"github.com/Safing/portbase/database/iterator"
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/record"
"github.com/Safing/portbase/database/storage"
"github.com/safing/portbase/database/iterator"
"github.com/safing/portbase/database/query"
"github.com/safing/portbase/database/record"
"github.com/safing/portbase/database/storage"
)
// Sinkhole is a dummy storage.

View file

@ -1,8 +1,8 @@
package database
import (
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/record"
"github.com/safing/portbase/database/query"
"github.com/safing/portbase/database/record"
)
// Subscription is a database subscription for updates.

View file

@ -12,7 +12,7 @@ import (
// "github.com/pkg/bson"
"github.com/Safing/portbase/formats/varint"
"github.com/safing/portbase/formats/varint"
)
// define types

View file

@ -7,7 +7,7 @@ import (
"os"
"strings"
"github.com/Safing/portbase/modules"
"github.com/safing/portbase/modules"
)
var (

View file

@ -1,7 +1,7 @@
package log
import (
"github.com/Safing/portbase/utils/osdetail"
"github.com/safing/portbase/utils/osdetail"
)
const (

View file

@ -6,7 +6,7 @@ import (
"fmt"
"time"
"github.com/Safing/portbase/taskmanager"
"github.com/safing/portbase/taskmanager"
)
func writeLine(line *logLine, duplicates uint64) {

View file

@ -4,7 +4,7 @@ import (
"fmt"
"os"
"github.com/Safing/portbase/log"
"github.com/safing/portbase/log"
"github.com/tevino/abool"
)

View file

@ -6,7 +6,7 @@ import (
"github.com/tevino/abool"
"github.com/Safing/portbase/log"
"github.com/safing/portbase/log"
)
var (

View file

@ -6,12 +6,12 @@ import (
"strings"
"sync"
"github.com/Safing/portbase/database"
"github.com/Safing/portbase/database/iterator"
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/record"
"github.com/Safing/portbase/database/storage"
"github.com/Safing/portbase/log"
"github.com/safing/portbase/database"
"github.com/safing/portbase/database/iterator"
"github.com/safing/portbase/database/query"
"github.com/safing/portbase/database/record"
"github.com/safing/portbase/database/storage"
"github.com/safing/portbase/log"
)
var (

View file

@ -3,7 +3,7 @@ package notifications
import (
"sync"
"github.com/Safing/portbase/modules"
"github.com/safing/portbase/modules"
)
var (

View file

@ -5,8 +5,8 @@ import (
"sync"
"time"
"github.com/Safing/portbase/database/record"
"github.com/Safing/portbase/log"
"github.com/safing/portbase/database/record"
"github.com/safing/portbase/log"
)
// Notification types

View file

@ -6,9 +6,9 @@ import (
"os/signal"
"syscall"
"github.com/Safing/portbase/info"
"github.com/Safing/portbase/log"
"github.com/Safing/portbase/modules"
"github.com/safing/portbase/info"
"github.com/safing/portbase/log"
"github.com/safing/portbase/modules"
// include packages here
)

View file

@ -3,7 +3,7 @@ package main
import (
"fmt"
"github.com/Safing/portbase/utils/osdetail"
"github.com/safing/portbase/utils/osdetail"
)
func main() {