Skip to content
This repository has been archived by the owner on Jan 3, 2019. It is now read-only.

Commit

Permalink
Fix proxy related bugs for metadata retrieval. Increment version numb…
Browse files Browse the repository at this point in the history
…er to 1.7.1.
  • Loading branch information
willson556 committed Jul 6, 2014
1 parent 5c107d3 commit 657455c
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 4 deletions.
7 changes: 6 additions & 1 deletion AppController.m
Original file line number Diff line number Diff line change
Expand Up @@ -2949,8 +2949,13 @@ - (void)loadProxyInBackgroundForSelector:(SEL)selector withObject:(id)object onT
}
else if ([proxyOption isEqualToString:@"Provided"])
{
NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithObjectsAndKeys:[NSValue valueWithPointer:selector],@"selector",target,@"target", nil];
if (object){
[userInfo addEntriesFromDictionary:@{@"object": object}];
}

ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:[NSURL URLWithString:@"http://tom-tech.com/get_iplayer/proxy.txt"]];
[request setUserInfo:@{@"selector": [NSValue valueWithPointer:selector], @"object": object}];
[request setUserInfo:userInfo];
[request setDelegate:self];
[request setDidFailSelector:@selector(providedProxyDidFinish:)];
[request setDidFinishSelector:@selector(providedProxyDidFinish:)];
Expand Down
17 changes: 17 additions & 0 deletions Get_iPlayer GUI.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,7 @@
buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Get iPlayer Automator" */;
buildPhases = (
D9CCF443102349ED009205BE /* Copy Frameworks */,
D94BB4FE19689C5C008272DD /* ShellScript */,
8D1107290486CEB800E47090 /* Resources */,
8D11072C0486CEB800E47090 /* Sources */,
8D11072E0486CEB800E47090 /* Frameworks */,
Expand Down Expand Up @@ -683,6 +684,22 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
D94BB4FE19689C5C008272DD /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "LOCATION=\"${BUILT_PRODUCTS_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\nIDENTITY=\"Developer ID Application: Thomas Willson\"\ncodesign --verbose --force --sign \"$IDENTITY\" \"$LOCATION/Sparkle.framework/Versions/A\"";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
8D11072C0486CEB800E47090 /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down
Binary file not shown.
4 changes: 2 additions & 2 deletions Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>696</string>
<string>699</string>
<key>CFBundleShortVersionString</key>
<string>1.7</string>
<string>1.7.1</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion Programme.m
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ -(void)proxyRetrievalFinished:(id)sender proxyError:(NSError *)proxyError
@"-i",
[NSString stringWithFormat:@"--profile-dir=%@",[@"~/Library/Application Support/Get iPlayer Automator/" stringByExpandingTildeInPath]],pid]];
if ([AppController sharedController].proxy) {
[args addObject:[AppController sharedController].proxy.url];
[args addObject:[NSString stringWithFormat:@"-p%@",[AppController sharedController].proxy.url]];

if (![[[NSUserDefaults standardUserDefaults] valueForKey:@"AlwaysUseProxy"] boolValue])
{
Expand Down

0 comments on commit 657455c

Please sign in to comment.