Change matching order

CHANGELOG.md

@@ -8,6 +8,11 @@ and this project does adhere to [Semantic Versioning](https://semver.org/spec/v2
 ## [Unreleased]
 
 
+## [1.1.3] – 2020-12-18
+### Fixed
+- Recognize YouTube channel URLs in the format `/c/channel-name` 
+
+
 ## [1.1.2] – 2020-11-27
 ### Fixed
 - Fixes hidden color option for marking unread entries. Unread menu entries did use `colorStatusIconTint` instead of `colorUnreadIndicator` (thanks @tchek)
@@ -148,7 +153,8 @@ and this project does adhere to [Semantic Versioning](https://semver.org/spec/v2
 Initial release
 
 
-[Unreleased]: https://github.com/relikd/baRSS/compare/v1.1.2...HEAD
+[Unreleased]: https://github.com/relikd/baRSS/compare/v1.1.3...HEAD
+[1.1.3]: https://github.com/relikd/baRSS/compare/v1.1.2...v1.1.3
 [1.1.2]: https://github.com/relikd/baRSS/compare/v1.1.1...v1.1.2
 [1.1.1]: https://github.com/relikd/baRSS/compare/v1.1.0...v1.1.1
 [1.1.0]: https://github.com/relikd/baRSS/compare/v1.0.2...v1.1.0

README.md

@@ -180,7 +180,7 @@ This project uses a modified version of Brent Simmons' [RSXML](https://github.co
 ##### Trivia
 
 - Start of project: __July 19, 2018__
-- Estimated development time: __1963h+__
+- Estimated development time: __1965h+__
 - First prototype used __feedparser python__ library
 
 

baRSS/Feed Import/Download3rdParty.h

@@ -28,7 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 // TODO: Make plugins extensible? community extensions.
 @interface YouTubePlugin : NSObject
-+ (NSString*)feedURL:(NSURL*)url;
++ (NSString*)feedURL:(NSURL*)url data:(NSData*)html;
 + (NSString*)videoImage:(NSString*)videoid;
 + (NSString*)videoImageHQ:(NSString*)videoid;
 @end

baRSS/Feed Import/Download3rdParty.m

@@ -33,12 +33,13 @@
 
  @return @c nil if @c url is not properly formatted, YouTube feed URL otherwise.
  */
-+ (NSString*)feedURL:(NSURL*)url {
++ (NSString*)feedURL:(NSURL*)url data:(NSData*)html {
 	if (![url.host hasSuffix:@"youtube.com"]) // 'youtu.be' & 'youtube-nocookie.com' will redirect
 		return nil;
 	// https://www.youtube.com/channel/[channel-id]
 	// https://www.youtube.com/user/[user-name]
 	// https://www.youtube.com/playlist?list=[playlist-id]
+	// https://www.youtube.com/c/[channel-name]
 #if DEBUG && ENV_LOG_YOUTUBE
 	printf("resolving YouTube url:\n");
 	printf(" ↳ %s\n", url.absoluteString.UTF8String);
@@ -62,6 +63,23 @@
 					break;
 				}
 			}
+		} else if ([type isEqualToString:@"c"]) {
+			NSData *m_head = [@"<meta itemprop=\"channelId\" content=\"" dataUsingEncoding:NSUTF8StringEncoding];
+			NSRange tmp = [html rangeOfData:m_head options:0 range:NSMakeRange(0, html.length)];
+			if (tmp.location == NSNotFound) {
+				NSData *m_json = [@"\"channelId\":\"" dataUsingEncoding:NSUTF8StringEncoding];
+				tmp = [html rangeOfData:m_json options:0 range:NSMakeRange(0, html.length)];
+			}
+			NSUInteger start = tmp.location + tmp.length;
+			NSUInteger end = html.length - start;
+			if (end > 50) end = 50; // no need to search till the end
+			NSString *substr = [[NSString alloc] initWithData:[html subdataWithRange:NSMakeRange(start, end)] encoding:NSUTF8StringEncoding];
+			if (substr) {
+				NSUInteger to = [substr rangeOfString:@"\""].location;
+				if (to != NSNotFound) {
+					found = [ytBase stringByAppendingFormat:@"?channel_id=%@", [substr substringToIndex:to]];
+				}
+			}
 		}
 	}
 #if DEBUG && ENV_LOG_YOUTUBE

baRSS/Feed Import/FeedDownload.m

@@ -178,7 +178,7 @@
 		}
 		else if (!meta || meta.feedLinks.count == 0) {
 			if ([xml.url.host hasSuffix:@"youtube.com"])
-				feedURL = [YouTubePlugin feedURL:xml.url];
+				feedURL = [YouTubePlugin feedURL:xml.url data:xml.data];
 			if (feedURL.length == 0)
 				self.error = [NSError feedURLNotFound:xml.url];
 		}

baRSS/Info.plist

@@ -45,7 +45,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.2</string>
+	<string>1.1.3</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -70,7 +70,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>14633</string>
+	<string>14644</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.news</string>
 	<key>LSMinimumSystemVersion</key>
@@ -83,7 +83,7 @@
 		<true/>
 	</dict>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2019 relikd. Public Domain.</string>
+	<string>Copyright © 2020 relikd.</string>
 	<key>NSPrincipalClass</key>
 	<string>AppHook</string>
 	<key>UTImportedTypeDeclarations</key>