Added more AppleScript ITDebug logs

[MenuTunes.git] / MainController.m

diff --git a/MainController.m b/MainController.m
index a543288..c889234 100755 (executable)
--- a/MainController.m
+++ b/MainController.m
@@ -36,7 +36,6 @@
 
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;
 
 @interface MainController(Private)
 - (ITMTRemote *)loadRemote;

-- (void)timerUpdate;

 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;
 - (void)setLatestSongIdentifier:(NSString *)newIdentifier;
 - (void)applicationLaunched:(NSNotification *)note;
 - (void)applicationTerminated:(NSNotification *)note;


@@ -214,7 +213,7 @@ static MainController *sharedController;
     globalPrefs = [[df persistentDomainForName:@".GlobalPreferences"] mutableCopy];
     if (date) {
         [globalPrefs setObject:date forKey:@"ITMTTrialStart"];
     globalPrefs = [[df persistentDomainForName:@".GlobalPreferences"] mutableCopy];
     if (date) {
         [globalPrefs setObject:date forKey:@"ITMTTrialStart"];

-        [globalPrefs setObject:[NSNumber numberWithInt:1200] forKey:@"ITMTTrialVers"];
+        [globalPrefs setObject:[NSNumber numberWithInt:MT_CURRENT_VERSION] forKey:@"ITMTTrialVers"];

     } else {
         [globalPrefs removeObjectForKey:@"ITMTTrialStart"];
         [globalPrefs removeObjectForKey:@"ITMTTrialVers"];
     } else {
         [globalPrefs removeObjectForKey:@"ITMTTrialStart"];
         [globalPrefs removeObjectForKey:@"ITMTTrialVers"];


@@ -236,14 +235,14 @@ static MainController *sharedController;
     if (![self blingBling]) {
         if ( (! [self getBlingTime] ) || ([now timeIntervalSinceDate:[self getBlingTime]] < 0) ) {
             [self setBlingTime:now];
     if (![self blingBling]) {
         if ( (! [self getBlingTime] ) || ([now timeIntervalSinceDate:[self getBlingTime]] < 0) ) {
             [self setBlingTime:now];

-        } else if ([[[df persistentDomainForName:@".GlobalPreferences"] objectForKey:@"ITMTTrialVers"] intValue] < 1200) {
+        } else if ([[[df persistentDomainForName:@".GlobalPreferences"] objectForKey:@"ITMTTrialVers"] intValue] < MT_CURRENT_VERSION) {

             if ([now timeIntervalSinceDate:[self getBlingTime]] >= 345600) {
                 [self setBlingTime:[now addTimeInterval:-259200]];
             } else {
                 NSMutableDictionary *globalPrefs;
                 [df synchronize];
                 globalPrefs = [[df persistentDomainForName:@".GlobalPreferences"] mutableCopy];
             if ([now timeIntervalSinceDate:[self getBlingTime]] >= 345600) {
                 [self setBlingTime:[now addTimeInterval:-259200]];
             } else {
                 NSMutableDictionary *globalPrefs;
                 [df synchronize];
                 globalPrefs = [[df persistentDomainForName:@".GlobalPreferences"] mutableCopy];

-                [globalPrefs setObject:[NSNumber numberWithInt:1200] forKey:@"ITMTTrialVers"];
+                [globalPrefs setObject:[NSNumber numberWithInt:MT_CURRENT_VERSION] forKey:@"ITMTTrialVers"];

                 [df setPersistentDomain:globalPrefs forName:@".GlobalPreferences"];
                 [df synchronize];
                 [globalPrefs release];
                 [df setPersistentDomain:globalPrefs forName:@".GlobalPreferences"];
                 [df synchronize];
                 [globalPrefs release];


@@ -349,9 +348,11 @@ static MainController *sharedController;
             NSArray *scripts = [[NSFileManager defaultManager] directoryContentsAtPath:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]];
             NSEnumerator *scriptsEnum = [scripts objectEnumerator];
             NSString *nextScript;
             NSArray *scripts = [[NSFileManager defaultManager] directoryContentsAtPath:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"]];
             NSEnumerator *scriptsEnum = [scripts objectEnumerator];
             NSString *nextScript;

+            ITDebugLog(@"Running AppleScripts for song change.");

             while ( (nextScript = [scriptsEnum nextObject]) ) {
                 NSDictionary *error;
                 NSAppleScript *currentScript = [[NSAppleScript alloc] initWithContentsOfURL:[NSURL fileURLWithPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] stringByAppendingPathComponent:nextScript]] error:&error];
             while ( (nextScript = [scriptsEnum nextObject]) ) {
                 NSDictionary *error;
                 NSAppleScript *currentScript = [[NSAppleScript alloc] initWithContentsOfURL:[NSURL fileURLWithPath:[[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/MenuTunes/Scripts"] stringByAppendingPathComponent:nextScript]] error:&error];

+                NSLog(@"Running script: %@", nextScript);

                 if (!currentScript || ![currentScript executeAndReturnError:nil]) {
                     ITDebugLog(@"Error running script %@.", nextScript);
                 }
                 if (!currentScript || ![currentScript executeAndReturnError:nil]) {
                     ITDebugLog(@"Error running script %@.", nextScript);
                 }


@@ -1231,4 +1232,4 @@ static MainController *sharedController;
     [super dealloc];
 }
 
     [super dealloc];
 }
 

-@end
\ No newline at end of file
+@end