Add children

9 files changed, 25 insertions, 43 deletions

diff --git a/QSThingsPlugin/Parsers/QSThingsAppSectionsParser.m b/QSThingsPlugin/Parsers/QSThingsAppSectionsParser.m
index 70a37ae..472a8fa 100644
--- a/QSThingsPlugin/Parsers/QSThingsAppSectionsParser.m
+++ b/QSThingsPlugin/Parsers/QSThingsAppSectionsParser.m
@@ -11,12 +11,14 @@
 // confirm that this makes sense.
 - (NSArray *)objectsFromPath:(NSString *)path withSettings:(NSDictionary *)settings {
   NSMutableArray *objects = [NSMutableArray array];
+  NSDictionary *dictionary = @{@"path": path};
   
   // Inbox
   QSObject *inbox = [QSObject
       makeObjectWithIdentifier: ThingsAppSectionKeyInbox];
   [inbox setName:@"Inbox"];
   [inbox setPrimaryType:kAppSectionType];
+  [inbox setObject:[dictionary copy] forType:kAppSectionType];
   [objects addObject:inbox];
 
   // Today
@@ -24,6 +26,7 @@
       makeObjectWithIdentifier: ThingsAppSectionKeyToday];
   [today setName:@"Today"];
   [today setPrimaryType:kAppSectionType];
+  [today setObject:[dictionary copy] forType:kAppSectionType];
   [objects addObject:today];
   
   // Upcoming
@@ -31,6 +34,7 @@
       makeObjectWithIdentifier: ThingsAppSectionKeyUpcoming];
   [upcoming setName:@"Upcoming"];
   [upcoming setPrimaryType:kAppSectionType];
+  [upcoming setObject:[dictionary copy] forType:kAppSectionType];
   [objects addObject:upcoming];
   
   // Anytime
@@ -38,6 +42,7 @@
       makeObjectWithIdentifier: ThingsAppSectionKeyAnytime];
   [anytime setName:@"Anytime"];
   [anytime setPrimaryType:kAppSectionType];
+  [anytime setObject:[dictionary copy] forType:kAppSectionType];
   [objects addObject:anytime];
   
   // Anytime
@@ -45,6 +50,7 @@
       makeObjectWithIdentifier: ThingsAppSectionKeySomeday];
   [someday setName:@"Someday"];
   [someday setPrimaryType:kAppSectionType];
+  [someday setObject:[dictionary copy] forType:kAppSectionType];
   [objects addObject:someday];
 
   return objects;
diff --git a/QSThingsPlugin/Parsers/QSThingsAreasParser.h b/QSThingsPlugin/Parsers/QSThingsAreasParser.h
index 74f829b..25601b7 100644
--- a/QSThingsPlugin/Parsers/QSThingsAreasParser.h
+++ b/QSThingsPlugin/Parsers/QSThingsAreasParser.h
@@ -1,3 +1,7 @@
+#import "Constants.h"
+#import "SQLHelper.h"
+#import "ObjectHelper.h"
+
 @interface QSThingsAreasParser : QSParser
 {
 }
diff --git a/QSThingsPlugin/Parsers/QSThingsAreasParser.m b/QSThingsPlugin/Parsers/QSThingsAreasParser.m
index f147603..ca5e19f 100644
--- a/QSThingsPlugin/Parsers/QSThingsAreasParser.m
+++ b/QSThingsPlugin/Parsers/QSThingsAreasParser.m
@@ -1,6 +1,4 @@
-#import "Constants.h"
 #import "QSThingsAreasParser.h"
-#import "SQLHelper.h"
 
 @implementation QSThingsAreasParser
 - (BOOL)validParserForPath:(NSString *)path {
@@ -18,14 +16,7 @@
   
   NSMutableArray *objects = [NSMutableArray array];
   [results enumerateObjectsUsingBlock:^(NSDictionary *dictionary, NSUInteger i, BOOL *stop) {
-    
-    QSObject *newObject = [QSObject
-        makeObjectWithIdentifier:[dictionary objectForKey:@"uuid"]];
-    [newObject setObject:dictionary forType:kAreaType];
-    [newObject setName:[dictionary objectForKey:@"title"]];
-    [newObject setPrimaryType:kAreaType];
-    
-    [objects addObject:newObject];
+    [objects addObject:[ObjectHelper areaFromSQLResult:dictionary usingPath:path ]];
   }];
   
   return objects;
diff --git a/QSThingsPlugin/Parsers/QSThingsProjectsParser.h b/QSThingsPlugin/Parsers/QSThingsProjectsParser.h
index cee939d..0892fa1 100644
--- a/QSThingsPlugin/Parsers/QSThingsProjectsParser.h
+++ b/QSThingsPlugin/Parsers/QSThingsProjectsParser.h
@@ -1,3 +1,7 @@
+#import "Constants.h"
+#import "SQLHelper.h"
+#import "ObjectHelper.h"
+
 @interface QSThingsProjectsParser : QSParser
 {
 }
diff --git a/QSThingsPlugin/Parsers/QSThingsProjectsParser.m b/QSThingsPlugin/Parsers/QSThingsProjectsParser.m
index 1a7956e..b59a420 100644
--- a/QSThingsPlugin/Parsers/QSThingsProjectsParser.m
+++ b/QSThingsPlugin/Parsers/QSThingsProjectsParser.m
@@ -1,6 +1,4 @@
-#import "Constants.h"
 #import "QSThingsProjectsParser.h"
-#import "SQLHelper.h"
 
 @implementation QSThingsProjectsParser
 - (BOOL)validParserForPath:(NSString *)path {
@@ -26,15 +24,7 @@
   
   NSMutableArray *objects = [NSMutableArray array];
   [results enumerateObjectsUsingBlock:^(NSDictionary *dictionary, NSUInteger i, BOOL *stop) {
-    
-    QSObject *newObject = [QSObject
-        makeObjectWithIdentifier:[dictionary objectForKey:@"uuid"]];
-    [newObject setObject:dictionary forType:kProjectType];
-    [newObject setName:[dictionary objectForKey:@"title"]];
-    [newObject setDetails:[dictionary objectForKey:@"notes"]];
-    [newObject setPrimaryType:kProjectType];
-    
-    [objects addObject:newObject];
+    [objects addObject:[ObjectHelper projectFromSQLResult:dictionary usingPath:path ]];
   }];
   
   return objects;
diff --git a/QSThingsPlugin/Parsers/QSThingsTagsParser.h b/QSThingsPlugin/Parsers/QSThingsTagsParser.h
index d57aac1..ed78ec9 100644
--- a/QSThingsPlugin/Parsers/QSThingsTagsParser.h
+++ b/QSThingsPlugin/Parsers/QSThingsTagsParser.h
@@ -1,3 +1,7 @@
+#import "Constants.h"
+#import "SQLHelper.h"
+#import "ObjectHelper.h"
+
 @interface QSThingsTagsParser : QSParser
 {
 }
diff --git a/QSThingsPlugin/Parsers/QSThingsTagsParser.m b/QSThingsPlugin/Parsers/QSThingsTagsParser.m
index 4a81de3..04202b0 100644
--- a/QSThingsPlugin/Parsers/QSThingsTagsParser.m
+++ b/QSThingsPlugin/Parsers/QSThingsTagsParser.m
@@ -1,6 +1,4 @@
-#import "Constants.h"
 #import "QSThingsTagsParser.h"
-#import "SQLHelper.h"
 
 @implementation QSThingsTagsParser
 - (BOOL)validParserForPath:(NSString *)path {
@@ -18,14 +16,7 @@
   
   NSMutableArray *objects = [NSMutableArray array];
   [results enumerateObjectsUsingBlock:^(NSDictionary *dictionary, NSUInteger i, BOOL *stop) {
-    
-    QSObject *newObject = [QSObject
-        makeObjectWithIdentifier:[dictionary objectForKey:@"uuid"]];
-    [newObject setObject:dictionary forType:kTagType];
-    [newObject setName:[dictionary objectForKey:@"title"]];
-    [newObject setPrimaryType:kTagType];
-    
-    [objects addObject:newObject];
+    [objects addObject:[ObjectHelper tagFromSQLResult:dictionary usingPath:path ]];
   }];
   
   return objects;
diff --git a/QSThingsPlugin/Parsers/QSThingsTasksParser.h b/QSThingsPlugin/Parsers/QSThingsTasksParser.h
index 7e3f1f2..50e8f05 100644
--- a/QSThingsPlugin/Parsers/QSThingsTasksParser.h
+++ b/QSThingsPlugin/Parsers/QSThingsTasksParser.h
@@ -1,3 +1,6 @@
+#import "Constants.h"
+#import "SQLHelper.h"
+#import "ObjectHelper.h"
 @interface QSThingsTasksParser : QSParser
 {
 }
diff --git a/QSThingsPlugin/Parsers/QSThingsTasksParser.m b/QSThingsPlugin/Parsers/QSThingsTasksParser.m
index b29d011..8f4415b 100644
--- a/QSThingsPlugin/Parsers/QSThingsTasksParser.m
+++ b/QSThingsPlugin/Parsers/QSThingsTasksParser.m
@@ -1,7 +1,4 @@
-#import "Constants.h"
 #import "QSThingsTasksParser.h"
-#import "SQLHelper.h"
-#import <os/log.h>
 
 @implementation QSThingsTasksParser
 - (BOOL)validParserForPath:(NSString *)path {
@@ -27,15 +24,7 @@
   
   NSMutableArray *objects = [NSMutableArray array];
   [results enumerateObjectsUsingBlock:^(NSDictionary *dictionary, NSUInteger i, BOOL *stop) {
-    
-    QSObject *newObject = [QSObject
-        makeObjectWithIdentifier:[dictionary objectForKey:@"uuid"]];
-    [newObject setObject:dictionary forType:kTaskType];
-    [newObject setName:[dictionary objectForKey:@"title"]];
-    [newObject setDetails:[dictionary objectForKey:@"notes"]];
-    [newObject setPrimaryType:kTaskType];
-    
-    [objects addObject:newObject];
+    [objects addObject:[ObjectHelper taskFromSQLResult:dictionary usingPath:path ]];
   }];
   
   return objects;