Changeset 28 for trunk/Cocoa/Pester/Source/PSAlarm.m

Timestamp:

10/20/02 06:40:54 (22 years ago)

Author:

Nicholas Riley

Message:

Pester 1.0

File:

• trunk/Cocoa/Pester/Source/PSAlarm.m (modified) (8 diffs)

trunk/Cocoa/Pester/Source/PSAlarm.m

@@ -21 +21 @@
     [alarmMessage release]; alarmMessage = nil;
     [invalidMessage release]; invalidMessage = nil;
-    [timer release]; timer = nil;
+    [timer invalidate]; [timer release]; timer = nil;
     [super dealloc];
 }
@@ -48 +48 @@
 - (void)_validateForType:(PSAlarmType)type;
 {
+    if (alarmType == PSAlarmSet) return; // already valid
     [invalidMessage release];
     invalidMessage = nil;
@@ -72 +73 @@
 - (void)_setIntervalFromDate;
 {
-    alarmInterval = [alarmDate timeIntervalSinceNow];
+    alarmInterval = [alarmDate timeIntervalSinceNow] + 1;
     if (alarmInterval <= 0) {
         [self _invalidate: @"Please specify an alarm time in the future."];
@@ -142 +143 @@
 }
 
-- (NSDate *)date;
+- (NSCalendarDate *)date;
 {
     if (alarmType == PSAlarmInterval) [self _setDateFromInterval];
@@ -148 +149 @@
 }
 
+- (NSString *)shortDateString;
+{
+    return [[self date] descriptionWithCalendarFormat: [[NSUserDefaults standardUserDefaults] stringForKey: NSShortDateFormatString]];
+}
+
+- (NSString *)timeString;
+{
+    return [[self date] descriptionWithCalendarFormat: @"%1I:%M:%S %p"]; // XXX regular format doesn't work
+}
+
+- (NSString *)timeRemainingString;
+{
+    static const unsigned long long minute = 60, hour = minute * 60, day = hour * 24, year = day * 365.26;
+    unsigned long long interval = [self interval];
+    // +[NSString stringWithFormat:] in 10.1 does not support long longs: work around it by converting to unsigned ints or longs for display
+    if (interval == 0) return @"ÇexpiredÈ";
+    if (interval < minute) return [NSString stringWithFormat: @"%us", (unsigned)interval];
+    if (interval < day) return [NSString stringWithFormat: @"%uh %um", (unsigned)(interval / hour), (unsigned)((interval % hour) / minute)];
+    if (interval < year) return [NSString stringWithFormat: @"%u days", (unsigned)(interval / day)];
+    if (interval < 2 * year) return @"One year";
+    return [NSString stringWithFormat: @"%lu years", (unsigned long)(interval / year)];
+}
+
 - (NSTimeInterval)interval;
 {
-    if (alarmType == PSAlarmSet) return [timer timeInterval]; // XXX counts down?
-    if (alarmType == PSAlarmDate) [self _setIntervalFromDate];
+    if (alarmType == PSAlarmSet || alarmType == PSAlarmDate) [self _setIntervalFromDate];
     return alarmInterval;
 }
@@ -166 +189 @@
                                                     repeats: NO];
             if (timer != nil) {
+                [timer retain];
                 alarmType = PSAlarmSet;
                 [[NSNotificationCenter defaultCenter] postNotificationName: PSAlarmTimerSetNotification object: self];
@@ -177 +201 @@
 - (void)cancel;
 {
+    [timer invalidate]; [timer release]; timer = nil;
+}
+
+- (void)_timerExpired:(NSTimer *)aTimer;
+{
+    [[NSNotificationCenter defaultCenter] postNotificationName: PSAlarmTimerExpiredNotification object: self];
     [timer release]; timer = nil;
-}
-
-- (void)_timerExpired:(NSTimer *)aTimer;
-{
-    [[NSNotificationCenter defaultCenter] postNotificationName: PSAlarmTimerExpiredNotification object: self];
-    timer = nil;
-    [timer release];
 }
 
@@ -229 +252 @@
     }
     [coder encodeObject: alarmMessage];
+    // NSLog(@"encoded: %@", self); // XXX happening twice, gdb refuses to show proper backtrace, grr
     return;
 }