From fe2b72f4eba5dac05e3b502ca352225a3c89332c Mon Sep 17 00:00:00 2001
From: Wojciech Nagrodzki <278594+wnagrodzki@users.noreply.github.com>
Date: Sun, 7 Oct 2012 13:01:29 +0200
Subject: [PATCH] Converting subtitles to UTF8

---
 iNapi/Classes/AppDelegate/INPAppDelegate.m   |  2 ++
 iNapi/Classes/Helpers/INSubtitleDownloader.h |  1 +
 iNapi/Classes/Helpers/INSubtitleDownloader.m |  3 ++-
 iNapi/iNapi-Info.plist                       | 10 +++++-----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/iNapi/Classes/AppDelegate/INPAppDelegate.m b/iNapi/Classes/AppDelegate/INPAppDelegate.m
index 7061639..f428320 100644
--- a/iNapi/Classes/AppDelegate/INPAppDelegate.m
+++ b/iNapi/Classes/AppDelegate/INPAppDelegate.m
@@ -111,6 +111,8 @@
         [self.window makeKeyAndOrderFront:self];
     }
     
+    self.subtitleDownloader.convertToUTF8 = [INPPreferencesWindowController convertToUTF8];
+    
     NSArray * array = [self.movieFilter moviePathsAmongFilePaths:filenames];
     
     for (NSString * path in array) {
diff --git a/iNapi/Classes/Helpers/INSubtitleDownloader.h b/iNapi/Classes/Helpers/INSubtitleDownloader.h
index b160e55..cc57888 100644
--- a/iNapi/Classes/Helpers/INSubtitleDownloader.h
+++ b/iNapi/Classes/Helpers/INSubtitleDownloader.h
@@ -19,6 +19,7 @@
 
 @interface INSubtitleDownloader : NSObject
 
+@property (assign, nonatomic) BOOL convertToUTF8;
 @property (weak, nonatomic) id<INSubtitleDownloaderDelegate> delegate;
 
 -(void)downloadSubtitlesAtURL:(NSURL *)subtitlesURL forMovieAtURL:(NSURL *)movieURL completionHandler:(void (^)(NSURL * downloadedSubtitlesURL, NSError * error))completionHandler;
diff --git a/iNapi/Classes/Helpers/INSubtitleDownloader.m b/iNapi/Classes/Helpers/INSubtitleDownloader.m
index 28e09fa..c3ccf62 100644
--- a/iNapi/Classes/Helpers/INSubtitleDownloader.m
+++ b/iNapi/Classes/Helpers/INSubtitleDownloader.m
@@ -90,7 +90,8 @@
         }
         
         // save subtitles
-        if ([subtitles writeToURL:subtitlesSaveURL atomically:YES encoding:NSWindowsCP1250StringEncoding error:&error] == NO) {
+        NSStringEncoding encoding = self.convertToUTF8 == YES ? NSUTF8StringEncoding : NSWindowsCP1250StringEncoding;
+        if ([subtitles writeToURL:subtitlesSaveURL atomically:YES encoding:encoding error:&error] == NO) {
             dispatch_async(dispatch_get_main_queue(), ^{
                 completionHandler(nil, error);
             });
diff --git a/iNapi/iNapi-Info.plist b/iNapi/iNapi-Info.plist
index c3398a4..eef1e74 100644
--- a/iNapi/iNapi-Info.plist
+++ b/iNapi/iNapi-Info.plist
@@ -36,7 +36,7 @@
 	<key>CFBundleIconFile</key>
 	<string>AppIcon.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.izydor86.iNapi.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>com.izydor86.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -59,6 +59,10 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>SUFeedURL</key>
+	<string>https://sites.google.com/site/izydor86/inapi/iNapiAppcast.xml</string>
+	<key>SUPublicDSAKeyFile</key>
+	<string>dsa_pub.pem</string>
 	<key>UTImportedTypeDeclarations</key>
 	<array>
 		<dict>
@@ -144,9 +148,5 @@
 			</dict>
 		</dict>
 	</array>
-	<key>SUPublicDSAKeyFile</key>
-	<string>dsa_pub.pem</string>
-	<key>SUFeedURL</key>
-	<string>https://sites.google.com/site/izydor86/inapi/iNapiAppcast.xml</string>
 </dict>
 </plist>