Rename core data store during migration

relikd · Oct 3, 2019 · b33791c · b33791c
1 parent 850351a
commit b33791c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/baRSS/AppHook.m b/baRSS/AppHook.m
@@ -109,7 +109,8 @@ - (void)preferencesClosed:(id)sender {
 - (NSPersistentContainer *)persistentContainer {
 	@synchronized (self) {
 		if (_persistentContainer == nil) {
-			_persistentContainer = [[NSPersistentContainer alloc] initWithName:@"DBv1"];
+			NSManagedObjectModel *mom = [NSManagedObjectModel mergedModelFromBundles:nil];
+			_persistentContainer = [[NSPersistentContainer alloc] initWithName:@"Library" managedObjectModel:mom];
 			[_persistentContainer loadPersistentStoresWithCompletionHandler:^(NSPersistentStoreDescription *storeDescription, NSError *error) {
 				if ([error inCaseLog:"Couldn't read NSPersistentContainer"])
 					abort();

diff --git a/baRSS/DBv1.xcdatamodeld/DBv1.xcdatamodel/contents b/baRSS/DBv1.xcdatamodeld/DBv1.xcdatamodel/contents
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="14460.32" systemVersion="17G8030" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="v1">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="14460.32" systemVersion="17G8030" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="v1.0.0">
     <entity name="Feed" representedClassName="Feed" syncable="YES" codeGenerationType="class">
         <attribute name="indexPath" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="link" optional="YES" attributeType="String" syncable="YES"/>

diff --git a/baRSS/Info.plist b/baRSS/Info.plist
@@ -70,7 +70,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>14344</string>
+	<string>14360</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.news</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/baRSS/container-migration.plist b/baRSS/container-migration.plist
@@ -4,7 +4,22 @@
 <dict>
 	<key>Move</key>
 	<array>
-		<string>${ApplicationSupport}/$(PRODUCT_NAME)</string>
+		<array>
+			<string>${ApplicationSupport}/$(PRODUCT_NAME)/DBv1.sqlite</string>
+			<string>${ApplicationSupport}/$(PRODUCT_NAME)/Library.sqlite</string>
+		</array>
+		<array>
+			<string>${ApplicationSupport}/$(PRODUCT_NAME)/DBv1.sqlite-shm</string>
+			<string>${ApplicationSupport}/$(PRODUCT_NAME)/Library.sqlite-shm</string>
+		</array>
+		<array>
+			<string>${ApplicationSupport}/$(PRODUCT_NAME)/DBv1.sqlite-wal</string>
+			<string>${ApplicationSupport}/$(PRODUCT_NAME)/Library.sqlite-wal</string>
+		</array>
+		<array>
+			<string>${ApplicationSupport}/$(PRODUCT_NAME)</string>
+			<string>${ApplicationSupport}/$(PRODUCT_NAME)/old_data</string>
+		</array>
 	</array>
 </dict>
 </plist>