Skip to content

Commit a1844ba

Browse files
BuckarooBanzayBuckarooBanzay
committed
remove/cleanup crude import/export code
1 parent 0d29ddf commit a1844ba

19 files changed

+1
-748
lines changed

‎auth/auth.go

-58
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
package auth
22

33
import (
4-
"archive/zip"
5-
"bufio"
6-
"bytes"
74
"database/sql"
8-
"encoding/json"
95
"fmt"
106
"strings"
117

@@ -153,57 +149,3 @@ func (repo *AuthRepository) DeleteAll() error {
153149
_, err := repo.db.Exec("delete from auth")
154150
return err
155151
}
156-
157-
func (repo *AuthRepository) Export(z *zip.Writer) error {
158-
w, err := z.Create("auth.json")
159-
if err != nil {
160-
return err
161-
}
162-
enc := json.NewEncoder(w)
163-
164-
rows, err := repo.db.Query("select id,name,password,last_login from auth")
165-
if err != nil {
166-
return err
167-
}
168-
defer rows.Close()
169-
170-
for rows.Next() {
171-
e := &AuthEntry{}
172-
err = rows.Scan(&e.ID, &e.Name, &e.Password, &e.LastLogin)
173-
if err != nil {
174-
return err
175-
}
176-
177-
err = enc.Encode(e)
178-
if err != nil {
179-
return err
180-
}
181-
}
182-
183-
return nil
184-
}
185-
186-
func (repo *AuthRepository) Import(z *zip.Reader) error {
187-
f, err := z.Open("auth.json")
188-
if err != nil {
189-
return err
190-
}
191-
defer f.Close()
192-
193-
sc := bufio.NewScanner(f)
194-
for sc.Scan() {
195-
dc := json.NewDecoder(bytes.NewReader(sc.Bytes()))
196-
e := &AuthEntry{}
197-
err = dc.Decode(e)
198-
if err != nil {
199-
return err
200-
}
201-
202-
_, err := repo.db.Exec("insert into auth(id,name,password,last_login) values($1,$2,$3,$4)", e.ID, e.Name, e.Password, e.LastLogin)
203-
if err != nil {
204-
return err
205-
}
206-
}
207-
208-
return nil
209-
}

‎auth/auth_test.go

-43
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package auth_test
22

33
import (
4-
"archive/zip"
5-
"bytes"
6-
"os"
74
"testing"
85

96
"github.com/minetest-go/mtdb/auth"
@@ -113,23 +110,6 @@ func testAuthRepository(t *testing.T, auth_repo *auth.AuthRepository, priv_repo
113110
assert.NoError(t, err)
114111
assert.Equal(t, 1, len(privs))
115112

116-
// export
117-
buf := bytes.NewBuffer([]byte{})
118-
w := zip.NewWriter(buf)
119-
err = auth_repo.Export(w)
120-
assert.NoError(t, err)
121-
err = priv_repo.Export(w)
122-
assert.NoError(t, err)
123-
err = w.Close()
124-
assert.NoError(t, err)
125-
zipfile, err := os.CreateTemp(os.TempDir(), "auth.zip")
126-
assert.NoError(t, err)
127-
f, err := os.Create(zipfile.Name())
128-
assert.NoError(t, err)
129-
count, err = f.Write(buf.Bytes())
130-
assert.NoError(t, err)
131-
assert.True(t, count > 0)
132-
133113
// delete priv
134114
assert.NoError(t, priv_repo.Delete(*e.ID, "interact"))
135115

@@ -138,27 +118,4 @@ func testAuthRepository(t *testing.T, auth_repo *auth.AuthRepository, priv_repo
138118

139119
// delete all
140120
assert.NoError(t, auth_repo.DeleteAll())
141-
142-
// import
143-
z, err := zip.OpenReader(zipfile.Name())
144-
assert.NoError(t, err)
145-
err = auth_repo.Import(&z.Reader)
146-
assert.NoError(t, err)
147-
err = priv_repo.Import(&z.Reader)
148-
assert.NoError(t, err)
149-
150-
// check import
151-
e, err = auth_repo.GetByUsername("test")
152-
assert.NoError(t, err)
153-
assert.NotNil(t, e)
154-
assert.Equal(t, "test", e.Name)
155-
assert.Equal(t, "blah", e.Password)
156-
assert.Equal(t, 456, e.LastLogin)
157-
assert.NotNil(t, e.ID)
158-
159-
// check imported priv
160-
privs, err = priv_repo.GetByID(*e.ID)
161-
assert.NoError(t, err)
162-
assert.Equal(t, 1, len(privs))
163-
164121
}

‎auth/user_privileges.go

-58
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
package auth
22

33
import (
4-
"archive/zip"
5-
"bufio"
6-
"bytes"
74
"database/sql"
8-
"encoding/json"
95

106
"github.com/minetest-go/mtdb/types"
117
)
@@ -50,57 +46,3 @@ func (repo *PrivRepository) Delete(id int64, privilege string) error {
5046
_, err := repo.db.Exec("delete from user_privileges where id = $1 and privilege = $2", id, privilege)
5147
return err
5248
}
53-
54-
func (repo *PrivRepository) Export(z *zip.Writer) error {
55-
w, err := z.Create("privs.json")
56-
if err != nil {
57-
return err
58-
}
59-
enc := json.NewEncoder(w)
60-
61-
rows, err := repo.db.Query("select id,privilege from user_privileges")
62-
if err != nil {
63-
return err
64-
}
65-
defer rows.Close()
66-
67-
for rows.Next() {
68-
e := &PrivilegeEntry{}
69-
err = rows.Scan(&e.ID, &e.Privilege)
70-
if err != nil {
71-
return err
72-
}
73-
74-
err = enc.Encode(e)
75-
if err != nil {
76-
return err
77-
}
78-
}
79-
80-
return nil
81-
}
82-
83-
func (repo *PrivRepository) Import(z *zip.Reader) error {
84-
f, err := z.Open("privs.json")
85-
if err != nil {
86-
return err
87-
}
88-
defer f.Close()
89-
90-
sc := bufio.NewScanner(f)
91-
for sc.Scan() {
92-
dc := json.NewDecoder(bytes.NewReader(sc.Bytes()))
93-
e := &PrivilegeEntry{}
94-
err = dc.Decode(e)
95-
if err != nil {
96-
return err
97-
}
98-
99-
_, err := repo.db.Exec("insert into user_privileges(id,privilege) values($1,$2)", e.ID, e.Privilege)
100-
if err != nil {
101-
return err
102-
}
103-
}
104-
105-
return nil
106-
}

‎block/block.go

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ func (b *Block) String() string {
3030
// All positions are in mapblock coordinates, as described here:
3131
// https://github.com/minetest/minetest/blob/master/doc/lua_api.md#mapblock-coordinates
3232
type BlockRepository interface {
33-
types.Backup
34-
3533
// GetByPost returns the map block at positions X,Y,Z.
3634
GetByPos(x, y, z int) (*Block, error)
3735

‎block/block_postgres.go

-59
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
package block
22

33
import (
4-
"archive/zip"
5-
"bufio"
6-
"bytes"
74
"database/sql"
85

9-
"encoding/json"
10-
116
"github.com/minetest-go/mtdb/types"
127
"github.com/sirupsen/logrus"
138
)
@@ -141,60 +136,6 @@ func (repo *postgresBlockRepository) Count() (int64, error) {
141136
return count, err
142137
}
143138

144-
func (r *postgresBlockRepository) Export(z *zip.Writer) error {
145-
w, err := z.Create("blocks.json")
146-
if err != nil {
147-
return err
148-
}
149-
enc := json.NewEncoder(w)
150-
151-
rows, err := r.db.Query("select posX,posY,posZ,data from blocks")
152-
if err != nil {
153-
return err
154-
}
155-
defer rows.Close()
156-
157-
for rows.Next() {
158-
block := &Block{}
159-
err = rows.Scan(&block.PosX, &block.PosY, &block.PosZ, &block.Data)
160-
if err != nil {
161-
return err
162-
}
163-
164-
err = enc.Encode(block)
165-
if err != nil {
166-
return err
167-
}
168-
}
169-
170-
return nil
171-
}
172-
173-
func (r *postgresBlockRepository) Import(z *zip.Reader) error {
174-
f, err := z.Open("blocks.json")
175-
if err != nil {
176-
return err
177-
}
178-
defer f.Close()
179-
180-
sc := bufio.NewScanner(f)
181-
for sc.Scan() {
182-
dc := json.NewDecoder(bytes.NewReader(sc.Bytes()))
183-
e := &Block{}
184-
err = dc.Decode(e)
185-
if err != nil {
186-
return err
187-
}
188-
189-
err = r.Update(e)
190-
if err != nil {
191-
return err
192-
}
193-
}
194-
195-
return nil
196-
}
197-
198139
func (r *postgresBlockRepository) Close() error {
199140
return r.db.Close()
200141
}

‎block/block_sqlite.go

-64
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
package block
22

33
import (
4-
"archive/zip"
5-
"bufio"
6-
"bytes"
74
"database/sql"
8-
"encoding/json"
95

106
"github.com/minetest-go/mtdb/types"
117
"github.com/sirupsen/logrus"
@@ -154,66 +150,6 @@ func (repo *sqliteBlockRepository) Count() (int64, error) {
154150
return count, err
155151
}
156152

157-
func (r *sqliteBlockRepository) Export(z *zip.Writer) error {
158-
w, err := z.Create("blocks.json")
159-
if err != nil {
160-
return err
161-
}
162-
enc := json.NewEncoder(w)
163-
164-
rows, err := r.db.Query("select pos from blocks")
165-
if err != nil {
166-
return err
167-
}
168-
defer rows.Close()
169-
170-
for rows.Next() {
171-
var pos int64
172-
err = rows.Scan(&pos)
173-
if err != nil {
174-
return err
175-
}
176-
177-
x, y, z := PlainToCoord(pos)
178-
block, err := r.GetByPos(x, y, z)
179-
if err != nil {
180-
return err
181-
}
182-
183-
err = enc.Encode(block)
184-
if err != nil {
185-
return err
186-
}
187-
}
188-
189-
return nil
190-
}
191-
192-
func (r *sqliteBlockRepository) Import(z *zip.Reader) error {
193-
f, err := z.Open("blocks.json")
194-
if err != nil {
195-
return err
196-
}
197-
defer f.Close()
198-
199-
sc := bufio.NewScanner(f)
200-
for sc.Scan() {
201-
dc := json.NewDecoder(bytes.NewReader(sc.Bytes()))
202-
e := &Block{}
203-
err = dc.Decode(e)
204-
if err != nil {
205-
return err
206-
}
207-
208-
err = r.Update(e)
209-
if err != nil {
210-
return err
211-
}
212-
}
213-
214-
return nil
215-
}
216-
217153
func (r *sqliteBlockRepository) Close() error {
218154
return r.db.Close()
219155
}

0 commit comments

Comments
 (0)