Skip to content

Commit a0bb502

Browse files
committed
🐻‍❄️ filename template -> output template
Upstream documentation says "output template". Align with upstream so it's easier for users to search in documentation.
1 parent 05777f5 commit a0bb502

File tree

5 files changed

+14
-17
lines changed

5 files changed

+14
-17
lines changed

YoutubeDl.Wpf/Models/BackendInstance.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ public void GenerateDownloadArguments(string playlistItems)
254254
false => _settings.Backend switch
255255
{
256256
BackendTypes.Ytdl => "%(title)s-%(id)s.%(ext)s",
257-
_ => Settings.DefaultCustomFilenameTemplate,
257+
_ => Settings.DefaultCustomOutputTemplate,
258258
},
259259
};
260260

YoutubeDl.Wpf/Models/Settings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class Settings
2525
/// Defines the default custom output filename template.
2626
/// We use yt-dlp's default as the default custom value.
2727
/// </summary>
28-
public const string DefaultCustomFilenameTemplate = "%(title)s [%(id)s].%(ext)s";
28+
public const string DefaultCustomOutputTemplate = "%(title)s [%(id)s].%(ext)s";
2929

3030
/// <summary>
3131
/// Gets or sets the settings version number.
@@ -73,7 +73,7 @@ public class Settings
7373

7474
public bool UseCustomOutputTemplate { get; set; }
7575

76-
public string CustomOutputTemplate { get; set; } = DefaultCustomFilenameTemplate;
76+
public string CustomOutputTemplate { get; set; } = DefaultCustomOutputTemplate;
7777

7878
public string[] OutputTemplateHistory { get; set; } = Array.Empty<string>();
7979

YoutubeDl.Wpf/ViewModels/HomeViewModel.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public class HomeViewModel : ReactiveValidationObject
6363
[Reactive]
6464
public string PlaylistItems { get; set; } = "";
6565

66-
public ReactiveCommand<Unit, Unit> ResetCustomFilenameTemplateCommand { get; }
66+
public ReactiveCommand<Unit, Unit> ResetCustomOutputTemplateCommand { get; }
6767
public ReactiveCommand<Unit, Unit> BrowseDownloadFolderCommand { get; }
6868
public ReactiveCommand<Unit, Unit> OpenDownloadFolderCommand { get; }
6969
public ReactiveCommand<string, Unit> StartDownloadCommand { get; }
@@ -165,10 +165,10 @@ public HomeViewModel(ObservableSettings settings, BackendService backendService,
165165
.ObserveOn(RxApp.MainThreadScheduler)
166166
.Subscribe(_ => GenerateGlobalArguments());
167167

168-
var canResetCustomFilenameTemplate = this.WhenAnyValue(
168+
var canResetCustomOutputTemplate = this.WhenAnyValue(
169169
x => x.SharedSettings.UseCustomOutputTemplate,
170170
x => x.SharedSettings.CustomOutputTemplate,
171-
(useTemplate, template) => useTemplate && template != Settings.DefaultCustomFilenameTemplate);
171+
(useTemplate, template) => useTemplate && template != Settings.DefaultCustomOutputTemplate);
172172

173173
var canBrowseDownloadFolder = this.WhenAnyValue(x => x.SharedSettings.UseCustomPath);
174174

@@ -202,7 +202,7 @@ public HomeViewModel(ObservableSettings settings, BackendService backendService,
202202
x => x.SharedSettings.SelectedPreset,
203203
selectedPreset => selectedPreset is not null && selectedPreset != Preset.Auto);
204204

205-
ResetCustomFilenameTemplateCommand = ReactiveCommand.Create(ResetCustomFilenameTemplate, canResetCustomFilenameTemplate);
205+
ResetCustomOutputTemplateCommand = ReactiveCommand.Create(ResetCustomOutputTemplate, canResetCustomOutputTemplate);
206206
BrowseDownloadFolderCommand = ReactiveCommand.Create(BrowseDownloadFolder, canBrowseDownloadFolder);
207207
OpenDownloadFolderCommand = ReactiveCommand.Create(OpenDownloadFolder, canOpenDownloadFolder);
208208
StartDownloadCommand = ReactiveCommand.CreateFromTask<string>(StartDownloadAsync, canRun);
@@ -303,10 +303,7 @@ private void AddArgument(string argument)
303303
DownloadArguments.Insert(DownloadArguments.Count - 1, new ArgumentChipViewModel(backendArgument, true, DeleteArgumentChip));
304304
}
305305

306-
private void ResetCustomFilenameTemplate()
307-
{
308-
SharedSettings.CustomOutputTemplate = Settings.DefaultCustomFilenameTemplate;
309-
}
306+
private void ResetCustomOutputTemplate() => SharedSettings.CustomOutputTemplate = Settings.DefaultCustomOutputTemplate;
310307

311308
private void BrowseDownloadFolder()
312309
{

YoutubeDl.Wpf/Views/HomeView.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@
157157
materialDesign:HintAssist.Hint="Items (optional)"/>
158158
</StackPanel>
159159
<StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="1">
160-
<ToggleButton x:Name="filenameTemplateToggle"
160+
<ToggleButton x:Name="outputTemplateToggle"
161161
Margin="4"/>
162-
<TextBlock VerticalAlignment="Center" Margin="4">Custom filename template</TextBlock>
162+
<TextBlock VerticalAlignment="Center" Margin="4">Custom output template</TextBlock>
163163
<ComboBox x:Name="outputTemplateComboBox"
164164
IsEditable="True"
165165
IsReadOnly="False"
@@ -173,7 +173,7 @@
173173
</ItemsPanelTemplate>
174174
</ComboBox.ItemsPanel>
175175
</ComboBox>
176-
<Button x:Name="resetFilenameTemplateButton"
176+
<Button x:Name="resetOutputTemplateButton"
177177
Margin="4"
178178
Style="{StaticResource MaterialDesignFlatButton}"
179179
Content="Reset"/>

YoutubeDl.Wpf/Views/HomeView.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public HomeView()
128128
// Options row 2
129129
this.Bind(ViewModel,
130130
viewModel => viewModel.SharedSettings.UseCustomOutputTemplate,
131-
view => view.filenameTemplateToggle.IsChecked)
131+
view => view.outputTemplateToggle.IsChecked)
132132
.DisposeWith(disposables);
133133

134134
this.OneWayBind(ViewModel,
@@ -215,8 +215,8 @@ public HomeView()
215215

216216
// Reset custom filename template button
217217
this.BindCommand(ViewModel,
218-
viewModel => viewModel.ResetCustomFilenameTemplateCommand,
219-
view => view.resetFilenameTemplateButton)
218+
viewModel => viewModel.ResetCustomOutputTemplateCommand,
219+
view => view.resetOutputTemplateButton)
220220
.DisposeWith(disposables);
221221

222222
// Custom preset buttons

0 commit comments

Comments
 (0)