Merge pull request #51 from leonklingele/https-support

HTTPS support for Feed URLs
mipstian · Jan 12, 2015 · 4057936 · 4057936
2 parents cb22ef5 + 6d3cee7
commit 4057936
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/CTCDefaults.h b/CTCDefaults.h
@@ -9,7 +9,7 @@ extern NSString * const kCTCDefaultsApplicationBugReportURL;
 extern NSString * const kCTCDefaultsApplicationFeatureRequestURL;
 extern NSString * const kCTCDefaultsApplicationHelpURL;
 extern NSString * const kCTCDefaultsServiceURL;
-extern NSString * const kCTCDefaultsServiceFeedURLPrefix;
+extern NSString * const kCTCDefaultsServiceFeedURLRegex;
 
 
 @interface CTCDefaults : NSObject

diff --git a/CTCDefaults.m b/CTCDefaults.m
@@ -10,8 +10,8 @@
 NSString * const kCTCDefaultsApplicationBugReportURL = @"https://github.com/mipstian/catch/issues/new?labels=bug";
 NSString * const kCTCDefaultsApplicationFeatureRequestURL = @"https://github.com/mipstian/catch/issues/new?labels=enhancement";
 NSString * const kCTCDefaultsApplicationHelpURL = @"https://github.com/mipstian/catch/wiki/Configuration";
-NSString * const kCTCDefaultsServiceURL = @"http://showrss.info/";
-NSString * const kCTCDefaultsServiceFeedURLPrefix = @"http://showrss.info/rss.php?";
+NSString * const kCTCDefaultsServiceURL = @"https://showrss.info/";
+NSString * const kCTCDefaultsServiceFeedURLRegex = @"^https?://showrss.info/rss.php\\?(.*)$";
 
 // NSUserDefaults keys
 NSString * const kCTCDefaultsFeedURLKey = @"feedURL";
@@ -91,9 +91,11 @@ + (void)refreshLoginItemStatus {
 
 + (BOOL)isFeedURLValid {
     NSString *feedURL = CTCDefaults.feedURL;
-    if (![feedURL hasPrefix:kCTCDefaultsServiceFeedURLPrefix]) {
-        // The URL should start with the prefix!
-        NSLog(@"Feed URL (%@) does not start with expected prefix (%@)", feedURL, kCTCDefaultsServiceFeedURLPrefix);
+    NSRegularExpression *feedURLRegex = [NSRegularExpression regularExpressionWithPattern:kCTCDefaultsServiceFeedURLRegex options:0 error:nil];
+    NSTextCheckingResult *feedURLMatches = [feedURLRegex firstMatchInString:feedURL options:0 range:NSMakeRange(0, [feedURL length])];
+    if (!feedURLMatches) {
+        // The URL should match the prefix regex!
+        NSLog(@"Feed URL (%@) does not match Regex (%@)", feedURL, kCTCDefaultsServiceFeedURLRegex);
         return NO;
     }
     if ([feedURL rangeOfString:@"namespaces"].location == NSNotFound) {

diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@ Features:
 
   * ShowRSS client
   * Magnet support
+  * HTTPS support
   * Very low Processor/Memory usage
   * Only check your feed at night or in whatever period you choose
   * Organize torrents in folders based on show name