From f7ac0ea242fee3bc51413da34c46d68e0199e14b Mon Sep 17 00:00:00 2001
From: Chris Li <chris@kiwix.org>
Date: Sun, 11 Sep 2016 10:51:24 -0400
Subject: [PATCH] Coredata def modenerization

---
 Kiwix-iOS/Info.plist                          |  2 +-
 Kiwix-iOSWidgets/Bookmarks/Info.plist         |  2 +-
 .../Classes/Book+CoreDataProperties.swift     |  8 +++--
 .../Classes/Language+CoreDataProperties.swift |  1 +
 .../1.8.xcdatamodel/contents                  | 29 ++++---------------
 5 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist
index cf6bc8d4..5b147915 100644
--- a/Kiwix-iOS/Info.plist
+++ b/Kiwix-iOS/Info.plist
@@ -49,7 +49,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.8.60</string>
+	<string>1.8.61</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist
index d73c6d88..6c4c2b1b 100644
--- a/Kiwix-iOSWidgets/Bookmarks/Info.plist
+++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.8.62</string>
+	<string>1.8.63</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>
diff --git a/Kiwix/CoreData/Classes/Book+CoreDataProperties.swift b/Kiwix/CoreData/Classes/Book+CoreDataProperties.swift
index 95e76667..e53127f2 100644
--- a/Kiwix/CoreData/Classes/Book+CoreDataProperties.swift
+++ b/Kiwix/CoreData/Classes/Book+CoreDataProperties.swift
@@ -21,15 +21,17 @@ extension Book {
     @NSManaged var favIcon: NSData?
     @NSManaged var fileSize: Int64
     @NSManaged var globalCount: Int64
-    @NSManaged var id: String
-    @NSManaged var isLocal: NSNumber?
-    @NSManaged var hasPic: Bool
     @NSManaged var hasIndex: Bool
+    @NSManaged var hasPic: Bool
+    @NSManaged var id: String
     @NSManaged var includeInSearch: Bool
+    @NSManaged var isLocal: NSNumber?
     @NSManaged var mediaCount: Int64
     @NSManaged var meta4URL: String?
+    @NSManaged var pid: String?
     @NSManaged var publisher: String?
     @NSManaged var title: String?
+    
     @NSManaged var articles: Set<Article>
     @NSManaged var downloadTask: DownloadTask?
     @NSManaged var language: Language?
diff --git a/Kiwix/CoreData/Classes/Language+CoreDataProperties.swift b/Kiwix/CoreData/Classes/Language+CoreDataProperties.swift
index 522be34d..43bf7f83 100644
--- a/Kiwix/CoreData/Classes/Language+CoreDataProperties.swift
+++ b/Kiwix/CoreData/Classes/Language+CoreDataProperties.swift
@@ -17,6 +17,7 @@ extension Language {
     @NSManaged var code: String
     @NSManaged var isDisplayed: Bool
     @NSManaged var name: String?
+    
     @NSManaged var books: Set<Book>
 
 }
diff --git a/Kiwix/CoreData/Kiwix.xcdatamodeld/1.8.xcdatamodel/contents b/Kiwix/CoreData/Kiwix.xcdatamodeld/1.8.xcdatamodel/contents
index 1b4ee47e..1b663afa 100644
--- a/Kiwix/CoreData/Kiwix.xcdatamodeld/1.8.xcdatamodel/contents
+++ b/Kiwix/CoreData/Kiwix.xcdatamodeld/1.8.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="11232" systemVersion="16A319" minimumToolsVersion="Xcode 7.3" sourceLanguage="Swift" userDefinedModelVersionIdentifier="1.8">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11232" systemVersion="16A319" minimumToolsVersion="Xcode 7.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="1.8">
     <entity name="Article" representedClassName=".Article" syncable="YES">
         <attribute name="bookmarkDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="isBookmarked" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
@@ -33,7 +33,7 @@
         <attribute name="globalCount" optional="YES" attributeType="Integer 64" minValueString="0" defaultValueString="0" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="hasIndex" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="hasPic" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
-        <attribute name="id" attributeType="String" defaultValueString="Unknown" syncable="YES"/>
+        <attribute name="id" attributeType="String" syncable="YES"/>
         <attribute name="includeInSearch" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="isLocal" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="mediaCount" optional="YES" attributeType="Integer 64" minValueString="0" defaultValueString="0" usesScalarValueType="YES" syncable="YES"/>
@@ -42,7 +42,6 @@
         <attribute name="publisher" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="title" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
         <relationship name="articles" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="Article" inverseName="book" inverseEntity="Article" syncable="YES"/>
-        <relationship name="cachedResponses" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="Response" inverseName="book" inverseEntity="Response" syncable="YES"/>
         <relationship name="downloadTask" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="DownloadTask" inverseName="book" inverseEntity="DownloadTask" syncable="YES"/>
         <relationship name="language" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Language" inverseName="books" inverseEntity="Language" syncable="YES"/>
         <compoundIndexes>
@@ -86,33 +85,15 @@
             </uniquenessConstraint>
         </uniquenessConstraints>
     </entity>
-    <entity name="Response" syncable="YES">
-        <attribute name="data" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="encoding" attributeType="String" syncable="YES"/>
-        <attribute name="mime" attributeType="String" syncable="YES"/>
-        <attribute name="url" attributeType="String" syncable="YES"/>
-        <relationship name="book" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Book" inverseName="cachedResponses" inverseEntity="Book" syncable="YES"/>
-        <compoundIndexes>
-            <compoundIndex>
-                <index value="url"/>
-            </compoundIndex>
-        </compoundIndexes>
-        <uniquenessConstraints>
-            <uniquenessConstraint>
-                <constraint value="url"/>
-            </uniquenessConstraint>
-        </uniquenessConstraints>
-    </entity>
     <entity name="Tag" representedClassName=".Tag" syncable="YES">
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
         <relationship name="articles" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Article" inverseName="tags" inverseEntity="Article" syncable="YES"/>
     </entity>
     <elements>
         <element name="Article" positionX="-657" positionY="-153" width="128" height="208"/>
-        <element name="Book" positionX="-947" positionY="-142" width="128" height="358"/>
-        <element name="DownloadTask" positionX="-657" positionY="273" width="128" height="105"/>
-        <element name="Language" positionX="-938" positionY="288" width="128" height="103"/>
-        <element name="Response" positionX="-657" positionY="72" width="128" height="118"/>
+        <element name="Book" positionX="-947" positionY="-142" width="128" height="345"/>
+        <element name="DownloadTask" positionX="-657" positionY="90" width="128" height="105"/>
+        <element name="Language" positionX="-657" positionY="216" width="128" height="103"/>
         <element name="Tag" positionX="-425" positionY="-18" width="128" height="73"/>
     </elements>
 </model>
\ No newline at end of file