Просмотр исходного кода

server browsing: don't filter playlist files

(cherry picked from commit cca8a5d88cd0ac6d904fe7667371b53d54453371)
Felix Paul Kühne 9 лет назад
Родитель
Сommit
aaa97c9c28

+ 2 - 1
SharedSources/ServerBrowsing/General/VLCNetworkServerBrowserVLCMedia.m

@@ -49,7 +49,8 @@
 
 - (BOOL)shouldFilterMedia:(VLCMedia *)media
 {
-    return ![media.url.absoluteString isSupportedAudioMediaFormat] && ![media.url.absoluteString isSupportedMediaFormat] && media.mediaType != VLCMediaTypeDirectory;
+    NSString *absoluteString = media.url.absoluteString;
+    return ![absoluteString isSupportedAudioMediaFormat] && ![absoluteString isSupportedMediaFormat] && ![absoluteString isSupportedPlaylistFormat] && media.mediaType != VLCMediaTypeDirectory;
 }
 
 - (void)_addMediaListRootItemsToList

+ 1 - 0
Sources/NSString+SupportedMedia.h

@@ -18,6 +18,7 @@
 - (BOOL)isSupportedMediaFormat;
 - (BOOL)isSupportedAudioMediaFormat;
 - (BOOL)isSupportedSubtitleFormat;
+- (BOOL)isSupportedPlaylistFormat;
 
 - (BOOL)isSupportedFormat;
 

+ 6 - 0
Sources/NSString+SupportedMedia.m

@@ -33,6 +33,12 @@
     return ([self rangeOfString:kSupportedSubtitleFileExtensions options:options].location != NSNotFound);
 }
 
+- (BOOL)isSupportedPlaylistFormat
+{
+    NSUInteger options = NSRegularExpressionSearch | NSCaseInsensitiveSearch;
+    return ([self rangeOfString:kSupportedPlaylistFileExtensions options:options].location != NSNotFound);
+}
+
 - (BOOL)isSupportedFormat
 {
     NSUInteger options = NSRegularExpressionSearch | NSCaseInsensitiveSearch;

+ 1 - 0
Sources/VLCConstants.h

@@ -74,6 +74,7 @@
 #define kSupportedFileExtensions @"\\.(3gp|3gp|3gp2|3gpp|amv|asf|avi|axv|divx|dv|flv|f4v|gvi|gxf|m1v|m2p|m2t|m2ts|m2v|m4v|mks|mkv|moov|mov|mp2v|mp4|mpeg|mpeg1|mpeg2|mpeg4|mpg|mpv|mt2s|mts|mxf|mxg|nsv|nuv|oga|ogg|ogm|ogv|ogx|spx|ps|qt|rec|rm|rmvb|tod|ts|tts|vlc|vob|vro|webm|wm|wmv|wtv|xesc)$"
 #define kSupportedSubtitleFileExtensions @"\\.(srt|sub|cdg|idx|utf|ass|ssa|aqt|jss|psb|rt|smi|txt|smil)$"
 #define kSupportedAudioFileExtensions @"\\.(aac|aiff|aif|amr|aob|ape|axa|caf|flac|it|m2a|m4a|m4b|mka|mlp|mod|mp1|mp2|mp3|mpa|mpc|mpga|oga|ogg|oma|opus|rmi|s3m|spx|tta|voc|vqf|wav|w64|wma|wv|xa|xm)$"
+#define kSupportedPlaylistFileExtensions @"\\.(asx|b4s|cue|ifo|m3u|m3u8|pls|ram|rar|sdp|vlc|xspf|wax|wvx|zip|conf)$"
 
 #define kBlobHash @"521923d214b9ae628da7987cf621e94c4afdd726"