From 9a186ffea91d5d843c2d5d2dcde6e0a03a0b654e Mon Sep 17 00:00:00 2001
From: Riley Testut <riley@rileytestut.com>
Date: Tue, 4 Dec 2018 17:05:14 -0800
Subject: [PATCH] Changes Cheat.name to non-optional

---
 .../Model/Delta.xcdatamodeld/Delta 2.xcdatamodel/contents   | 4 ++--
 Delta/Database/Model/Machine/_Cheat.swift                   | 2 +-
 Delta/Extensions/EmulatorCore+Cheats.swift                  | 4 ++--
 Delta/Pause Menu/Cheats/CheatValidator.swift                | 6 +++++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Delta/Database/Model/Delta.xcdatamodeld/Delta 2.xcdatamodel/contents b/Delta/Database/Model/Delta.xcdatamodeld/Delta 2.xcdatamodel/contents
index 5fe9151..20648c4 100644
--- a/Delta/Database/Model/Delta.xcdatamodeld/Delta 2.xcdatamodel/contents	
+++ b/Delta/Database/Model/Delta.xcdatamodeld/Delta 2.xcdatamodel/contents	
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="14460.32" systemVersion="18A391" minimumToolsVersion="Xcode 7.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="1.0">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="14460.32" systemVersion="18B75" minimumToolsVersion="Xcode 7.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="1.0">
     <entity name="Cheat" representedClassName="Cheat" syncable="YES">
         <attribute name="code" attributeType="String" syncable="YES"/>
         <attribute name="creationDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="identifier" attributeType="String" syncable="YES"/>
         <attribute name="isEnabled" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="modifiedDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
         <attribute name="type" attributeType="Transformable" syncable="YES">
             <userInfo>
                 <entry key="attributeValueClassName" value="CheatType"/>
diff --git a/Delta/Database/Model/Machine/_Cheat.swift b/Delta/Database/Model/Machine/_Cheat.swift
index dee6f7b..1867b82 100644
--- a/Delta/Database/Model/Machine/_Cheat.swift
+++ b/Delta/Database/Model/Machine/_Cheat.swift
@@ -24,7 +24,7 @@ public class _Cheat: NSManagedObject
 
     @NSManaged public var modifiedDate: Date
 
-    @NSManaged public var name: String?
+    @NSManaged public var name: String
 
     @NSManaged public var type: CheatType
 
diff --git a/Delta/Extensions/EmulatorCore+Cheats.swift b/Delta/Extensions/EmulatorCore+Cheats.swift
index 3a15b36..54c30af 100644
--- a/Delta/Extensions/EmulatorCore+Cheats.swift
+++ b/Delta/Extensions/EmulatorCore+Cheats.swift
@@ -18,11 +18,11 @@ extension EmulatorCore
         }
         catch EmulatorCore.CheatError.invalid
         {
-            print("Invalid cheat:", cheat.name ?? "Unnamed Cheat", cheat.code)
+            print("Invalid cheat:", cheat.name, cheat.code)
         }
         catch
         {
-            print("Unknown Cheat Error:", error, cheat.name ?? "Unnamed Cheat", cheat.code)
+            print("Unknown Cheat Error:", error, cheat.name, cheat.code)
         }
     }
     
diff --git a/Delta/Pause Menu/Cheats/CheatValidator.swift b/Delta/Pause Menu/Cheats/CheatValidator.swift
index 6c38128..86d4ca9 100644
--- a/Delta/Pause Menu/Cheats/CheatValidator.swift	
+++ b/Delta/Pause Menu/Cheats/CheatValidator.swift	
@@ -16,6 +16,7 @@ extension CheatValidator
     {
         case invalidCode
         case invalidName
+        case invalidGame
         case duplicateName
         case duplicateCode
     }
@@ -28,7 +29,10 @@ struct CheatValidator
     
     func validate(_ cheat: Cheat) throws
     {
-        guard let name = cheat.name, let game = cheat.game else { throw Error.invalidName }
+        let name = cheat.name
+        guard !name.isEmpty else { throw Error.invalidName }
+        
+        guard let game = cheat.game else { throw Error.invalidGame }
         
         let code = cheat.code