alfred/YTDLNetFrontEnd
1
0
Fork 0
Code Issues Pull Requests Releases 5 Activity

Update to 0.4.0.0.

Browse Source 
Add support for adding extra arguments.
This commit is contained in:
Captain ALM 2022-07-19 21:42:46 +01:00
parent 45866fbb18
commit 78575a2bec
Signed by: alfred
GPG Key ID: 4E4ADD02609997B1
4 changed files with 74 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
YTDLNetFrontEnd/YTDLNetFrontEnd/Main.Designer.cs generated
View File

@ -30,15 +30,17 @@
{ {
this.tableLayoutPanelMain = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanelMain = new System.Windows.Forms.TableLayoutPanel();
this.tableLayoutPanelEntry = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanelEntry = new System.Windows.Forms.TableLayoutPanel();
this.buttonSaveTo = new System.Windows.Forms.Button();
this.textBoxSaveDir = new System.Windows.Forms.TextBox();
this.textBoxEntry = new System.Windows.Forms.TextBox(); this.textBoxEntry = new System.Windows.Forms.TextBox();
this.buttonGo = new System.Windows.Forms.Button(); this.buttonGo = new System.Windows.Forms.Button();
this.textBoxOutput = new System.Windows.Forms.TextBox(); this.textBoxOutput = new System.Windows.Forms.TextBox();
this.buttonInstall = new System.Windows.Forms.Button(); this.buttonInstall = new System.Windows.Forms.Button();
this.buttonExit = new System.Windows.Forms.Button(); this.buttonExit = new System.Windows.Forms.Button();
this.backgroundWorkerMain = new System.ComponentModel.BackgroundWorker(); this.backgroundWorkerMain = new System.ComponentModel.BackgroundWorker();
this.textBoxSaveDir = new System.Windows.Forms.TextBox();
this.buttonSaveTo = new System.Windows.Forms.Button();
this.folderBrowserDialogMain = new System.Windows.Forms.FolderBrowserDialog(); this.folderBrowserDialogMain = new System.Windows.Forms.FolderBrowserDialog();
this.textBoxExtraArgs = new System.Windows.Forms.TextBox();
this.labelExtraArgs = new System.Windows.Forms.Label();
this.tableLayoutPanelMain.SuspendLayout(); this.tableLayoutPanelMain.SuspendLayout();
this.tableLayoutPanelEntry.SuspendLayout(); this.tableLayoutPanelEntry.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
@ -56,11 +58,12 @@
this.tableLayoutPanelMain.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanelMain.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanelMain.Margin = new System.Windows.Forms.Padding(1); this.tableLayoutPanelMain.Margin = new System.Windows.Forms.Padding(1);
this.tableLayoutPanelMain.Name = "tableLayoutPanelMain"; this.tableLayoutPanelMain.Name = "tableLayoutPanelMain";
this.tableLayoutPanelMain.RowCount = 4; this.tableLayoutPanelMain.RowCount = 5;
this.tableLayoutPanelMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 15F)); this.tableLayoutPanelMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
this.tableLayoutPanelMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 15F)); this.tableLayoutPanelMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
this.tableLayoutPanelMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 15F)); this.tableLayoutPanelMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
this.tableLayoutPanelMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 55F)); this.tableLayoutPanelMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
this.tableLayoutPanelMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanelMain.Size = new System.Drawing.Size(284, 161); this.tableLayoutPanelMain.Size = new System.Drawing.Size(284, 161);
this.tableLayoutPanelMain.TabIndex = 0; this.tableLayoutPanelMain.TabIndex = 0;
// //
@ -70,25 +73,49 @@
this.tableLayoutPanelMain.SetColumnSpan(this.tableLayoutPanelEntry, 2); this.tableLayoutPanelMain.SetColumnSpan(this.tableLayoutPanelEntry, 2);
this.tableLayoutPanelEntry.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 75F)); this.tableLayoutPanelEntry.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 75F));
this.tableLayoutPanelEntry.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanelEntry.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.tableLayoutPanelEntry.Controls.Add(this.textBoxExtraArgs, 0, 2);
this.tableLayoutPanelEntry.Controls.Add(this.buttonSaveTo, 1, 1); this.tableLayoutPanelEntry.Controls.Add(this.buttonSaveTo, 1, 1);
this.tableLayoutPanelEntry.Controls.Add(this.textBoxSaveDir, 0, 1); this.tableLayoutPanelEntry.Controls.Add(this.textBoxSaveDir, 0, 1);
this.tableLayoutPanelEntry.Controls.Add(this.textBoxEntry, 0, 0); this.tableLayoutPanelEntry.Controls.Add(this.textBoxEntry, 0, 0);
this.tableLayoutPanelEntry.Controls.Add(this.buttonGo, 1, 0); this.tableLayoutPanelEntry.Controls.Add(this.buttonGo, 1, 0);
this.tableLayoutPanelEntry.Controls.Add(this.labelExtraArgs, 1, 2);
this.tableLayoutPanelEntry.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanelEntry.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanelEntry.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanelEntry.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanelEntry.Margin = new System.Windows.Forms.Padding(0); this.tableLayoutPanelEntry.Margin = new System.Windows.Forms.Padding(0);
this.tableLayoutPanelEntry.Name = "tableLayoutPanelEntry"; this.tableLayoutPanelEntry.Name = "tableLayoutPanelEntry";
this.tableLayoutPanelEntry.RowCount = 2; this.tableLayoutPanelEntry.RowCount = 3;
this.tableLayoutPanelMain.SetRowSpan(this.tableLayoutPanelEntry, 2); this.tableLayoutPanelMain.SetRowSpan(this.tableLayoutPanelEntry, 3);
this.tableLayoutPanelEntry.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanelEntry.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanelEntry.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanelEntry.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33334F));
this.tableLayoutPanelEntry.Size = new System.Drawing.Size(284, 48); this.tableLayoutPanelEntry.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33334F));
this.tableLayoutPanelEntry.Size = new System.Drawing.Size(284, 60);
this.tableLayoutPanelEntry.TabIndex = 0; this.tableLayoutPanelEntry.TabIndex = 0;
// //
// buttonSaveTo
//
this.buttonSaveTo.Dock = System.Windows.Forms.DockStyle.Fill;
this.buttonSaveTo.Location = new System.Drawing.Point(213, 19);
this.buttonSaveTo.Margin = new System.Windows.Forms.Padding(0);
this.buttonSaveTo.Name = "buttonSaveTo";
this.buttonSaveTo.Size = new System.Drawing.Size(71, 20);
this.buttonSaveTo.TabIndex = 3;
this.buttonSaveTo.Text = "Save To...";
this.buttonSaveTo.UseVisualStyleBackColor = true;
this.buttonSaveTo.Click += new System.EventHandler(this.buttonSaveTo_Click);
//
// textBoxSaveDir
//
this.textBoxSaveDir.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.textBoxSaveDir.Location = new System.Drawing.Point(0, 19);
this.textBoxSaveDir.Margin = new System.Windows.Forms.Padding(0);
this.textBoxSaveDir.Name = "textBoxSaveDir";
this.textBoxSaveDir.Size = new System.Drawing.Size(213, 20);
this.textBoxSaveDir.TabIndex = 2;
//
// textBoxEntry // textBoxEntry
// //
this.textBoxEntry.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.textBoxEntry.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.textBoxEntry.Location = new System.Drawing.Point(0, 2); this.textBoxEntry.Location = new System.Drawing.Point(0, 0);
this.textBoxEntry.Margin = new System.Windows.Forms.Padding(0); this.textBoxEntry.Margin = new System.Windows.Forms.Padding(0);
this.textBoxEntry.Name = "textBoxEntry"; this.textBoxEntry.Name = "textBoxEntry";
this.textBoxEntry.Size = new System.Drawing.Size(213, 20); this.textBoxEntry.Size = new System.Drawing.Size(213, 20);
@ -100,7 +127,7 @@
this.buttonGo.Location = new System.Drawing.Point(213, 0); this.buttonGo.Location = new System.Drawing.Point(213, 0);
this.buttonGo.Margin = new System.Windows.Forms.Padding(0); this.buttonGo.Margin = new System.Windows.Forms.Padding(0);
this.buttonGo.Name = "buttonGo"; this.buttonGo.Name = "buttonGo";
this.buttonGo.Size = new System.Drawing.Size(71, 24); this.buttonGo.Size = new System.Drawing.Size(71, 19);
this.buttonGo.TabIndex = 1; this.buttonGo.TabIndex = 1;
this.buttonGo.Text = "Go!"; this.buttonGo.Text = "Go!";
this.buttonGo.UseVisualStyleBackColor = true; this.buttonGo.UseVisualStyleBackColor = true;
@ -110,23 +137,23 @@
// //
this.tableLayoutPanelMain.SetColumnSpan(this.textBoxOutput, 2); this.tableLayoutPanelMain.SetColumnSpan(this.textBoxOutput, 2);
this.textBoxOutput.Dock = System.Windows.Forms.DockStyle.Fill; this.textBoxOutput.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBoxOutput.Location = new System.Drawing.Point(1, 73); this.textBoxOutput.Location = new System.Drawing.Point(1, 81);
this.textBoxOutput.Margin = new System.Windows.Forms.Padding(1); this.textBoxOutput.Margin = new System.Windows.Forms.Padding(1);
this.textBoxOutput.Multiline = true; this.textBoxOutput.Multiline = true;
this.textBoxOutput.Name = "textBoxOutput"; this.textBoxOutput.Name = "textBoxOutput";
this.textBoxOutput.ReadOnly = true; this.textBoxOutput.ReadOnly = true;
this.textBoxOutput.ScrollBars = System.Windows.Forms.ScrollBars.Both; this.textBoxOutput.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.textBoxOutput.Size = new System.Drawing.Size(282, 87); this.textBoxOutput.Size = new System.Drawing.Size(282, 79);
this.textBoxOutput.TabIndex = 4; this.textBoxOutput.TabIndex = 4;
this.textBoxOutput.WordWrap = false; this.textBoxOutput.WordWrap = false;
// //
// buttonInstall // buttonInstall
// //
this.buttonInstall.Dock = System.Windows.Forms.DockStyle.Fill; this.buttonInstall.Dock = System.Windows.Forms.DockStyle.Fill;
this.buttonInstall.Location = new System.Drawing.Point(0, 48); this.buttonInstall.Location = new System.Drawing.Point(0, 60);
this.buttonInstall.Margin = new System.Windows.Forms.Padding(0); this.buttonInstall.Margin = new System.Windows.Forms.Padding(0);
this.buttonInstall.Name = "buttonInstall"; this.buttonInstall.Name = "buttonInstall";
this.buttonInstall.Size = new System.Drawing.Size(142, 24); this.buttonInstall.Size = new System.Drawing.Size(142, 20);
this.buttonInstall.TabIndex = 2; this.buttonInstall.TabIndex = 2;
this.buttonInstall.Text = "Install"; this.buttonInstall.Text = "Install";
this.buttonInstall.UseVisualStyleBackColor = true; this.buttonInstall.UseVisualStyleBackColor = true;
@ -135,10 +162,10 @@
// buttonExit // buttonExit
// //
this.buttonExit.Dock = System.Windows.Forms.DockStyle.Fill; this.buttonExit.Dock = System.Windows.Forms.DockStyle.Fill;
this.buttonExit.Location = new System.Drawing.Point(142, 48); this.buttonExit.Location = new System.Drawing.Point(142, 60);
this.buttonExit.Margin = new System.Windows.Forms.Padding(0); this.buttonExit.Margin = new System.Windows.Forms.Padding(0);
this.buttonExit.Name = "buttonExit"; this.buttonExit.Name = "buttonExit";
this.buttonExit.Size = new System.Drawing.Size(142, 24); this.buttonExit.Size = new System.Drawing.Size(142, 20);
this.buttonExit.TabIndex = 3; this.buttonExit.TabIndex = 3;
this.buttonExit.Text = "Exit"; this.buttonExit.Text = "Exit";
this.buttonExit.UseVisualStyleBackColor = true; this.buttonExit.UseVisualStyleBackColor = true;
@ -148,26 +175,24 @@
// //
this.backgroundWorkerMain.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorkerMain_DoWork); this.backgroundWorkerMain.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorkerMain_DoWork);
// //
// textBoxSaveDir // textBoxExtraArgs
// //
this.textBoxSaveDir.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.textBoxExtraArgs.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.textBoxSaveDir.Location = new System.Drawing.Point(0, 26); this.textBoxExtraArgs.Location = new System.Drawing.Point(0, 39);
this.textBoxSaveDir.Margin = new System.Windows.Forms.Padding(0); this.textBoxExtraArgs.Margin = new System.Windows.Forms.Padding(0);
this.textBoxSaveDir.Name = "textBoxSaveDir"; this.textBoxExtraArgs.Name = "textBoxExtraArgs";
this.textBoxSaveDir.Size = new System.Drawing.Size(213, 20); this.textBoxExtraArgs.Size = new System.Drawing.Size(213, 20);
this.textBoxSaveDir.TabIndex = 2; this.textBoxExtraArgs.TabIndex = 4;
// //
// buttonSaveTo // labelExtraArgs
// //
this.buttonSaveTo.Dock = System.Windows.Forms.DockStyle.Fill; this.labelExtraArgs.Dock = System.Windows.Forms.DockStyle.Fill;
this.buttonSaveTo.Location = new System.Drawing.Point(213, 24); this.labelExtraArgs.Location = new System.Drawing.Point(216, 39);
this.buttonSaveTo.Margin = new System.Windows.Forms.Padding(0); this.labelExtraArgs.Name = "labelExtraArgs";
this.buttonSaveTo.Name = "buttonSaveTo"; this.labelExtraArgs.Size = new System.Drawing.Size(65, 21);
this.buttonSaveTo.Size = new System.Drawing.Size(71, 24); this.labelExtraArgs.TabIndex = 5;
this.buttonSaveTo.TabIndex = 3; this.labelExtraArgs.Text = ": Extra Args";
this.buttonSaveTo.Text = "Save To..."; this.labelExtraArgs.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.buttonSaveTo.UseVisualStyleBackColor = true;
this.buttonSaveTo.Click += new System.EventHandler(this.buttonSaveTo_Click);
// //
// Main // Main
// //
@ -202,6 +227,8 @@
private System.Windows.Forms.TextBox textBoxSaveDir; private System.Windows.Forms.TextBox textBoxSaveDir;
private System.Windows.Forms.Button buttonSaveTo; private System.Windows.Forms.Button buttonSaveTo;
private System.Windows.Forms.FolderBrowserDialog folderBrowserDialogMain; private System.Windows.Forms.FolderBrowserDialog folderBrowserDialogMain;
private System.Windows.Forms.TextBox textBoxExtraArgs;
private System.Windows.Forms.Label labelExtraArgs;
} }
} }

7
YTDLNetFrontEnd/YTDLNetFrontEnd/Main.cs
View File

@ -130,15 +130,20 @@ namespace com.captainalm.YTDLNetFrontEnd
} }
var theTarget = ""; var theTarget = "";
var extraArgs = "";
this.Invoke(new Action(() => this.Invoke(new Action(() =>
{ {
theTarget = textBoxEntry.Text; theTarget = textBoxEntry.Text;
extraArgs = textBoxExtraArgs.Text;
textBoxEntry.Text = ""; textBoxEntry.Text = "";
textBoxOutput.AppendText("Downloading: " + theTarget + Environment.NewLine); textBoxOutput.AppendText("Downloading: " + theTarget + Environment.NewLine);
if (!extraArgs.Equals("")) {
textBoxOutput.AppendText("Extra Arguments: " + extraArgs + Environment.NewLine);
}
})); }));
theProcess = YTDL.executeApplication(theTarget); theProcess = YTDL.executeApplication(theTarget, extraArgs);
if (theProcess != null) if (theProcess != null)
{ {
theProcess.addOuputReceiver(new OutputReceiverTextbox(textBoxOutput)); theProcess.addOuputReceiver(new OutputReceiverTextbox(textBoxOutput));

4
YTDLNetFrontEnd/YTDLNetFrontEnd/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.3.0.1")] [assembly: AssemblyVersion("0.4.0.0")]
[assembly: AssemblyFileVersion("0.3.0.1")] [assembly: AssemblyFileVersion("0.4.0.0")]

4
YTDLNetFrontEnd/YTDLNetFrontEnd/YTDL.cs
View File

@ -13,7 +13,7 @@ namespace com.captainalm.YTDLNetFrontEnd
{ {
private static string[] pathLocs = Environment.GetEnvironmentVariable("PATH").Split(";".ToCharArray(), StringSplitOptions.RemoveEmptyEntries); private static string[] pathLocs = Environment.GetEnvironmentVariable("PATH").Split(";".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
public static MonitorableProcess executeApplication(string target) public static MonitorableProcess executeApplication(string target, string extra)
{ {
var packageName = ""; var packageName = "";
switch (getInstalled()) switch (getInstalled())
@ -28,7 +28,7 @@ namespace com.captainalm.YTDLNetFrontEnd
return null; return null;
} }
var pyProSet = new ProcessStartInfo(findExecutableInPath("python"), "-m " + packageName + " --hls-prefer-native " + var pyProSet = new ProcessStartInfo(findExecutableInPath("python"), "-m " + packageName + " --hls-prefer-native " +
((getInstalled() == ApplicationType.YT_DLP) ? "-N 16 " : "") + "\"" + target + "\"") ((getInstalled() == ApplicationType.YT_DLP) ? "-N 16 " : "") + "\"" + target + "\"" + (extra.Equals("") ? "" : " " + extra))
{ UseShellExecute = false, CreateNoWindow = true, RedirectStandardOutput = true, RedirectStandardError = true, StandardOutputEncoding = Encoding.UTF8, StandardErrorEncoding = Encoding.UTF8 }; { UseShellExecute = false, CreateNoWindow = true, RedirectStandardOutput = true, RedirectStandardError = true, StandardOutputEncoding = Encoding.UTF8, StandardErrorEncoding = Encoding.UTF8 };
return new MonitorableProcess(pyProSet); return new MonitorableProcess(pyProSet);
} }