mirrors/remark42
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace confusing name for native import/export provider

Browse Source
This commit is contained in:
Umputun
2018-12-21 20:01:03 -06:00
parent 616e4e2c1c
commit 094f4c66a1
7 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/cmd/server.go
+4 -4
View File
@@ -12,7 +12,7 @@ import (
"syscall"
"time"
"github.com/coreos/bbolt"
bolt "github.com/coreos/bbolt"
"github.com/go-pkgz/mongo"
"github.com/pkg/errors"
@@ -230,14 +230,14 @@ func (s *ServerCommand) newServerApp() (*serverApp, error) {
RemarkURL: strings.TrimSuffix(s.RemarkURL, "/"),
}
exporter := &migrator.Remark{DataStore: dataService}
exporter := &migrator.Native{DataStore: dataService}
migr := &api.Migrator{
Cache: loadingCache,
NativeImporter: &migrator.Remark{DataStore: dataService},
NativeImporter: &migrator.Native{DataStore: dataService},
DisqusImporter: &migrator.Disqus{DataStore: dataService},
WordPressImporter: &migrator.WordPress{DataStore: dataService},
NativeExported: &migrator.Remark{DataStore: dataService},
NativeExporter: &migrator.Native{DataStore: dataService},
KeyStore: adminStore,
}
backend/app/migrator/migrator.go
+1 -1
View File
@@ -52,7 +52,7 @@ func ImportComments(p ImportParams) (int, error) {
case "wordpress":
importer = &WordPress{DataStore: p.DataStore}
case "native":
importer = &Remark{DataStore: p.DataStore}
importer = &Native{DataStore: p.DataStore}
default:
return 0, errors.Errorf("unsupported import provider %s", p.Provider)
}
backend/app/migrator/remark.go → backend/app/migrator/native.go
+5 -5
View File
@@ -20,14 +20,14 @@ const (
footer = `}`
)
// Remark implements exporter and importer for internal store format
// Native implements exporter and importer for internal store format
// {"version": 1, comments:[{...}\n,{}], meta: {meta}}
type Remark struct {
type Native struct {
DataStore Store
}
// Export all comments to writer as json strings. Each comment is one string, separated by "\n"
func (r *Remark) Export(w io.Writer, siteID string) (size int, err error) {
func (r *Native) Export(w io.Writer, siteID string) (size int, err error) {
if _, err = fmt.Fprintf(w, "%s\n", header); err != nil {
return 0, err
@@ -79,7 +79,7 @@ func (r *Remark) Export(w io.Writer, siteID string) (size int, err error) {
return commentsCount, err
}
func (r *Remark) exportMeta(siteID string, w io.Writer) (err error) {
func (r *Native) exportMeta(siteID string, w io.Writer) (err error) {
if _, err = fmt.Fprintf(w, "%s", metaHeader); err != nil {
return errors.Wrap(err, "can't write meta header")
}
@@ -105,7 +105,7 @@ func (r *Remark) exportMeta(siteID string, w io.Writer) (err error) {
}
// Import comments from json strings produced by Remark.Export
func (r *Remark) Import(reader io.Reader, siteID string) (size int, err error) {
func (r *Native) Import(reader io.Reader, siteID string) (size int, err error) {
if err := r.DataStore.DeleteAll(siteID); err != nil {
return 0, err
backend/app/migrator/remark_test.go → backend/app/migrator/native_test.go
+6 -6
View File
@@ -20,13 +20,13 @@ import (
var testDb = "/tmp/test-remark.db"
func TestRemark_Export(t *testing.T) {
func TestNative_Export(t *testing.T) {
defer os.Remove(testDb)
b := prep(t) // write 2 comments
b.SetReadOnly(store.Locator{URL: "https://radio-t.com", SiteID: "radio-t"}, true)
b.SetVerified("radio-t", "user1", true)
b.SetBlock("radio-t", "user2", true, time.Hour)
r := Remark{DataStore: b}
r := Native{DataStore: b}
buf := &bytes.Buffer{}
size, err := r.Export(buf, "radio-t")
@@ -63,7 +63,7 @@ func TestRemark_Export(t *testing.T) {
assert.Equal(t, true, res.Meta.Posts[0].ReadOnly)
}
func TestRemark_Import(t *testing.T) {
func TestNative_Import(t *testing.T) {
defer os.Remove(testDb)
r1 := `{"id":"efbc17f177ee1a1c0ee6e1e025749966ec071adc","pid":"","text":"some text, <a href=\"http://radio-t.com\" rel=\"nofollow\">link</a>","user":{"name":"user name","id":"user1","picture":"","profile":"","admin":false},"locator":{"site":"radio-t","url":"https://radio-t.com"},"score":0,"votes":{},"time":"2017-12-20T15:18:22-06:00"}` + "\n"
@@ -76,7 +76,7 @@ func TestRemark_Import(t *testing.T) {
buf.WriteString("{}")
b := prep(t) // write some recs
r := Remark{DataStore: &service.DataStore{Interface: b, AdminStore: admin.NewStaticStore("12345", []string{}, "")}}
r := Native{DataStore: &service.DataStore{Interface: b, AdminStore: admin.NewStaticStore("12345", []string{}, "")}}
size, err := r.Import(buf, "radio-t")
assert.Nil(t, err)
assert.Equal(t, 2, size)
@@ -97,7 +97,7 @@ func TestRemark_Import(t *testing.T) {
assert.Equal(t, 2, size)
}
func TestRemark_ImportManyWithError(t *testing.T) {
func TestNative_ImportManyWithError(t *testing.T) {
defer os.Remove(testDb)
goodRec := `{"id":"%d","pid":"","text":"some text, <a href=\"http://radio-t.com\" rel=\"nofollow\">link</a>","user":{"name":"user name","id":"user1","picture":"","profile":"","admin":false},"locator":{"site":"radio-t","url":"https://radio-t.com"},"score":0,"votes":{},"time":"2017-12-20T15:18:22-06:00"}` + "\n"
@@ -110,7 +110,7 @@ func TestRemark_ImportManyWithError(t *testing.T) {
buf.WriteString("bad2\n")
b := prep(t) // write some recs
r := Remark{DataStore: &service.DataStore{Interface: b, AdminStore: admin.NewStaticStore("12345", []string{}, "")}}
r := Native{DataStore: &service.DataStore{Interface: b, AdminStore: admin.NewStaticStore("12345", []string{}, "")}}
n, err := r.Import(buf, "radio-t")
assert.EqualError(t, err, "failed to save 2 comments")
assert.Equal(t, 1200, n)
backend/app/rest/api/migrator.go
+2 -2
View File
@@ -27,7 +27,7 @@ type Migrator struct {
NativeImporter migrator.Importer
DisqusImporter migrator.Importer
WordPressImporter migrator.Importer
NativeExported migrator.Exporter
NativeExporter migrator.Exporter
KeyStore KeyStore
busy map[string]bool
@@ -153,7 +153,7 @@ func (m *Migrator) exportCtrl(w http.ResponseWriter, r *http.Request) {
writer = gzWriter
}
if _, err := m.NativeExported.Export(writer, siteID); err != nil {
if _, err := m.NativeExporter.Export(writer, siteID); err != nil {
rest.SendErrorJSON(w, r, http.StatusInternalServerError, err, "export failed")
return
}
backend/app/rest/api/migrator_test.go
+2 -2
View File
@@ -267,8 +267,8 @@ func prepImportSrv(t *testing.T) (svc *Migrator, ds *service.DataStore, ts *http
svc = &Migrator{
DisqusImporter: &migrator.Disqus{DataStore: dataStore},
WordPressImporter: &migrator.WordPress{DataStore: dataStore},
NativeImporter: &migrator.Remark{DataStore: dataStore},
NativeExported: &migrator.Remark{DataStore: dataStore},
NativeImporter: &migrator.Native{DataStore: dataStore},
NativeExporter: &migrator.Native{DataStore: dataStore},
Cache: &cache.Nop{},
KeyStore: adminStore,
}
backend/app/rest/api/rest_test.go
+3 -3
View File
@@ -12,7 +12,7 @@ import (
"testing"
"time"
"github.com/coreos/bbolt"
bolt "github.com/coreos/bbolt"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -209,8 +209,8 @@ func prep(t *testing.T) (srv *Rest, ts *httptest.Server) {
Migrator: &Migrator{
DisqusImporter: &migrator.Disqus{DataStore: dataStore},
WordPressImporter: &migrator.WordPress{DataStore: dataStore},
NativeImporter: &migrator.Remark{DataStore: dataStore},
NativeExported: &migrator.Remark{DataStore: dataStore},
NativeImporter: &migrator.Native{DataStore: dataStore},
NativeExporter: &migrator.Native{DataStore: dataStore},
Cache: &cache.Nop{},
KeyStore: adminStore,
},