Revert Schema version 14 support

It seems that JW Library has rolled back schema version 14 and exported backups now use v13 again. As mentioned in #147 (comment) it seems they change something in the data between those two version, so it's not possible to support both schema versions at the same time. Therefore, we are reverting back to version 13.
AndreasSko · Aug 15, 2023 · d99c348 · d99c348
1 parent f400981
commit d99c348
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 8 deletions.
diff --git a/model/Database_test.go b/model/Database_test.go
@@ -881,7 +881,7 @@ func Test_createEmptySQLiteDB(t *testing.T) {
 	}
 	hash := fmt.Sprintf("%x", hasher.Sum(nil))
 
-	assert.Equal(t, "78edd07c0b04212dcc2dd59be0a5d2edf91088136986378147cd8aa04cf4965c", hash)
+	assert.Equal(t, "774af7240646c49f6a55e40b6cdf681a6b04fbcf4acebdb19a6e0e2bef53d766", hash)
 }
 
 func TestDatabase_saveToNewSQLite(t *testing.T) {

diff --git a/model/data/userData.db b/model/data/userData.db
diff --git a/model/manifest.go b/model/manifest.go
@@ -15,7 +15,7 @@ import (
 )
 
 const version = 1
-const schemaVersion = 14
+const schemaVersion = 13
 
 type manifest struct {
 	CreationDate   string         `json:"creationDate"`

diff --git a/model/manifest_test.go b/model/manifest_test.go
@@ -3,7 +3,6 @@ package model
 import (
 	"fmt"
 	"io/ioutil"
-	"os"
 	"path/filepath"
 	"testing"
 	"time"
@@ -17,7 +16,7 @@ var exampleManifest = &manifest{
 		LastModifiedDate: time.Now().Format("2006-01-02T15:04:05-07:00"),
 		Hash:             "e2e09ceba668bb1ad093b2db317237451a01ae9ff435b38c840b70dc434f184f",
 		DatabaseName:     userDataFilename,
-		SchemaVersion:    14,
+		SchemaVersion:    13,
 		DeviceName:       "go-jwlm",
 	},
 	Name:    "test",
@@ -37,7 +36,7 @@ func Test_manifest_importManifest(t *testing.T) {
 			LastModifiedDate: "2020-04-09T05:47:26+02:00",
 			Hash:             "d87a67028133cc4de5536affe1b072841def95899b7f7450a5622112b4b5e63f",
 			DatabaseName:     userDataFilename,
-			SchemaVersion:    14,
+			SchemaVersion:    13,
 			DeviceName:       "iPhone",
 		},
 		Name:    "UserDataBackup_2020-04-11_iPhone",
@@ -150,7 +149,7 @@ func Test_generateManifest(t *testing.T) {
 func Test_exportManifest(t *testing.T) {
 	tmp, err := ioutil.TempDir("", "go-jwlm")
 	assert.NoError(t, err)
-	defer os.RemoveAll(tmp)
+	//defer os.RemoveAll(tmp)
 
 	path := filepath.Join(tmp, "test_manifest.json")
 	fmt.Println(path)

diff --git a/model/testdata/backup.jwlibrary b/model/testdata/backup.jwlibrary
diff --git a/model/testdata/backup_shuffled.jwlibrary b/model/testdata/backup_shuffled.jwlibrary
diff --git a/model/testdata/backup_withPlaylist.jwlibrary b/model/testdata/backup_withPlaylist.jwlibrary
diff --git a/model/testdata/manifest_correct.json b/model/testdata/manifest_correct.json
@@ -4,7 +4,7 @@
     "lastModifiedDate": "2020-04-09T05:47:26+02:00",
     "hash": "d87a67028133cc4de5536affe1b072841def95899b7f7450a5622112b4b5e63f",
     "databaseName": "userData.db",
-    "schemaVersion": 14,
+    "schemaVersion": 13,
     "deviceName": "iPhone"
   },
   "name": "UserDataBackup_2020-04-11_iPhone",

diff --git a/model/testdata/manifest_outdated.json b/model/testdata/manifest_outdated.json
@@ -4,7 +4,7 @@
     "lastModifiedDate": "2020-04-09T05:47:26+02:00",
     "hash": "d87a67028133cc4de5536affe1b072841def95899b7f7450a5622112b4b5e63f",
     "databaseName": "user_data.db",
-    "schemaVersion": 13,
+    "schemaVersion": 8,
     "deviceName": "iPhone"
   },
   "name": "UserDataBackup_2020-04-11_iPhone",