wnagrodzki/iNapi
1
0
Fork 0
mirror of https://github.com/wnagrodzki/iNapi.git synced 2025-04-05 20:01:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Subtitle downlaodes does not execute completion handler on main queue. Hide buttos works in main window. Downloaded movies are shown at the top of the list.

Browse source
This commit is contained in:
Wojciech Nagrodzki 2013-04-30 16:24:41 +02:00
parent ee8a456f01
commit aa0103381f
Signed by: wnagrodzki
GPG key ID: E9D0EB0302264569
3 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iNapi/Classes/AppDelegate/INPAppDelegate.m
View file

@ -120,8 +120,10 @@
NSURL * subtitlesURL = [self.urlCreator iNapiURLForMovie:path language:[INPPreferencesWindowController subtitleLanguage]]; NSURL * subtitlesURL = [self.urlCreator iNapiURLForMovie:path language:[INPPreferencesWindowController subtitleLanguage]];
[self.subtitleDownloader downloadSubtitlesAtURL:subtitlesURL forMovieAtURL:movieURL completionHandler:^(NSURL *downloadedSubtitlesURL, NSError *error) { [self.subtitleDownloader downloadSubtitlesAtURL:subtitlesURL forMovieAtURL:movieURL completionHandler:^(NSURL *downloadedSubtitlesURL, NSError *error) {
INDownloadResult * result = [[INDownloadResult alloc] initWithDownloadedSubtitlesURL:downloadedSubtitlesURL error:error]; INDownloadResult * result = [[INDownloadResult alloc] initWithDownloadedSubtitlesURL:downloadedSubtitlesURL error:error];
[self.downloadResultsArrayController addObject:result]; dispatch_async(dispatch_get_main_queue(), ^{
[self.downloadResultsArrayController insertObject:result atArrangedObjectIndex:0];
self.downloadProgress += 1.0 / array.count; self.downloadProgress += 1.0 / array.count;
});
}]; }];
} }

21
iNapi/Classes/AppDelegate/MainMenu.xib
View file

@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data> <data>
<int key="IBDocument.SystemTarget">1080</int> <int key="IBDocument.SystemTarget">1080</int>
<string key="IBDocument.SystemVersion">12A269</string> <string key="IBDocument.SystemVersion">12D78</string>
<string key="IBDocument.InterfaceBuilderVersion">2549</string> <string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187</string> <string key="IBDocument.AppKitVersion">1187.37</string>
<string key="IBDocument.HIToolboxVersion">624.00</string> <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">2549</string> <string key="NS.object.0">3084</string>
</object> </object>
<array key="IBDocument.IntegratedClassDependencies"> <array key="IBDocument.IntegratedClassDependencies">
<string>NSArrayController</string> <string>NSArrayController</string>
@ -1527,7 +1527,6 @@
<string key="NSFrame">{{298, 7}, {82, 18}}</string> <string key="NSFrame">{{298, 7}, {82, 18}}</string>
<reference key="NSSuperview" ref="439893737"/> <reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:687</string> <string key="NSReuseIdentifierKey">_NS:687</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="683963103"> <object class="NSButtonCell" key="NSCell" id="683963103">
@ -1605,6 +1604,14 @@
</object> </object>
<int key="connectionID">495</int> <int key="connectionID">495</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">hide:</string>
<reference key="source" ref="1021"/>
<reference key="destination" ref="665501727"/>
</object>
<int key="connectionID">566</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBActionConnection" key="connection">
<string key="label">performMiniaturize:</string> <string key="label">performMiniaturize:</string>
@ -3618,7 +3625,7 @@
<nil key="activeLocalization"/> <nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/> <dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">565</int> <int key="maxID">566</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions"> <array class="NSMutableArray" key="referencedPartialClassDescriptions">

10
iNapi/Classes/Helpers/INSubtitleDownloader.m
View file

@ -59,18 +59,14 @@
error:&error]; error:&error];
if (error) { if (error) {
dispatch_async(dispatch_get_main_queue(), ^{
completionHandler(nil, error); completionHandler(nil, error);
});
return; return;
} }
// check if subtitles were found, if not pass error // check if subtitles were found, if not pass error
if ([subtitles isEqualToString:@"NPc0"]) { if ([subtitles isEqualToString:@"NPc0"]) {
error = [NSError errorWithDomain:iNapiErrorDomain code:iNapiSubtitlesNotFound userInfo:nil]; error = [NSError errorWithDomain:iNapiErrorDomain code:iNapiSubtitlesNotFound userInfo:nil];
dispatch_async(dispatch_get_main_queue(), ^{
completionHandler(nil, error); completionHandler(nil, error);
});
return; return;
} }
@ -82,9 +78,7 @@
if (archivePreviousSubtitles && [self.fileManager fileExistsAtPath:subtitlesSaveURL.path] == YES) { if (archivePreviousSubtitles && [self.fileManager fileExistsAtPath:subtitlesSaveURL.path] == YES) {
NSURL * archiverSubtitlesSaveURL = [self archivedURLWithURL:subtitlesSaveURL]; NSURL * archiverSubtitlesSaveURL = [self archivedURLWithURL:subtitlesSaveURL];
if ([self.fileManager moveItemAtURL:subtitlesSaveURL toURL:archiverSubtitlesSaveURL error:&error] == NO) { if ([self.fileManager moveItemAtURL:subtitlesSaveURL toURL:archiverSubtitlesSaveURL error:&error] == NO) {
dispatch_async(dispatch_get_main_queue(), ^{
completionHandler(nil, error); completionHandler(nil, error);
});
return; return;
} }
} }
@ -92,16 +86,12 @@
// save subtitles // save subtitles
NSStringEncoding encoding = self.convertToUTF8 == YES ? NSUTF8StringEncoding : NSWindowsCP1250StringEncoding; NSStringEncoding encoding = self.convertToUTF8 == YES ? NSUTF8StringEncoding : NSWindowsCP1250StringEncoding;
if ([subtitles writeToURL:subtitlesSaveURL atomically:YES encoding:encoding error:&error] == NO) { if ([subtitles writeToURL:subtitlesSaveURL atomically:YES encoding:encoding error:&error] == NO) {
dispatch_async(dispatch_get_main_queue(), ^{
completionHandler(nil, error); completionHandler(nil, error);
});
return; return;
} }
dispatch_async(dispatch_get_main_queue(), ^{
completionHandler(subtitlesSaveURL, nil); completionHandler(subtitlesSaveURL, nil);
}); });
});
} }
#pragma mark - Private #pragma mark - Private