TouchInstinct
/
StreamingKit
310
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More STKAutoRecoveringHTTPDataSource improvements

This commit is contained in:
Thong Nguyen 2014-01-25 14:30:41 +00:00
parent e843a0b730
commit e495130219
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
StreamingKit/StreamingKit/STKAutoRecoveringHTTPDataSource.m
View File

@ -42,12 +42,12 @@
#import <SystemConfiguration/SystemConfiguration.h>
#import "STKAutoRecoveringHTTPDataSource.h"
#define MAX_IMMEDIATE_RECONNECT_ATTEMPTS (8)
#define MAX_ATTEMPTS_WITH_SERVER_ERROR (MAX_IMMEDIATE_RECONNECT_ATTEMPTS + 2)
#define MAX_IMMEDIATE_RECONNECT_ATTEMPTS (2)
@interface STKAutoRecoveringHTTPDataSource()
{
int reconnectAttempts;
int serial;
int waitSeconds;
BOOL waitingForNetwork;
SCNetworkReachabilityRef reachabilityRef;
}
@ -168,26 +168,35 @@ static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReach
{
waitingForNetwork = NO;
[self attemptReconnect];
[self attemptReconnectWithSerial:@(serial)];
}
}
-(void) dataSourceDataAvailable:(STKDataSource*)dataSource
{
reconnectAttempts = 0;
serial++;
waitSeconds = 1;
[super dataSourceDataAvailable:dataSource];
}
-(void) attemptReconnect
-(void) attemptReconnectWithSerial:(NSNumber*)serialIn
{
reconnectAttempts++;
if (serialIn.intValue != self->serial)
{
return;
}
NSLog(@"attemptReconnect %lld/%lld", self.position, self.length);
[self seekToOffset:self.position];
}
-(void) attemptReconnectWithTimer:(NSTimer*)timer
{
[self attemptReconnectWithSerial:(NSNumber*)timer.userInfo];
}
-(void) processRetryOnError
{
if (![self hasGotNetworkConnection])
@ -197,29 +206,20 @@ static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReach
return;
}
if (!(self.innerDataSource.httpStatusCode >= 200 && self.innerDataSource.httpStatusCode <= 299) && reconnectAttempts >= MAX_ATTEMPTS_WITH_SERVER_ERROR)
NSRunLoop* runLoop = self.innerDataSource.eventsRunLoop;
if (runLoop == nil)
{
[super dataSourceErrorOccured:self];
}
else if (reconnectAttempts > MAX_IMMEDIATE_RECONNECT_ATTEMPTS)
{
NSRunLoop* runLoop = self.innerDataSource.eventsRunLoop;
if (runLoop == nil)
{
[self performSelector:@selector(attemptReconnect) withObject:nil afterDelay:5];
}
else
{
NSTimer* timer = [NSTimer timerWithTimeInterval:5 target:self selector:@selector(attemptReconnect) userInfo:nil repeats:NO];
[runLoop addTimer:timer forMode:NSRunLoopCommonModes];
}
[self performSelector:@selector(attemptReconnectWithSerial:) withObject:@(serial) afterDelay:waitSeconds];
}
else
{
[self attemptReconnect];
NSTimer* timer = [NSTimer timerWithTimeInterval:waitSeconds target:self selector:@selector(attemptReconnectWithTimer:) userInfo:@(serial) repeats:NO];
[runLoop addTimer:timer forMode:NSRunLoopCommonModes];
}
waitSeconds = MIN(waitSeconds + 1, 5);
}
-(void) dataSourceEof:(STKDataSource*)dataSource
@ -246,7 +246,6 @@ static void ReachabilityCallback(SCNetworkReachabilityRef target, SCNetworkReach
{
[self processRetryOnError];
}
}
-(NSString*) description