Merge

README.md

@@ -9,10 +9,6 @@ Trakt Scrobbler for iTunes/AppleTV. Download a binary version [here](http://w3f.
 
 Any feedback or bug reports are welcome. Please use the [`issues`](https://github.com/yo-han/Traktable/issues) page or the feedback option in the app to report your feedback.
 
-## Install
-
-Rename config-example.plist to config.plist and enter a tvdb and trakt api key.
-
 ## Changelog
 
 See what's new in the [changelog](https://github.com/yo-han/Traktable/wiki/Changelog)

Traktable/AppDelegate.m

@@ -110,6 +110,8 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
     [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(VLCPlayerStateDidChange) name:@"VLCPlayerStateDidChange" object:nil suspensionBehavior:NSNotificationSuspensionBehaviorCoalesce];
 
     [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(iTunesSourceSaved:) name:@"com.apple.iTunes.sourceSaved" object:@"com.apple.iTunes.sources" suspensionBehavior:NSNotificationSuspensionBehaviorCoalesce];
+
+    [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(iTunesSourceSaved:) name:@"com.apple.iTunes.sourceInfo" object:@"com.apple.iTunes.sources" suspensionBehavior:NSNotificationSuspensionBehaviorCoalesce];
 }
 
 - (IBAction)showLog:(id)sender {

Traktable/ITLibrary.m

@@ -19,6 +19,10 @@ @interface ITLibrary()
 
 - (id)init;
 - (void)checkTracks:(NSArray *)tracks;
+<<<<<<< HEAD
+=======
+- (void)createDir:(NSString *)dir;
+>>>>>>> 36d3320923f18ac9a8d3e894293a6ad9602a8cdb
 
 @property dispatch_queue_t queue;
 @property dispatch_group_t dispatchGroup;
@@ -28,6 +32,10 @@ - (void)checkTracks:(NSArray *)tracks;
 @implementation ITLibrary
 
 @synthesize iTunesBridge;
+<<<<<<< HEAD
+=======
+@synthesize dbQueue=_dbQueue;
+>>>>>>> 36d3320923f18ac9a8d3e894293a6ad9602a8cdb
 @synthesize dbFilePath;
 @synthesize firstImport;
 
@@ -36,7 +44,19 @@ - (id)init {
     self = [super init];
 	if (self) {
 
+<<<<<<< HEAD
         iTunesBridge = [SBApplication applicationWithBundleIdentifier:@"com.apple.iTunes"];
+=======
+        [self resetDb];
+    }
+
+    _dbQueue = [FMDatabaseQueue databaseQueueWithPath:dbFilePath];
+    _queue = dispatch_queue_create("traktable.sync.queue", NULL);
+    _dispatchGroup = dispatch_group_create();
+
+    [self.dbQueue inDatabase:^(FMDatabase *db) {
+        FMResultSet *s = [db executeQuery:@"SELECT playedCount FROM library"];
+>>>>>>> 36d3320923f18ac9a8d3e894293a6ad9602a8cdb
 
         NSString *appSupportPath = [ITConstants applicationSupportFolder];
         [ITUtil createDir:appSupportPath];
@@ -151,6 +171,7 @@ - (void)syncLibrary {
     NSArray *shows = [self getVideos:iTunesESpKTVShows noCheck:NO];
 
     firstImport = NO;
+
     [self checkTracks:movies];
     [self checkTracks:shows];
 
@@ -160,6 +181,7 @@ - (void)syncLibrary {
 - (void)checkTracks:(NSArray *)tracks {
 
     __block NSMutableArray *seenVideos = [NSMutableArray array];
+
     ITVideo *video = [ITVideo new];
     ITApi *api = [ITApi new];
 
@@ -246,9 +268,8 @@ - (void)checkTracks:(NSArray *)tracks {
 
     }
 
-
     dispatch_group_notify(self.dispatchGroup, self.queue, ^{
-        
+
         if([seenVideos count] > 0)
             [api seen:seenVideos type:iTunesEVdKMovie video:nil];
     });