Skip to content

Commit

Permalink
...
Browse files Browse the repository at this point in the history
  • Loading branch information
zamgi authored and zamgi committed Jan 10, 2025
1 parent f1b3644 commit 6c936a0
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 12 deletions.
14 changes: 13 additions & 1 deletion m3u8.download.manager/Avalonia/Properties/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion m3u8.download.manager/Avalonia/Properties/Settings.settings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,9 @@
<Setting Name="ShowAllDownloadsCompleted_Notification" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>

<Setting Name="LogUC_RowDefinition_Height" Type="System.Nullable&lt;System.Double&gt;" Scope="User" />
<Setting Name="LastChangeOutputDirectory" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
</Settings>
</SettingsFile>
5 changes: 2 additions & 3 deletions m3u8.download.manager/Avalonia/View/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1239,7 +1239,6 @@ private async void downloadListUC_OutputDirectoryClick( DownloadRow row )
#endregion
}

private string _Last_ChangeOutputDirectory;
private async void changeOutputDirectoryMenuItem_Click( object sender, EventArgs e )
{
var rows = downloadListUC.GetSelectedDownloadRows();
Expand All @@ -1258,7 +1257,7 @@ private async void changeOutputDirectoryMenuItem_Click( object sender, EventArgs
var outputDirectory = sf[ 0 ].Path.LocalPath.ToString();
if ( !outputDirectory.IsNullOrWhiteSpace() )
{
_Last_ChangeOutputDirectory = outputDirectory;
_VM.SettingsController.Settings.LastChangeOutputDirectory = outputDirectory;
foreach ( var row in rows )
{
await ChangeOutputDirectory( row, outputDirectory );
Expand All @@ -1282,7 +1281,7 @@ private async void changeOutputDirectoryMenuItem_Click( object sender, EventArgs
#endregion
}
}
private string GetSelectedDirectory( DownloadRow row ) => FileHelper.GetFirstExistsDirectory( _Last_ChangeOutputDirectory ) ?? row.OutputDirectory;
private string GetSelectedDirectory( DownloadRow row ) => FileHelper.GetFirstExistsDirectory( _VM.SettingsController.Settings.LastChangeOutputDirectory ) ?? row.OutputDirectory;
private Task ChangeOutputFileName( DownloadRow row, string outputFileName ) => ChangeOutputFileName_Or_OutputDirectory( row, outputFileName, change_outputDirectory: false );
private Task ChangeOutputDirectory( DownloadRow row, string outputDirectory ) => ChangeOutputFileName_Or_OutputDirectory( row, outputDirectory, change_outputDirectory: true );
private async Task ChangeOutputFileName_Or_OutputDirectory( DownloadRow row, string outputFileName_or_outputDirectory, bool change_outputDirectory )
Expand Down
14 changes: 13 additions & 1 deletion m3u8.download.manager/WinForms/Properties/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions m3u8.download.manager/WinForms/Properties/Settings.settings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,8 @@
<Setting Name="ShowAllDownloadsCompleted_Notification" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="LastChangeOutputDirectory" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
</Settings>
</SettingsFile>
7 changes: 3 additions & 4 deletions m3u8.download.manager/WinForms/UI/Forms/MainForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1428,13 +1428,12 @@ private void downloadListUC_OutputDirectoryClick( DownloadRow row )
{
if ( DirectorySelectDialog.Show( this, _SC.Settings.UseDirectorySelectDialogModern, GetSelectedDirectory( row ), $"Select output directory for file: '{row.OutputFileName}'", out var outputDirectory ) )
{
_Last_ChangeOutputDirectory = outputDirectory;
_SC.Settings.LastChangeOutputDirectory = outputDirectory;
ChangeOutputDirectory( row, outputDirectory );
downloadListUC.Invalidate( true );
}
}

private string _Last_ChangeOutputDirectory;
private void changeOutputDirectoryMenuItem_Click( object sender, EventArgs e )
{
var rows = downloadListUC.GetSelectedDownloadRows();
Expand All @@ -1444,7 +1443,7 @@ private void changeOutputDirectoryMenuItem_Click( object sender, EventArgs e )
var descr = (rows.Count == 1) ? $"Select output directory for file: '{first_row.OutputFileName}'" : $"Select output directory for {rows.Count} files";
if ( DirectorySelectDialog.Show( this, _SC.Settings.UseDirectorySelectDialogModern, GetSelectedDirectory( first_row ), descr, out var outputDirectory ) )
{
_Last_ChangeOutputDirectory = outputDirectory;
_SC.Settings.LastChangeOutputDirectory = outputDirectory;
foreach ( var row in rows )
{
ChangeOutputDirectory( row, outputDirectory );
Expand All @@ -1453,7 +1452,7 @@ private void changeOutputDirectoryMenuItem_Click( object sender, EventArgs e )
}
}
}
private string GetSelectedDirectory( DownloadRow row ) => FileHelper.GetFirstExistsDirectory( _Last_ChangeOutputDirectory ) ?? row.OutputDirectory;
private string GetSelectedDirectory( DownloadRow row ) => FileHelper.GetFirstExistsDirectory( _SC.Settings.LastChangeOutputDirectory ) ?? row.OutputDirectory;

private void ChangeOutputFileName( DownloadRow row, string outputFileName ) => ChangeOutputFileName_Or_OutputDirectory( row, outputFileName, change_outputDirectory: false );
private void ChangeOutputDirectory( DownloadRow row, string outputDirectory ) => ChangeOutputFileName_Or_OutputDirectory( row, outputDirectory, change_outputDirectory: true );
Expand Down
3 changes: 1 addition & 2 deletions m3u8.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "m3u8-firefox-extension", "m
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_xpi", "_xpi", "{3C43194B-AA3D-4916-A292-FB9E65955B11}"
ProjectSection(SolutionItems) = preProject
m3u8-browser-extensions\m3u8-firefox-extension\_xpi\m3u8_file_downloader-1.5-fx.xpi = m3u8-browser-extensions\m3u8-firefox-extension\_xpi\m3u8_file_downloader-1.5-fx.xpi
m3u8-browser-extensions\m3u8-firefox-extension\_xpi\m3u8_file_downloader-1.6.xpi = m3u8-browser-extensions\m3u8-firefox-extension\_xpi\m3u8_file_downloader-1.6.xpi
m3u8-browser-extensions\m3u8-firefox-extension\_xpi\m3u8_file_downloader-1.8.xpi = m3u8-browser-extensions\m3u8-firefox-extension\_xpi\m3u8_file_downloader-1.8.xpi
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "m3u8.downloader.host", "m3u8.downloader.host", "{4A091DFF-C923-491B-B4C4-2762163EE716}"
Expand Down

0 comments on commit 6c936a0

Please sign in to comment.