Updated DGS.m to use the quick_do.php api where possible

justinweiss · Jul 14, 2012 · fe20a2a · fe20a2a
1 parent 92e443f
commit fe20a2a
Show file tree

Hide file tree

Showing 12 changed files with 85 additions and 1,909 deletions.
diff --git a/Classes/Models/CachingGameServer.h b/Classes/Models/CachingGameServer.h
@@ -24,19 +24,4 @@
 // Closes the database connection. This should be called before the app closes.
 + (void)closeDatabase;
 
-- (void)logout;
-- (void)loginWithUsername:(NSString *)username password:(NSString *)password;
-
-- (void)addGame:(NewGame *)game onSuccess:(void (^)())onSuccess;
-- (void)getCurrentGames:(void (^)(NSArray *gameList))onSuccess;
-- (void)getSgfForGame:(Game *)game onSuccess:(void (^)(Game *game))onSuccess;
-- (void)getWaitingRoomGames:(void (^)(GameList *gameList))onSuccess;
-- (void)getWaitingRoomGameDetailsForGame:(NewGame *)game onSuccess:(void (^)(NewGame *game))onSuccess;
-- (void)joinWaitingRoomGame:(int)gameId comment:(NSString *)comment onSuccess:(void (^)())onSuccess;
-- (void)deleteWaitingRoomGame:(int)gameId onSuccess:(void (^)())onSuccess;
-
-
-- (void)playMove:(Move *)move lastMove:(Move *)lastMove moveNumber:(int)moveNumber comment:(NSString *)comment gameId:(int)gameId onSuccess:(void (^)())onSuccess;
-- (void)playHandicapStones:(NSArray *)moves comment:(NSString *)comment gameId:(int)gameId onSuccess:(void (^)())onSuccess;
-- (void)markDeadStones:(NSArray *)changedStones moveNumber:(int)moveNumber comment:(NSString *)comment gameId:(int)gameId onSuccess:(void (^)())onSuccess;
 @end
diff --git a/Classes/Models/DGS.h b/Classes/Models/DGS.h
@@ -11,14 +11,15 @@
 #import "Game.h"
 #import "NewGame.h"
 #import "GameList.h"
+#import "GameServerProtocol.h"
 
 #ifndef LOGIC_TEST_MODE
 #import "ASIHTTPRequest.h"
 
 typedef void (^ASIHTTPRequestBlock)(ASIHTTPRequest *request, NSString *responseString);
 #endif
 
-@interface DGS : NSObject {
+@interface DGS : NSObject <GameServerProtocol> {
 	id <LoginProtocol> delegate;
 #ifndef LOGIC_TEST_MODE
     UIAlertView *errorView;
@@ -35,22 +36,6 @@ typedef void (^ASIHTTPRequestBlock)(ASIHTTPRequest *request, NSString *responseS
 
 @property(nonatomic, retain) UIAlertView *errorView;
 
-- (void)logout;
-- (void)loginWithUsername:(NSString *)username password:(NSString *)password;
-
-- (void)addGame:(NewGame *)game onSuccess:(void (^)())onSuccess;
-- (void)getCurrentGames:(void (^)(NSArray *gameList))onSuccess;
-- (void)getSgfForGame:(Game *)game onSuccess:(void (^)(Game *game))onSuccess;
-- (void)getWaitingRoomGames:(void (^)(GameList *gameList))onSuccess;
-- (void)getWaitingRoomGameDetailsForGame:(NewGame *)game onSuccess:(void (^)(NewGame *game))onSuccess;
-- (void)joinWaitingRoomGame:(int)gameId onSuccess:(void (^)())onSuccess;
-- (void)deleteWaitingRoomGame:(int)gameId onSuccess:(void (^)())onSuccess;
-
-
-- (void)playMove:(Move *)move lastMove:(Move *)lastMove moveNumber:(int)moveNumber comment:(NSString *)comment gameId:(int)gameId onSuccess:(void (^)())onSuccess;
-- (void)playHandicapStones:(NSArray *)moves comment:(NSString *)comment gameId:(int)gameId onSuccess:(void (^)())onSuccess;
-- (void)markDeadStones:(NSArray *)changedStones moveNumber:(int)moveNumber comment:(NSString *)comment gameId:(int)gameId onSuccess:(void (^)())onSuccess;
-
 // Starts an asynchronous request, calling onSuccess when the request finishes.
 - (void)performRequest:(ASIHTTPRequest *)request onSuccess:(ASIHTTPRequestBlock)onSuccess;
 
@@ -60,8 +45,6 @@ typedef void (^ASIHTTPRequestBlock)(ASIHTTPRequest *request, NSString *responseS
 
 // Internal, but these have to be exposed so the logic tests can hit them
 - (NSArray *)gamesFromCSV:(NSString *)csvData;
-- (NSArray *)gamesFromTable:(NSData *)htmlData;
 - (NSArray *)gamesFromWaitingRoomTable:(NSData *)htmlData;
 - (NSString *)nextPagePath:(NSData *)htmlData;
-- (NewGame *)gameFromWaitingRoomDetailTable:(NSData *)htmlData game:(NewGame *)game;
 @end