Skip to content

Commit 87c33dd

Browse files
committed
testing for pmg2.0
1 parent 7dedfee commit 87c33dd

File tree

10 files changed

+41
-686
lines changed

10 files changed

+41
-686
lines changed

commands/exp/app_v2_0/api.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func PerformExport(
2727

2828
results, err := database.GetUsers(db)
2929
if err != nil {
30-
fmt.Fprintf(os.Stderr, "Error: %v\n", err)
30+
fmt.Fprintf(os.Stderr, "Error: GetUsers: %v\n", err)
3131
os.Exit(1)
3232
}
3333

@@ -44,14 +44,14 @@ func PerformExport(
4444

4545
models.ForEachDocument(
4646
users[i].Home,
47-
users[i].ID,
47+
users[i].LegacyID,
4848
docPages,
4949
settings.MediaRoot,
5050
models.InsertDocVersionsAndPages,
5151
)
5252
models.ForEachDocument(
5353
users[i].Inbox,
54-
users[i].ID,
54+
users[i].LegacyID,
5555
docPages,
5656
settings.MediaRoot,
5757
models.InsertDocVersionsAndPages,
@@ -65,7 +65,7 @@ func PerformExport(
6565
home := users[i].Home.GetUserDocuments()
6666
allDocs = append(allDocs, inbox...)
6767
allDocs = append(allDocs, home...)
68-
userFilePaths, err := models.GetFilePaths(allDocs, users[i].ID, settings.MediaRoot)
68+
userFilePaths, err := models.GetFilePaths(allDocs, users[i].LegacyID, settings.MediaRoot)
6969

7070
if err != nil {
7171
fmt.Fprintf(os.Stderr, "error getting file paths: %v\n", err)
@@ -88,7 +88,5 @@ func PerformExport(
8888
os.Exit(1)
8989
}
9090

91-
filePaths = append(filePaths, types.FilePath{Source: exportYaml, Dest: exportYaml})
92-
9391
return filePaths
9492
}

database/app_v2_0/api.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"net/url"
66
"strings"
77

8-
postgres_db "github.com/papermerge/pmdump/database/app_v2_0/postgres"
98
sqlite_db "github.com/papermerge/pmdump/database/app_v2_0/sqlite"
109

1110
"github.com/papermerge/pmdump/types"
@@ -39,8 +38,6 @@ func GetUsers(db *types.DBConn) (any, error) {
3938
switch db.DBType {
4039
case types.SQLite:
4140
return sqlite_db.GetUsers(db.DB)
42-
case types.Postgres:
43-
return postgres_db.GetUsers(db.DB)
4441
}
4542

4643
return nil, fmt.Errorf("database GetUsers: db type %q not supported", db.DBType)
@@ -50,8 +47,6 @@ func GetHomeFlatNodes(db *types.DBConn, user_id interface{}) (interface{}, error
5047
switch db.DBType {
5148
case types.SQLite:
5249
return sqlite_db.GetHomeFlatNodes(db.DB, user_id)
53-
case types.Postgres:
54-
return postgres_db.GetHomeFlatNodes(db.DB, user_id)
5550
}
5651

5752
return nil, fmt.Errorf("database GetHomeFlatNodes: db type %q not supported", db.DBType)
@@ -61,8 +56,6 @@ func GetInboxFlatNodes(db *types.DBConn, user_id interface{}) (interface{}, erro
6156
switch db.DBType {
6257
case types.SQLite:
6358
return sqlite_db.GetInboxFlatNodes(db.DB, user_id)
64-
case types.Postgres:
65-
return postgres_db.GetInboxFlatNodes(db.DB, user_id)
6659
}
6760

6861
err := fmt.Errorf(
@@ -77,8 +70,6 @@ func GetUserNodes(db *types.DBConn, user *any) error {
7770
switch db.DBType {
7871
case types.SQLite:
7972
return sqlite_db.GetUserNodes(db.DB, user)
80-
case types.Postgres:
81-
return postgres_db.GetUserNodes(db.DB, user)
8273
}
8374

8475
return fmt.Errorf(
@@ -91,8 +82,6 @@ func GetDocumentPageRows(db *types.DBConn, user_id interface{}) (interface{}, er
9182
switch db.DBType {
9283
case types.SQLite:
9384
return sqlite_db.GetDocumentPageRows(db.DB, user_id)
94-
case types.Postgres:
95-
return postgres_db.GetDocumentPageRows(db.DB, user_id)
9685
}
9786

9887
err := fmt.Errorf(

0 commit comments

Comments
 (0)