MateuszSkoczek/VDownload
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases 1 Activity

filter controls, default thumbnail, playlist search video removing

Browse Source
This commit is contained in:
Mateusz Skoczek
2024-03-02 01:05:44 +01:00
Unverified
parent 9465be8d76
commit 17245bb91f
28 changed files with 352 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomePlaylistViewResources.resw
View File

@@ -117,6 +117,15 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ApplyDirectoryButton.ToolTipService.ToolTip" xml:space="preserve">
<value>Selected directory will be applied to all videos in playlist</value>
</data>
<data name="CreateAndStartButton.Content" xml:space="preserve">
<value>Create download tasks and start</value>
</data>
<data name="CreateButton.Content" xml:space="preserve">
<value>Create download tasks</value>
</data>
<data name="DirectorySettingsCard.Header" xml:space="preserve">
<value>Directory</value>
</data>
@@ -135,6 +144,33 @@
<data name="FileTypeSettingsCard.Header" xml:space="preserve">
<value>File type</value>
</data>
<data name="FilterAuthorTextBlock.Text" xml:space="preserve">
<value>Author</value>
</data>
<data name="FilterAuthorTextBox.PlaceholderText" xml:space="preserve">
<value>Enter regular expression</value>
</data>
<data name="FilterDateTextBlock.Text" xml:space="preserve">
<value>Date</value>
</data>
<data name="FilterDurationTextBlock.Text" xml:space="preserve">
<value>Duration</value>
</data>
<data name="FilterRemovedButton.Content" xml:space="preserve">
<value>Restore</value>
</data>
<data name="FilterRemovedTextBlock.Text" xml:space="preserve">
<value>Removed</value>
</data>
<data name="FilterTitleTextBlock.Text" xml:space="preserve">
<value>Title</value>
</data>
<data name="FilterTitleTextBox.PlaceholderText" xml:space="preserve">
<value>Enter regular expression</value>
</data>
<data name="FilterViewsTextBlock.Text" xml:space="preserve">
<value>Views</value>
</data>
<data name="FilterWindow.Title" xml:space="preserve">
<value>Filter</value>
</data>

4
VDownload.Core/VDownload.Core.Strings/VDownload.Core.Strings.csproj
View File

@@ -10,8 +10,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
</ItemGroup>
<ItemGroup>

2
VDownload.Core/VDownload.Core.Tasks/DownloadTask.cs
View File

@@ -140,7 +140,7 @@ namespace VDownload.Core.Tasks
await _settingsService.Load();
string tempDirectory = $"{_settingsService.Data.Common.Temp.Directory}\\{_configurationService.Common.Path.Temp.TasksDirectory}\\{_id}";
string tempDirectory = $"{_settingsService.Data.Common.Temp.Directory}\\{_configurationService.Common.Path.Temp.TasksDirectory}\\{Id}";
Directory.CreateDirectory(tempDirectory);
List<string> content = new List<string>()

25
VDownload.Core/VDownload.Core.ViewModels/Home/Helpers/VideoViewModel.cs
View File

@@ -3,6 +3,7 @@ using CommunityToolkit.Mvvm.Input;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -71,6 +72,8 @@ namespace VDownload.Core.ViewModels.Home.Helpers
[ObservableProperty]
protected AudioExtension _audioExtension;
public Video Video { get; protected set; }
#endregion
@@ -82,6 +85,8 @@ namespace VDownload.Core.ViewModels.Home.Helpers
_settingsService = settingsService;
_storagePickerService = storagePickerService;
Video = video;
ThumbnailUrl = video.ThumbnailUrl;
Title = video.Title;
Author = video.Author;
@@ -104,6 +109,26 @@ namespace VDownload.Core.ViewModels.Home.Helpers
#region PUBLIC METHODS
public VideoDownloadOptions BuildDownloadOptions()
{
return new VideoDownloadOptions(Duration)
{
MediaType = this.MediaType,
SelectedStream = this.SelectedStream,
TrimStart = this.TrimStart,
TrimEnd = this.TrimEnd,
Directory = this.DirectoryPath,
Filename = string.Join("_", this.Filename.Split(Path.GetInvalidFileNameChars())),
Extension = (this.MediaType == MediaType.OnlyAudio ? this.AudioExtension.ToString() : this.VideoExtension.ToString()).ToLower(),
};
}
#endregion
#region COMMANDS
[RelayCommand]

77
VDownload.Core/VDownload.Core.ViewModels/Home/HomePlaylistViewModel.cs
View File

@@ -1,7 +1,9 @@
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
@@ -32,6 +34,8 @@ namespace VDownload.Core.ViewModels.Home
protected Playlist _playlist;
protected Dictionary<VideoViewModel, bool> _allVideos;
#endregion
@@ -44,6 +48,9 @@ namespace VDownload.Core.ViewModels.Home
[ObservableProperty]
protected ObservableCollection<VideoViewModel> _videos;
[ObservableProperty]
protected int _removedCount;
#endregion
@@ -56,6 +63,7 @@ namespace VDownload.Core.ViewModels.Home
_settingsService = settingsService;
_storagePickerService = storagePickerService;
_allVideos = new Dictionary<VideoViewModel, bool>();
_videos = new ObservableCollection<VideoViewModel>();
}
@@ -65,17 +73,19 @@ namespace VDownload.Core.ViewModels.Home
#region PUBLIC METHODS
public async Task LoadPlaylist(Playlist playlist)
public void LoadPlaylist(Playlist playlist)
{
_playlist = playlist;
Videos.Clear();
Name = _playlist.Name;
_allVideos.Clear();
foreach (Video video in playlist)
{
Videos.Add(new VideoViewModel(video, _settingsService, _storagePickerService));
_allVideos.Add(new VideoViewModel(video, _settingsService, _storagePickerService), false);
}
Name = _playlist.Name;
Videos = new ObservableCollection<VideoViewModel>(_allVideos.Keys);
RemovedCount = 0;
}
#endregion
@@ -84,7 +94,64 @@ namespace VDownload.Core.ViewModels.Home
#region COMMANDS
[RelayCommand]
public async Task SelectDirectory()
{
string? newDirectory = await _storagePickerService.OpenDirectory();
if (newDirectory is not null)
{
foreach (VideoViewModel video in _allVideos.Keys)
{
video.DirectoryPath = newDirectory;
}
}
}
[RelayCommand]
public void RemoveVideo(VideoViewModel video)
{
_allVideos[video] = true;
Videos.Remove(video);
RemovedCount = _allVideos.Where(x => x.Value).Count();
}
[RelayCommand]
public void RestoreRemovedVideos()
{
foreach(VideoViewModel video in _allVideos.Where(x => x.Value == true).Select(x => x.Key))
{
_allVideos[video] = false;
Videos.Add(video);
}
RemovedCount = _allVideos.Where(x => x.Value).Count();
}
[RelayCommand]
public void CreateTasksAndDownload() => CreateTasks(true);
[RelayCommand]
public void CreateTasks() => CreateTasks(false);
#endregion
#region PRIVATE METHODS
protected void CreateTasks(bool download)
{
foreach (VideoViewModel video in Videos)
{
DownloadTask task = _tasksManager.AddTask(video.Video, video.BuildDownloadOptions());
if (download)
{
task.Enqueue();
}
}
CloseRequested?.Invoke(this, EventArgs.Empty);
}
#endregion

2
VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs
View File

@@ -234,7 +234,7 @@ namespace VDownload.Core.ViewModels.Home
return;
}
await _playlistViewModel.LoadPlaylist(playlist);
_playlistViewModel.LoadPlaylist(playlist);
MainContent = _playlistView;

6
VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj
View File

@@ -10,10 +10,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="SimpleToolkit.UI.Models" Version="1.4.0" />
<PackageReference Include="SimpleToolkit.UI.Models" Version="1.6.1" />
</ItemGroup>
<ItemGroup>

2
VDownload.Core/VDownload.Core.Views/Home/HomeDownloadsView.xaml
View File

@@ -46,7 +46,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Image Grid.Column="0"
Source="{Binding Video.ThumbnailUrl}"
Source="{Binding Video.ThumbnailUrl, TargetNullValue={StaticResource ImageOtherThumbnail}}"
VerticalAlignment="Stretch"/>
<Grid Grid.Column="1"
Margin="10"

156
VDownload.Core/VDownload.Core.Views/Home/HomePlaylistView.xaml
View File

@@ -14,7 +14,8 @@
xmlns:ctuc="using:CommunityToolkit.WinUI.UI.Controls"
xmlns:c="using:SimpleToolkit.UI.WinUI.Controls"
mc:Ignorable="d"
Background="{ThemeResource ViewBackgroundColor}">
Background="{ThemeResource ViewBackgroundColor}"
x:Name="Root">
<Grid Padding="15"
RowSpacing="20">
@@ -27,7 +28,6 @@
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0"
VerticalAlignment="Center"
@@ -35,21 +35,128 @@
FontWeight="Bold"
FontSize="20"
TextWrapping="WrapWholeWords"/>
<AppBarToggleButton x:Name="FilterButton"
Grid.Column="2"
Margin="-5"
Icon="Filter"
Width="40"
Height="48">
<AppBarToggleButton.Resources>
<TeachingTip x:Name="FilterWindow"
x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterWindow"
Target="{Binding ElementName=FilterButton}"
IsOpen="{Binding ElementName=FilterButton, Path=IsChecked, Mode=TwoWay}">
<TextBox/>
</TeachingTip>
</AppBarToggleButton.Resources>
</AppBarToggleButton>
<StackPanel Grid.Column="1"
Orientation="Horizontal"
Margin="-5">
<AppBarToggleButton x:Name="FilterButton"
Icon="Filter"
Width="40"
Height="48">
<AppBarToggleButton.Resources>
<TeachingTip x:Name="FilterWindow"
x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterWindow"
Target="{Binding ElementName=FilterButton}"
PreferredPlacement="BottomLeft"
IsOpen="{Binding ElementName=FilterButton, Path=IsChecked, Mode=TwoWay}">
<Grid VerticalAlignment="Top"
Margin="0,10,0,0"
ColumnSpacing="10"
RowSpacing="10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterTitleTextBlock"
Grid.Row="0"
Grid.Column="0"
VerticalAlignment="Center"/>
<TextBox x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterTitleTextBox"
Grid.Row="0"
Grid.Column="1"/>
<TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterAuthorTextBlock"
Grid.Row="1"
Grid.Column="0"
VerticalAlignment="Center"/>
<TextBox x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterAuthorTextBox"
Grid.Row="1"
Grid.Column="1"/>
<TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterViewsTextBlock"
Grid.Row="2"
Grid.Column="0"
VerticalAlignment="Center"/>
<Grid Grid.Row="2"
Grid.Column="1"
ColumnSpacing="5">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<NumberBox Grid.Column="0"
SpinButtonPlacementMode="Compact"/>
<TextBlock Grid.Column="1"
VerticalAlignment="Center"
Text="-"/>
<NumberBox Grid.Column="2"
SpinButtonPlacementMode="Compact"/>
</Grid>
<TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterDateTextBlock"
Grid.Row="3"
Grid.Column="0"
VerticalAlignment="Center"/>
<Grid Grid.Row="3"
Grid.Column="1"
ColumnSpacing="5">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<CalendarDatePicker Grid.Column="0"/>
<TextBlock Grid.Column="1"
VerticalAlignment="Center"
Text="-"/>
<CalendarDatePicker Grid.Column="2"/>
</Grid>
<TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterDurationTextBlock"
Grid.Row="4"
Grid.Column="0"
VerticalAlignment="Center"/>
<Grid Grid.Row="4"
Grid.Column="1"
RowSpacing="5">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<c:TimeSpanControl Grid.Row="0"/>
<c:TimeSpanControl Grid.Row="1"/>
</Grid>
<TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterRemovedTextBlock"
Grid.Row="5"
Grid.Column="0"
VerticalAlignment="Center"/>
<Grid Grid.Row="5"
Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0"
VerticalAlignment="Center"
Text="{Binding RemovedCount}"/>
<Button x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterRemovedButton"
Grid.Column="1"
Command="{Binding RestoreRemovedVideosCommand}"/>
</Grid>
</Grid>
</TeachingTip>
</AppBarToggleButton.Resources>
</AppBarToggleButton>
<AppBarButton x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/ApplyDirectoryButton"
Icon="Folder"
Width="40"
Height="48"
Command="{Binding SelectDirectoryCommand}"/>
</StackPanel>
</Grid>
<ScrollViewer Grid.Row="1">
<ItemsControl ItemsSource="{Binding Videos}">
@@ -67,7 +174,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Image Grid.Column="0"
Source="{Binding ThumbnailUrl}"
Source="{Binding ThumbnailUrl, TargetNullValue={StaticResource ImageOtherThumbnail}}"
Height="100"/>
<Grid Grid.Column="1"
Margin="10"
@@ -144,7 +251,9 @@
Width="40"
Height="48"
Icon="Delete"
VerticalAlignment="Center"/>
VerticalAlignment="Center"
Command="{Binding ElementName=Root, Path=DataContext.RemoveVideoCommand}"
CommandParameter="{Binding}"/>
</Grid>
</Expander.Header>
<Expander.Content>
@@ -273,8 +382,13 @@
</ScrollViewer>
<StackPanel Grid.Row="2"
HorizontalAlignment="Right"
Orientation="Horizontal">
Orientation="Horizontal"
Spacing="10">
<Button x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/CreateAndStartButton"
Command="{Binding CreateTasksAndDownloadCommand}"/>
<Button x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/CreateButton"
Style="{StaticResource AccentButtonStyle}"
Command="{Binding CreateTasksCommand}"/>
</StackPanel>
</Grid>
</Page>

2
VDownload.Core/VDownload.Core.Views/Home/HomeVideoView.xaml
View File

@@ -31,7 +31,7 @@
</Grid.ColumnDefinitions>
<Border Grid.Column="0"
CornerRadius="{ThemeResource ControlCornerRadius}">
<Image Source="{Binding ThumbnailUrl}"
<Image Source="{Binding ThumbnailUrl, TargetNullValue={StaticResource ImageOtherThumbnail}}"
VerticalAlignment="Stretch"/>
</Border>
<StackPanel Grid.Column="1"

9
VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj
View File

@@ -16,12 +16,13 @@
<PackageReference Include="CommunityToolkit.WinUI" Version="7.1.2" />
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.240109" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.240109" />
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
<PackageReference Include="SimpleToolkit.UI.WinUI.Behaviors" Version="1.4.0" />
<PackageReference Include="SimpleToolkit.UI.WinUI.Controls" Version="1.4.0" />
<PackageReference Include="SimpleToolkit.UI.WinUI.Behaviors" Version="1.6.1" />
<PackageReference Include="SimpleToolkit.UI.WinUI.Controls" Version="1.6.1" />
</ItemGroup>
<ItemGroup>

2
VDownload.Models/Video.cs
View File

@@ -16,7 +16,7 @@ namespace VDownload.Models
public DateTime PublishDate { get; set; }
public TimeSpan Duration { get; set; }
public long Views { get; set; }
public Uri ThumbnailUrl { get; set; }
public Uri? ThumbnailUrl { get; set; }
public Uri Url { get; set; }
public ICollection<VideoStream> Streams { get; private set; }
public Source Source { get; protected set; }

4
VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/VDownload.Services.UI.Dialogs.csproj
View File

@@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
</ItemGroup>
</Project>

4
VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.DictionaryResources/VDownload.Services.UI.DictionaryResources.csproj
View File

@@ -10,8 +10,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
</ItemGroup>
<ItemGroup>

4
VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/VDownload.Services.UI.Notifications.csproj
View File

@@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
</ItemGroup>
</Project>

4
VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StoragePicker/VDownload.Services.UI.StoragePicker.csproj
View File

@@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
</ItemGroup>
</Project>

4
VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/VDownload.Services.UI.StringResources.csproj
View File

@@ -10,8 +10,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
</ItemGroup>
<ItemGroup>

4
VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.WebView/VDownload.Services.UI.WebView.csproj
View File

@@ -13,8 +13,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
</ItemGroup>
<ItemGroup>

2
VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Download.cs
View File

@@ -4,7 +4,7 @@ namespace VDownload.Sources.Twitch.Configuration.Models{
public class Download
{
[ConfigurationKeyName("vod")]
public Vod Vod { get; set; }
public DownloadVod Vod { get; set; }
}
}

18
VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/DownloadVod.cs Normal file
View File

@@ -0,0 +1,18 @@
using Microsoft.Extensions.Configuration;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace VDownload.Sources.Twitch.Configuration.Models
{
public class DownloadVod
{
[ConfigurationKeyName("chunk_regex")]
public string ChunkRegex { get; set; }
[ConfigurationKeyName("file_name")]
public string FileName { get; set; }
}
}

2
VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Search.cs
View File

@@ -7,7 +7,7 @@ namespace VDownload.Sources.Twitch.Configuration.Models{
public List<string> GeneralRegexes { get; } = new List<string>();
[ConfigurationKeyName("vod")]
public Vod Vod { get; set; }
public SearchVod Vod { get; set; }
[ConfigurationKeyName("clip")]
public Clip Clip { get; set; }

11
VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/Vod.cs → VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Configuration/Models/SearchVod.cs
View File

@@ -1,7 +1,7 @@
using Microsoft.Extensions.Configuration;
namespace VDownload.Sources.Twitch.Configuration.Models{
public class Vod
public class SearchVod
{
[ConfigurationKeyName("regexes")]
public List<string> Regexes { get; } = new List<string>();
@@ -9,14 +9,11 @@ namespace VDownload.Sources.Twitch.Configuration.Models{
[ConfigurationKeyName("thumbnail")]
public Thumbnail Thumbnail { get; set; }
[ConfigurationKeyName("live_thumbnail_url_regex")]
public string LiveThumbnailUrlRegex { get; set; }
[ConfigurationKeyName("stream_playlist_regex")]
public string StreamPlaylistRegex { get; set; }
[ConfigurationKeyName("chunk_regex")]
public string ChunkRegex { get; set; }
[ConfigurationKeyName("file_name")]
public string FileName { get; set; }
}
}

20
VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch/TwitchSearchService.cs
View File

@@ -19,8 +19,8 @@ namespace VDownload.Sources.Twitch
{
public interface ITwitchSearchService : ISourceSearchService
{
Task<TwitchPlaylist> SearchPlaylist(string url, int maxVideoCount);
Task<TwitchVideo> SearchVideo(string url);
new Task<TwitchPlaylist> SearchPlaylist(string url, int maxVideoCount);
new Task<TwitchVideo> SearchVideo(string url);
}
@@ -120,17 +120,17 @@ namespace VDownload.Sources.Twitch
List<Task<TwitchVod>> tasks = new List<Task<TwitchVod>>();
string? cursor = null;
List<Api.Helix.GetVideos.Response.Data> videosList;
count = count == 0 ? int.MaxValue : count;
int videos = 0;
do
{
videos = count == 0 || count > 100 ? 100 : count;
videos = count > 100 ? 100 : count;
GetVideosResponse videosResponse = await _apiService.HelixGetUserVideos(channel.Id, token, videos, cursor);
videosList = videosResponse.Data;
count -= videosList.Count;
cursor = videosResponse.Pagination.Cursor;
tasks.AddRange(videosList.Select(ParseVod));
}
while (videosList.Count == videos);
while (tasks.Count < count && videosList.Count == videos);
await Task.WhenAll(tasks);
@@ -143,7 +143,13 @@ namespace VDownload.Sources.Twitch
{
Task<IEnumerable<TwitchVodStream>> streamsTask = GetVodStreams(data.Id);
Thumbnail thumbnail = _configurationService.Twitch.Search.Vod.Thumbnail;
Thumbnail thumbnailConfig = _configurationService.Twitch.Search.Vod.Thumbnail;
Regex liveThumbnailRegex = new Regex(_configurationService.Twitch.Search.Vod.LiveThumbnailUrlRegex);
Uri? thumbnail = null;
if (!liveThumbnailRegex.IsMatch(data.ThumbnailUrl))
{
thumbnail = new Uri(data.ThumbnailUrl.Replace("%{width}", thumbnailConfig.Width.ToString()).Replace("%{height}", thumbnailConfig.Height.ToString()));
}
TwitchVod vod = new TwitchVod
{
Title = data.Title,
@@ -152,7 +158,7 @@ namespace VDownload.Sources.Twitch
PublishDate = data.PublishedAt,
Duration = ParseVodDuration(data.Duration),
Views = data.ViewCount,
ThumbnailUrl = new Uri(data.ThumbnailUrl.Replace("%{width}", thumbnail.Width.ToString()).Replace("%{height}", thumbnail.Height.ToString())),
ThumbnailUrl = thumbnail,
Url = new Uri(data.Url),
};

1
VDownload/App.xaml
View File

@@ -12,6 +12,7 @@
<ResourceDictionary Source="Dictionaries/Colors.xaml"/>
<ResourceDictionary Source="Dictionaries/Images/ImagesLogo.xaml"/>
<ResourceDictionary Source="Dictionaries/Images/ImagesSources.xaml"/>
<ResourceDictionary Source="Dictionaries/Images/ImagesOther.xaml"/>
<ResourceDictionary Source="Dictionaries/Images/ImagesBaseView.xaml"/>
<ResourceDictionary Source="Dictionaries/Images/ImagesHomeDownloadsView.xaml"/>
<ResourceDictionary Source="Dictionaries/Images/ImagesHomePlaylistView.xaml"/>

BIN
VDownload/Assets/Other/Thumbnail.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 MiB

6
VDownload/Dictionaries/Images/ImagesOther.xaml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<x:String x:Key="ImageOtherThumbnail">/Assets/Other/Thumbnail.png</x:String>
</ResourceDictionary>

15
VDownload/VDownload.csproj
View File

@@ -145,6 +145,7 @@
<None Remove="Dictionaries\Images\ImagesHomePlaylistView.xaml" />
<None Remove="Dictionaries\Images\ImagesHomeVideoView.xaml" />
<None Remove="Dictionaries\Images\ImagesLogo.xaml" />
<None Remove="Dictionaries\Images\ImagesOther.xaml" />
<None Remove="Dictionaries\Images\ImagesSources.xaml" />
</ItemGroup>
@@ -152,9 +153,9 @@
<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.0.240109" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.240211001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
<PackageReference Include="SimpleToolkit.UI.WinUI.Converters" Version="1.4.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
<PackageReference Include="SimpleToolkit.UI.WinUI.Converters" Version="1.6.1" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>
@@ -184,6 +185,11 @@
<ProjectReference Include="..\VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch\VDownload.Sources.Twitch.csproj" />
<ProjectReference Include="..\VDownload.Sources\VDownload.Sources\VDownload.Sources.csproj" />
</ItemGroup>
<ItemGroup>
<Content Update="Assets\Other\Thumbnail.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<None Update="Assets\BaseView\AuthenticationDark.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -401,6 +407,9 @@
<None Update="configuration.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<Page Update="Dictionaries\Images\ImagesOther.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Update="Dictionaries\Images\ImagesHomePlaylistView.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>

1
VDownload/configuration.json
View File

@@ -148,6 +148,7 @@
"width": 1920,
"height": 1080
},
"live_thumbnail_url_regex": "https:\\/\\/vod-secure\\.twitch\\.tv\\/_404\\/404_processing_%{width}x%{height}\\.png",
"stream_playlist_regex": "#EXT-X-MEDIA:TYPE=VIDEO,GROUP-ID=\"\\w+\",NAME=\"(?<id>.+)\",AUTOSELECT=\\w+,DEFAULT=\\w+\\n#EXT-X-STREAM-INF:BANDWIDTH=\\d+,CODECS=\"(?<video_codec>.+),(?<audio_codec>.+)\",RESOLUTION=(?<width>\\d+)x(?<height>\\d+),VIDEO=\".+\"(?:,FRAME-RATE=(?<framerate>\\d+.\\d+))?\n(?<url>.+)"
},
"clip": {