always set media type whenever possible (#347)

Author: huynhsontung

Screenbox.Core/Helpers/FilesHelpers.cs

@@ -1,4 +1,5 @@
-using System.Collections.Immutable;
+using Screenbox.Core.Enums;
+using System.Collections.Immutable;
 using Windows.Storage;
 
 namespace Screenbox.Core.Helpers;
@@ -23,4 +24,13 @@ public static class FilesHelpers
     public static bool IsSupportedPlaylist(this IStorageFile file) => SupportedPlaylistFormats.Contains(file.FileType.ToLowerInvariant());
     public static bool IsSupported(this IStorageFile file) => SupportedFormats.Contains(file.FileType.ToLowerInvariant());
     public static bool IsSupportedSubtitle(this IStorageFile file) => SupportedSubtitleFormats.Contains(file.FileType.ToLowerInvariant());
+
+    public static MediaPlaybackType GetMediaTypeForFile(IStorageFile file)
+    {
+        if (file.IsSupportedVideo()) return MediaPlaybackType.Video;
+        if (file.IsSupportedAudio()) return MediaPlaybackType.Music;
+        if (file.ContentType.StartsWith("image")) return MediaPlaybackType.Image;
+        if (file.IsSupportedPlaylist()) return MediaPlaybackType.Playlist;
+        return MediaPlaybackType.Unknown;
+    }
 }

Screenbox.Core/Models/MediaInfo.cs

@@ -9,16 +9,17 @@ public sealed class MediaInfo
 {
     public MediaPlaybackType MediaType { get; set; }
 
-    public VideoInfo VideoProperties { get; set; }
+    public VideoInfo VideoProperties { get; }
 
-    public MusicInfo MusicProperties { get; set; }
+    public MusicInfo MusicProperties { get; }
 
-    public ulong Size { get; set; }
+    public ulong Size { get; }
 
-    public DateTimeOffset DateModified { get; set; }
+    public DateTimeOffset DateModified { get; }
 
-    public MediaInfo()
+    public MediaInfo(MediaPlaybackType mediaType)
     {
+        MediaType = mediaType;
         VideoProperties = new VideoInfo();
         MusicProperties = new MusicInfo();
     }

Screenbox.Core/Services/FilesService.cs

@@ -191,12 +191,12 @@ public void AddToRecent(IStorageItem item)
 
         public async Task<MediaInfo> GetMediaInfoAsync(StorageFile file)
         {
-            if (!file.IsAvailable) return new MediaInfo();
+            MediaPlaybackType mediaType = FilesHelpers.GetMediaTypeForFile(file);
+            if (!file.IsAvailable) return new MediaInfo(mediaType);
 
             try
             {
                 BasicProperties basicProperties = await file.GetBasicPropertiesAsync();
-                MediaPlaybackType mediaType = GetMediaTypeForFile(file);
                 switch (mediaType)
                 {
                     case MediaPlaybackType.Video:
@@ -214,7 +214,7 @@ public async Task<MediaInfo> GetMediaInfoAsync(StorageFile file)
                     LogService.Log(e);
             }
 
-            return new MediaInfo();
+            return new MediaInfo(mediaType);
         }
 
         private FileOpenPicker GetFilePickerForFormats(IReadOnlyCollection<string> formats)
@@ -239,14 +239,5 @@ private FileOpenPicker GetFilePickerForFormats(IReadOnlyCollection<string> forma
 
             return picker;
         }
-
-        private static MediaPlaybackType GetMediaTypeForFile(IStorageFile file)
-        {
-            if (file.IsSupportedVideo()) return MediaPlaybackType.Video;
-            if (file.IsSupportedAudio()) return MediaPlaybackType.Music;
-            if (file.ContentType.StartsWith("image")) return MediaPlaybackType.Image;
-            if (file.IsSupportedPlaylist()) return MediaPlaybackType.Playlist;
-            return MediaPlaybackType.Unknown;
-        }
     }
 }

Screenbox.Core/ViewModels/MediaViewModel.cs

@@ -5,6 +5,7 @@
 using LibVLCSharp.Shared;
 using Screenbox.Core.Enums;
 using Screenbox.Core.Factories;
+using Screenbox.Core.Helpers;
 using Screenbox.Core.Messages;
 using Screenbox.Core.Models;
 using Screenbox.Core.Playback;
@@ -91,32 +92,35 @@ public MediaViewModel(MediaViewModel source)
             Source = source.Source;
         }
 
-        private MediaViewModel(object source, LibVlcService libVlcService)
+        private MediaViewModel(object source, MediaInfo mediaInfo, LibVlcService libVlcService)
         {
             _libVlcService = libVlcService;
             Source = source;
             Location = string.Empty;
             _name = string.Empty;
-            _mediaInfo = new MediaInfo();
+            _mediaInfo = mediaInfo;
             _artists = Array.Empty<ArtistViewModel>();
             _options = new List<string>();
             Options = new ReadOnlyCollection<string>(_options);
         }
 
-        public MediaViewModel(LibVlcService libVlcService, StorageFile file) : this(file, libVlcService)
+        public MediaViewModel(LibVlcService libVlcService, StorageFile file)
+            : this(file, new MediaInfo(FilesHelpers.GetMediaTypeForFile(file)), libVlcService)
         {
             Location = file.Path;
             _name = file.DisplayName;
             _altCaption = file.Name;
         }
 
-        public MediaViewModel(LibVlcService libVlcService, Uri uri) : this(uri, libVlcService)
+        public MediaViewModel(LibVlcService libVlcService, Uri uri)
+            : this(uri, new MediaInfo(MediaPlaybackType.Unknown), libVlcService)
         {
             Location = uri.OriginalString;
             _name = uri.Segments.Length > 0 ? Uri.UnescapeDataString(uri.Segments.Last()) : string.Empty;
         }
 
-        public MediaViewModel(LibVlcService libVlcService, Media media) : this(media, libVlcService)
+        public MediaViewModel(LibVlcService libVlcService, Media media)
+            : this(media, new MediaInfo(MediaPlaybackType.Unknown), libVlcService)
         {
             Location = media.Mrl;
 
@@ -205,7 +209,7 @@ public async Task LoadDetailsAsync(IFilesService filesService)
 
             switch (MediaType)
             {
-                case MediaPlaybackType.Unknown when _item is { VideoTracks.Count: 0 }:
+                case MediaPlaybackType.Unknown when _item is { VideoTracks.Count: 0, Media.IsParsed: true }:
                     // Update media type when it was previously set Unknown. Usually when source is a URI.
                     // We don't want to init PlaybackItem just for this.
                     MediaInfo.MediaType = MediaPlaybackType.Music;

Screenbox.Core/ViewModels/PlayerPageViewModel.cs

@@ -43,16 +43,13 @@ public sealed partial class PlayerPageViewModel : ObservableRecipient,
         [ObservableProperty] private bool _isPlaying;
         [ObservableProperty] private bool _isPlayingBadge;
         [ObservableProperty] private bool _isOpening;
+        [ObservableProperty] private bool _audioOnly;
         [ObservableProperty] private bool _showPlayPauseBadge;
         [ObservableProperty] private WindowViewMode _viewMode;
         [ObservableProperty] private NavigationViewDisplayMode _navigationViewDisplayMode;
         [ObservableProperty] private MediaViewModel? _media;
         [ObservableProperty] private ElementTheme _actualTheme;
 
-        [ObservableProperty]
-        [NotifyPropertyChangedFor(nameof(AudioOnly))]
-        private MediaPlaybackType _mediaType;
-
         [ObservableProperty]
         [NotifyPropertyChangedRecipients]
         private PlayerVisibilityState _playerVisibility;
@@ -63,8 +60,6 @@ public sealed partial class PlayerPageViewModel : ObservableRecipient,
 
         public bool SeekBarPointerInteracting { get; set; }
 
-        public bool AudioOnly => MediaType == MediaPlaybackType.Music;
-
         private readonly DispatcherQueue _dispatcherQueue;
         private readonly DispatcherQueueTimer _openingTimer;
         private readonly DispatcherQueueTimer _controlsVisibilityTimer;
@@ -589,7 +584,7 @@ private async void ProcessOpeningMedia(MediaViewModel? current)
             {
                 await current.LoadDetailsAsync(_filesService);
                 await current.LoadThumbnailAsync(_filesService);
-                MediaType = current.MediaType;
+                AudioOnly = current.MediaType == MediaPlaybackType.Music;
                 bool shouldBeVisible = _settingsService.PlayerAutoResize == PlayerAutoResizeOption.Always && !AudioOnly;
                 if (PlayerVisibility != PlayerVisibilityState.Visible)
                 {