Update imports to point to new organization

This commit is contained in:
Mitch Roote 2021-01-26 21:33:50 -05:00
parent d1fb9084ef
commit df574e4846
20 changed files with 59 additions and 41 deletions

View File

@ -2,13 +2,14 @@ package api
import (
"encoding/base64"
"log"
"net/http"
"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
"github.com/gorilla/sessions"
"github.com/mroote/factorio-server-manager/bootstrap"
"golang.org/x/crypto/bcrypt"
"gorm.io/driver/sqlite"
"gorm.io/gorm"
"log"
"net/http"
)
type User bootstrap.User

View File

@ -4,9 +4,6 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/gorilla/sessions"
"github.com/mroote/factorio-server-manager/bootstrap"
"github.com/mroote/factorio-server-manager/factorio"
"io"
"io/ioutil"
"log"
@ -17,6 +14,10 @@ import (
"sync"
"time"
"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
"github.com/OpenFactorioServerManager/factorio-server-manager/factorio"
"github.com/gorilla/sessions"
"github.com/gorilla/mux"
)

View File

@ -4,14 +4,15 @@ import (
"archive/zip"
"errors"
"fmt"
"github.com/gorilla/mux"
"github.com/mroote/factorio-server-manager/bootstrap"
"github.com/mroote/factorio-server-manager/factorio"
"io"
"log"
"net/http"
"os"
"path/filepath"
"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
"github.com/OpenFactorioServerManager/factorio-server-manager/factorio"
"github.com/gorilla/mux"
)
func CheckModPackExists(modPackMap factorio.ModPackMap, modPackName string, w http.ResponseWriter) (resp interface{}, err error) {

View File

@ -3,10 +3,6 @@ package api
import (
"bytes"
"encoding/json"
"github.com/gorilla/mux"
"github.com/mroote/factorio-server-manager/bootstrap"
"github.com/mroote/factorio-server-manager/factorio"
"github.com/stretchr/testify/assert"
"io"
"mime/multipart"
"net/http"
@ -15,6 +11,12 @@ import (
"path/filepath"
"strings"
"testing"
"github.com/OpenFactorioServerManager/factorio-server-manager"
"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
"github.com/OpenFactorioServerManager/factorio-server-manager/factorio"
"github.com/gorilla/mux"
"github.com/stretchr/testify/assert"
)
func SetupModPacks(t *testing.T, empty bool, emptyMods bool) {

View File

@ -2,10 +2,11 @@ package api
import (
"fmt"
"github.com/gorilla/mux"
"github.com/mroote/factorio-server-manager/factorio"
"log"
"net/http"
"github.com/OpenFactorioServerManager/factorio-server-manager/factorio"
"github.com/gorilla/mux"
)
func ModPortalListModsHandler(w http.ResponseWriter, r *http.Request) {

View File

@ -4,14 +4,15 @@ import (
"archive/zip"
"encoding/json"
"fmt"
"github.com/mroote/factorio-server-manager/bootstrap"
"github.com/mroote/factorio-server-manager/factorio"
"github.com/mroote/factorio-server-manager/lockfile"
"io"
"log"
"net/http"
"os"
"path/filepath"
"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
"github.com/OpenFactorioServerManager/factorio-server-manager/factorio"
"github.com/OpenFactorioServerManager/factorio-server-manager/lockfile"
)
func CreateNewMods(w http.ResponseWriter) (modList factorio.Mods, resp interface{}, err error) {

View File

@ -2,12 +2,6 @@ package api
import (
"bytes"
"github.com/gorilla/mux"
"github.com/joho/godotenv"
"github.com/mroote/factorio-server-manager/bootstrap"
"github.com/mroote/factorio-server-manager/factorio"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"io"
"log"
"mime/multipart"
@ -17,6 +11,13 @@ import (
"path/filepath"
"strings"
"testing"
"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
"github.com/OpenFactorioServerManager/factorio-server-manager/factorio"
"github.com/gorilla/mux"
"github.com/joho/godotenv"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestMain(m *testing.M) {

View File

@ -1,9 +1,10 @@
package api
import (
"github.com/mroote/factorio-server-manager/api/websocket"
"net/http"
"github.com/OpenFactorioServerManager/factorio-server-manager/api/websocket"
"github.com/gorilla/mux"
)

View File

@ -1,8 +1,9 @@
package websocket
import (
"github.com/mroote/factorio-server-manager/bootstrap"
"reflect"
"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
)
// the hub, that is exported and can be used anywhere to work with the websocket

View File

@ -3,10 +3,11 @@ package factorio
import (
"encoding/json"
"errors"
"github.com/mroote/factorio-server-manager/bootstrap"
"io/ioutil"
"log"
"os"
"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
)
type Credentials struct {

View File

@ -1,9 +1,10 @@
package factorio
import (
"github.com/hpcloud/tail"
"github.com/mroote/factorio-server-manager/bootstrap"
"log"
"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
"github.com/hpcloud/tail"
)
func TailLog() ([]string, error) {

View File

@ -5,13 +5,14 @@ import (
"bytes"
"errors"
"fmt"
"github.com/mroote/factorio-server-manager/lockfile"
"io"
"io/ioutil"
"log"
"mime/multipart"
"net/http"
"path/filepath"
"github.com/OpenFactorioServerManager/factorio-server-manager/lockfile"
)
type Mods struct {

View File

@ -4,13 +4,14 @@ import (
"archive/zip"
"encoding/json"
"errors"
"github.com/mroote/factorio-server-manager/lockfile"
"io"
"io/ioutil"
"log"
"os"
"path/filepath"
"strings"
"github.com/OpenFactorioServerManager/factorio-server-manager/lockfile"
)
type ModInfoList struct {

View File

@ -2,12 +2,13 @@ package factorio
import (
"errors"
"github.com/mroote/factorio-server-manager/bootstrap"
"io"
"io/ioutil"
"log"
"os"
"path/filepath"
"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
)
type ModPackMap map[string]*ModPack

View File

@ -5,12 +5,13 @@ import (
"bytes"
"encoding/json"
"errors"
"github.com/mroote/factorio-server-manager/bootstrap"
"io/ioutil"
"log"
"os"
"path/filepath"
"strings"
"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
)
type LoginErrorResponse struct {

View File

@ -1,10 +1,11 @@
package factorio
import (
"github.com/mroote/factorio-server-manager/bootstrap"
"log"
"strconv"
"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
"github.com/majormjr/rcon"
)

View File

@ -3,12 +3,13 @@ package factorio
import (
"errors"
"fmt"
"github.com/mroote/factorio-server-manager/bootstrap"
"log"
"os"
"os/exec"
"path/filepath"
"time"
"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
)
type Save struct {

View File

@ -14,8 +14,8 @@ import (
"strings"
"sync"
"github.com/mroote/factorio-server-manager/api/websocket"
"github.com/mroote/factorio-server-manager/bootstrap"
"github.com/OpenFactorioServerManager/factorio-server-manager/api/websocket"
"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
"github.com/majormjr/rcon"
)

View File

@ -1,4 +1,4 @@
module github.com/mroote/factorio-server-manager
module github.com/OpenFactorioServerManager/factorio-server-manager
go 1.13

View File

@ -5,9 +5,9 @@ import (
"net/http"
"os"
"github.com/mroote/factorio-server-manager/api"
"github.com/mroote/factorio-server-manager/bootstrap"
"github.com/mroote/factorio-server-manager/factorio"
"github.com/OpenFactorioServerManager/factorio-server-manager/api"
"github.com/OpenFactorioServerManager/factorio-server-manager/bootstrap"
"github.com/OpenFactorioServerManager/factorio-server-manager/factorio"
)
func main() {