exp for 2.0 works!

Author: ciur

commands/exp/app_v2_0/api.go

@@ -35,7 +35,7 @@ func PerformExport(
 
 	for i := 0; i < len(users); i++ {
 		database.GetUserNodes(db, &users[i])
-		results, err := database.GetDocumentPageRows(db, users[i].ID)
+		results, err := database.GetDocumentPageRows(db, users[i].LegacyID)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error getting GetDocumentPageRows: %v", err)
 		}

database/app_v2_0/sqlite/nodes.go

@@ -169,14 +169,16 @@ func GetUserNodes(db *sql.DB, u *any) error {
 
 	user.Inbox = &models.Node{
 		Title:    "inbox",
+		ID:       uuid.New(),
 		NodeType: models.FolderType,
 	}
 	user.Home = &models.Node{
 		Title:    "home",
+		ID:       uuid.New(),
 		NodeType: models.FolderType,
 	}
 
-	homeFlatNodes, err := GetHomeFlatNodes(db, user.ID)
+	homeFlatNodes, err := GetHomeFlatNodes(db, user.LegacyID)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error in GetHomeFlatNodes: %v\n", err)
 		os.Exit(1)
@@ -186,7 +188,7 @@ func GetUserNodes(db *sql.DB, u *any) error {
 		user.Home.Insert(node)
 	}
 
-	inboxFlatNodes, err := GetInboxFlatNodes(db, user.ID)
+	inboxFlatNodes, err := GetInboxFlatNodes(db, user.LegacyID)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error in GetInboxFlatNodes: %v\n", err)
 		os.Exit(1)

database/app_v2_0/sqlite/pages.go

@@ -36,13 +36,14 @@ func GetDocumentPageRows(db *sql.DB, user_id interface{}) ([]models.DocumentPage
 			&entry.PageLegacyID,
 			&entry.PageNumber,
 			&entry.Text,
-			&entry.DocumentID,
+			&entry.DocumentLegacyID,
 			&entry.DocumentVersion,
 		)
 		if err != nil {
 			return nil, err
 		}
 		entry.PageID = uuid.New()
+		entry.DocumentID = uuid.New()
 		entries = append(entries, entry)
 	}
 	return entries, nil

examples/source_2_0_sqlite.yaml

@@ -0,0 +1,3 @@
+app_version: 2.0
+media_root: /home/eugen/DockerCompose/linux-server-pmg-2/data/media
+database_url: sqlite:///home/eugen/DockerCompose/linux-server-pmg-2/data/papermerge.db

models/app_v2_0/api.go

@@ -25,6 +25,7 @@ func (n *Node) Insert(flatNode FlatNode) {
 			current.Children[part] = &Node{
 				Title:     part,
 				LegacyID:  flatNode.ID,
+				ID:        uuid.New(),
 				NodeType:  NodeType(flatNode.Model),
 				FileName:  flatNode.FileName,
 				PageCount: flatNode.PageCount,
@@ -77,7 +78,7 @@ func InsertDocVersionsAndPages(
 	originalDocPath := fmt.Sprintf("%s/docs/user_%d/document_%d/%s",
 		mediaRoot,
 		user_id,
-		n.ID,
+		n.LegacyID,
 		*n.FileName,
 	)
 
@@ -100,7 +101,7 @@ func InsertDocVersionsAndPages(
 		"%s/docs/user_%d/document_%d/",
 		mediaRoot,
 		user_id,
-		n.ID,
+		n.LegacyID,
 	)
 	entries, err := os.ReadDir(path)
 
@@ -183,7 +184,7 @@ func MakePages(
 		pagesPath = fmt.Sprintf("%s/results/user_%d/document_%d/pages/",
 			mediaRoot,
 			user_id,
-			n.ID,
+			n.LegacyID,
 		)
 	} else {
 		pagesPath = fmt.Sprintf("%s/results/user_%d/document_%d/v%d/pages/",
@@ -196,7 +197,7 @@ func MakePages(
 	pageFiles, err := os.ReadDir(pagesPath)
 
 	if err != nil {
-		fmt.Println("Error reading directory:", err)
+		fmt.Println("MakePages: Error reading directory:", err)
 	}
 
 	for _, pageFile := range pageFiles {
@@ -239,15 +240,15 @@ func GetFilePaths(docs []Node, user_id int, mediaRoot string) ([]types.FilePath,
 					"%s/docs/user_%d/document_%d/%s",
 					mediaRoot,
 					user_id,
-					doc.ID,
+					doc.LegacyID,
 					*doc.FileName,
 				)
 			} else {
 				source = fmt.Sprintf(
 					"%s/docs/user_%d/document_%d/v%d/%s",
 					mediaRoot,
 					user_id,
-					doc.ID,
+					doc.LegacyID,
 					docVer.Number,
 					*doc.FileName,
 				)