refresh logic, both manual and auto refresh (interval) implemented

ashchan · Mar 13, 2012 · 54373fa · 54373fa
1 parent 498af18
commit 54373fa
Show file tree

Hide file tree

Showing 15 changed files with 221 additions and 167 deletions.
diff --git a/RubyChinaReader.xcodeproj/project.pbxproj b/RubyChinaReader.xcodeproj/project.pbxproj
@@ -14,6 +14,7 @@
 		1A1FC5CB15032C26009CDD67 /* RCRTableRowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A1FC5CA15032C25009CDD67 /* RCRTableRowView.m */; };
 		1A1FC5CE15033875009CDD67 /* RCRUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A1FC5CD15033875009CDD67 /* RCRUser.m */; };
 		1A29596A15079D2700D397E5 /* RCRUrlBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A29596915079D2700D397E5 /* RCRUrlBuilder.m */; };
+		1A3E12E5150F19B500D0897C /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1A3E12E4150F19B500D0897C /* Preferences.xib */; };
 		1A4FA721150618A200FB6B8D /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = 1A4FA720150618A200FB6B8D /* Credits.html */; };
 		1A6546B1150789F40030C113 /* RCRTopicDetailController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A6546AF150789F40030C113 /* RCRTopicDetailController.m */; };
 		1A6546B2150789F40030C113 /* RCRTopicDetailController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1A6546B0150789F40030C113 /* RCRTopicDetailController.xib */; };
@@ -124,6 +125,7 @@
 		1A1FC5CD15033875009CDD67 /* RCRUser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCRUser.m; sourceTree = "<group>"; };
 		1A29596815079D2700D397E5 /* RCRUrlBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCRUrlBuilder.h; sourceTree = "<group>"; };
 		1A29596915079D2700D397E5 /* RCRUrlBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCRUrlBuilder.m; sourceTree = "<group>"; };
+		1A3E12E4150F19B500D0897C /* Preferences.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = Preferences.xib; sourceTree = "<group>"; };
 		1A4FA720150618A200FB6B8D /* Credits.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = Credits.html; path = Resources/Credits.html; sourceTree = "<group>"; };
 		1A6546AE150789F40030C113 /* RCRTopicDetailController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCRTopicDetailController.h; sourceTree = "<group>"; };
 		1A6546AF150789F40030C113 /* RCRTopicDetailController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCRTopicDetailController.m; sourceTree = "<group>"; };
@@ -320,6 +322,7 @@
 			isa = PBXGroup;
 			children = (
 				1AFC259414FCDF1100443426 /* MainMenu.xib */,
+				1A3E12E4150F19B500D0897C /* Preferences.xib */,
 				1A6AB5561502203A00CC0516 /* RCRTopicsViewController.xib */,
 				1A6AB5691502318000CC0516 /* RCRAccountViewController.xib */,
 				1A6AB5641502307800CC0516 /* RCROptionsViewController.xib */,
@@ -560,6 +563,7 @@
 				1A4FA721150618A200FB6B8D /* Credits.html in Resources */,
 				1A9488281506EBE2004B83CA /* RCRUserDetailViewController.xib in Resources */,
 				1A6546B2150789F40030C113 /* RCRTopicDetailController.xib in Resources */,
+				1A3E12E5150F19B500D0897C /* Preferences.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/RubyChinaReader/Preferences.xib b/RubyChinaReader/Preferences.xib
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">11D50</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
+		<string key="IBDocument.AppKitVersion">1138.32</string>
+		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">2182</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSCustomObject</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="NSCustomObject" id="1001">
+				<string key="NSClassName">NSObject</string>
+			</object>
+			<object class="NSCustomObject" id="1003">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1004">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords"/>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1001"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1003"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1004"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">0</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<bool key="IBDocument.UseAutolayout">YES</bool>
+	</data>
+</archive>
diff --git a/RubyChinaReader/RCRAppController.h b/RubyChinaReader/RCRAppController.h
@@ -14,4 +14,6 @@
 
 + (RCRAppController *)sharedAppController;
 
+- (void)newTopic;
+
 @end
diff --git a/RubyChinaReader/RCRAppController.m b/RubyChinaReader/RCRAppController.m
@@ -17,8 +17,6 @@ @interface RCRAppController() {
     EDSideBar *sideBar;
 }
 
-- (void)newTopic;
-
 @end
 
 @implementation RCRAppController
@@ -103,6 +101,7 @@ - (void)windowDidLoad{
     [self.window.contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(>=0)-[newTopicButton(==20)]-4-|" options:0 metrics:nil views:NSDictionaryOfVariableBindings(newTopicButton)]];
 
     NSButton *refreshButton = [[NSButton alloc] init];
+    [refreshButton bind:@"enabled" toObject:topicsViewController withKeyPath:@"canRefresh" options:nil];
     refreshButton.bezelStyle = NSThickSquareBezelStyle;
     refreshButton.image = [NSImage imageNamed:NSImageNameRefreshTemplate];
     refreshButton.target = topicsViewController;

diff --git a/RubyChinaReader/RCRAppDelegate.h b/RubyChinaReader/RCRAppDelegate.h
@@ -14,5 +14,6 @@
 - (IBAction)preferencesClicked:(id)sender;
 - (IBAction)showMainWindow:(id)sender;
 - (IBAction)closeWindow:(id)sender;
+- (IBAction)newTopicClicked:(id)sender;
 
 @end
diff --git a/RubyChinaReader/RCRAppDelegate.m b/RubyChinaReader/RCRAppDelegate.m
@@ -52,6 +52,10 @@ - (IBAction)closeWindow:(id)sender {
     [[NSApp keyWindow] close];
 }
 
+- (IBAction)newTopicClicked:(id)sender {
+    [[RCRAppController sharedAppController] newTopic];
+}
+
 #pragma mark - Private Methods
 
 - (void)mapObjects {

diff --git a/RubyChinaReader/RCROptionsViewController.m b/RubyChinaReader/RCROptionsViewController.m
@@ -7,9 +7,10 @@
 //
 
 #import "RCROptionsViewController.h"
+#import "RCRSettingsManager.h"
 
 @interface RCROptionsViewController ()
-
+@property NSInteger refreshInterval;
 @end
 
 @implementation RCROptionsViewController
@@ -32,4 +33,12 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
     return self;
 }
 
+- (void)setRefreshInterval:(NSInteger)interval {
+    [RCRSettingsManager sharedRCRSettingsManager].refreshInterval = interval;
+}
+
+- (NSInteger)refreshInterval {
+    return [RCRSettingsManager sharedRCRSettingsManager].refreshInterval;
+}
+
 @end
diff --git a/RubyChinaReader/RCROptionsViewController.xib b/RubyChinaReader/RCROptionsViewController.xib
@@ -3,12 +3,12 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1070</int>
 		<string key="IBDocument.SystemVersion">11D50</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2177</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
 		<string key="IBDocument.AppKitVersion">1138.32</string>
 		<string key="IBDocument.HIToolboxVersion">568.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2177</string>
+			<string key="NS.object.0">2182</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>NSPopUpButton</string>
@@ -54,6 +54,7 @@
 						<string key="NSFrame">{{18, 66}, {100, 18}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="733068260"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="599009421">
@@ -88,7 +89,7 @@
 						<string key="NSFrame">{{17, 105}, {82, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="733068260"/>
+						<reference key="NSNextKeyView" ref="291548441"/>
 						<string key="NSReuseIdentifierKey">_NS:1505</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="471902425">
@@ -124,11 +125,11 @@
 						<string key="NSFrame">{{101, 98}, {100, 26}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
+						<reference key="NSNextKeyView" ref="65673891"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="899222782">
-							<int key="NSCellFlags">-1539178944</int>
+							<int key="NSCellFlags">-2076049856</int>
 							<int key="NSCellFlags2">2048</int>
 							<reference key="NSSupport" ref="447048529"/>
 							<string key="NSCellIdentifier">_NS:9</string>
@@ -214,7 +215,7 @@
 						<string key="NSFrame">{{18, 26}, {126, 18}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="291548441"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="376245684">
@@ -271,6 +272,22 @@
 					</object>
 					<int key="connectionID">19</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">selectedTag: refreshInterval</string>
+						<reference key="source" ref="291548441"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="291548441"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">selectedTag: refreshInterval</string>
+							<string key="NSBinding">selectedTag</string>
+							<string key="NSKeyPath">refreshInterval</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">93</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -647,7 +664,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">84</int>
+			<int key="maxID">93</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">

diff --git a/RubyChinaReader/RCRPrefsController.m b/RubyChinaReader/RCRPrefsController.m
@@ -20,10 +20,6 @@ @interface RCRPrefsController () {
 
 @implementation RCRPrefsController
 
-+ (NSString *)nibName {
-    return @"RCROptionsViewController";
-}
-
 - (id)initWithWindow:(NSWindow *)window
 {
     self = [super initWithWindow:window];

diff --git a/RubyChinaReader/RCRSettingsManager.h b/RubyChinaReader/RCRSettingsManager.h
@@ -15,5 +15,7 @@
 @property (weak) NSString *privateToken;
 @property BOOL startAtLogin;
 @property NSInteger refreshInterval;
+@property (readonly) NSInteger minRefreshInterval;
+@property NSTimeInterval lastTimeRefreshed;
 
 @end
diff --git a/RubyChinaReader/RCRSettingsManager.m b/RubyChinaReader/RCRSettingsManager.m
@@ -11,12 +11,16 @@
 
 @implementation RCRSettingsManager
 
-NSString *const KeychainService     = @"RubyChina";
-NSString *const KeychainUsername    = @"PrivateToken";
+NSString *const KeychainService         = @"RubyChina";
+NSString *const KeychainUsername        = @"PrivateToken";
+NSString *const LastTimeRefreshed       = @"LastTimeRefreshed";
+NSString *const RefreshInterval         = @"RefreshInterval";
+const NSInteger MinRefreshInterval      = 60 * 3;
+const NSInteger DefaultRefreshInterval  = 3600;
 
 SYNTHESIZE_SINGLETON_FOR_CLASS(RCRSettingsManager);
 
-@synthesize startAtLogin, refreshInterval;
+@synthesize startAtLogin;
 
 - (void)setPrivateToken:(NSString *)privateToken {
     if (privateToken && privateToken.length > 0) {
@@ -42,4 +46,27 @@ - (NSString *)privateToken {
     return @"";
 }
 
+- (NSInteger)minRefreshInterval {
+    return MinRefreshInterval;
+}
+
+- (NSTimeInterval)lastTimeRefreshed {
+    return [[NSUserDefaults standardUserDefaults] doubleForKey:LastTimeRefreshed];
+}
+
+- (void)setLastTimeRefreshed:(NSTimeInterval)lastTime {
+    [[NSUserDefaults standardUserDefaults] setDouble:lastTime forKey:LastTimeRefreshed];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
+- (NSInteger)refreshInterval {
+    NSInteger interval = [[NSUserDefaults standardUserDefaults] integerForKey:RefreshInterval];
+    return interval > 0 ? interval : DefaultRefreshInterval;
+}
+
+- (void)setRefreshInterval:(NSInteger)interval {
+    [[NSUserDefaults standardUserDefaults] setInteger:interval forKey:RefreshInterval];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
 @end
diff --git a/RubyChinaReader/RCRTopicsViewController.h b/RubyChinaReader/RCRTopicsViewController.h
@@ -16,4 +16,6 @@
 - (IBAction)newTopic:(id)sender;
 - (IBAction)userImageClicked:(id)sender;
 
+@property BOOL canRefresh;
+
 @end