linus/mpv.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-

Browse Source
This commit is contained in:
Frank Skare
2019-03-25 23:25:51 +01:00
parent 07b6d4379e
commit 77ba7f105c
22 changed files with 114 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mpv.net/Addon.cs
View File

@@ -5,8 +5,6 @@ using System.ComponentModel.Composition.Hosting;
using System.IO;
using System.Windows.Forms;
using static mpvnet.StaticUsing;
namespace mpvnet
{
public class Addon
@@ -42,7 +40,7 @@ namespace mpvnet
}
catch (Exception e)
{
MsgError(e.ToString());
MainForm.Instance.ShowMsgBox(e.ToString(), MessageBoxIcon.Error);
}
}
}

11
mpv.net/Command.cs
View File

@@ -5,8 +5,6 @@ using System.IO;
using System.Reflection;
using System.Windows.Forms;
using static mpvnet.StaticUsing;
namespace mpvnet
{
public class Command
@@ -72,12 +70,7 @@ namespace mpvnet
public static void show_conf_editor(string[] args)
{
using (var p = new Process())
{
p.StartInfo.FileName = Application.StartupPath + "\\mpvSettingsEditor.exe";
p.StartInfo.WorkingDirectory = Path.GetDirectoryName(Application.ExecutablePath);
p.Start();
}
Process.Start(Application.StartupPath + "\\mpvSettingsEditor.exe");
}
public static void history(string[] args)
@@ -87,7 +80,7 @@ namespace mpvnet
if (File.Exists(fp))
Process.Start(fp);
else
if (MsgQuestion("Create history.txt file in config folder?\n\nmpv.net will write the date, time and filename of opened files to it.") == DialogResult.OK)
if (MainForm.Instance.ShowMsgBox("Create history.txt file in config folder?\n\nmpv.net will write the date, time and filename of opened files to it.", MessageBoxIcon.Question) == DialogResult.OK)
File.WriteAllText(fp, "");
}

30
mpv.net/MainForm.cs
View File

@@ -5,10 +5,7 @@ using System.Runtime.InteropServices;
using System.Threading;
using System.Windows.Forms;
using System.Diagnostics;
using static mpvnet.StaticUsing;
using System.Linq;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace mpvnet
{
@@ -46,7 +43,7 @@ namespace mpvnet
}
catch (Exception e)
{
MsgError(e.ToString());
MainForm.Instance.ShowMsgBox(e.ToString(), MessageBoxIcon.Error);
}
}
@@ -139,20 +136,15 @@ namespace mpvnet
public void BuildMenu()
{
foreach (var i in File.ReadAllText(mp.InputConfPath).SplitLinesNoEmpty())
foreach (var i in File.ReadAllText(mp.InputConfPath).Split("\r\n".ToCharArray(), StringSplitOptions.RemoveEmptyEntries))
{
if (!i.Contains("#menu:"))
continue;
var left = i.Left("#menu:").Trim();
if (left.StartsWith("#"))
continue;
var cmd = left.Right(" ").Trim();
var menu = i.Right("#menu:").Trim();
var key = menu.Left(";").Trim();
var path = menu.Right(";").Trim();
if (!i.Contains("#menu:")) continue;
var left = i.Substring(0, i.IndexOf("#menu:")).Trim();
if (left.StartsWith("#")) continue;
var cmd = left.Substring(left.IndexOf(" ") + 1).Trim();
var menu = i.Substring(i.IndexOf("#menu:") + "#menu:".Length).Trim();
var key = menu.Substring(0, menu.IndexOf(";")).Trim();
var path = menu.Substring(menu.IndexOf(";") + 1).Trim();
if (path == "" || cmd == "")
continue;
@@ -164,7 +156,7 @@ namespace mpvnet
}
catch (Exception e)
{
MsgError(e.ToString());
MainForm.Instance.ShowMsgBox(e.ToString(), MessageBoxIcon.Error);
}
});
@@ -206,7 +198,7 @@ namespace mpvnet
private void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
{
MsgError(e.Exception.ToString());
ShowMsgBox(e.Exception.ToString(), MessageBoxIcon.Error);
}
private void mp_VideoSizeChanged()

18
mpv.net/Misc.cs
View File

@@ -27,24 +27,6 @@ namespace mpvnet
int IComparer<string>.Compare(string x, string y) => IComparerOfString_Compare(x, y);
}
public class StaticUsing
{
public static void MsgInfo(string message)
{
MessageBox.Show(message, Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Information);
}
public static void MsgError(string message)
{
MessageBox.Show(message, Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
}
public static DialogResult MsgQuestion(string message)
{
return MessageBox.Show(message, Application.ProductName, MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
}
}
//public class OSVersion
//{
// public static float Windows7 { get; set; } = 6.1f;

7
mpv.net/PowerShellScript.cs
View File

@@ -2,10 +2,9 @@
using System.IO;
using System.Threading;
using System.Management.Automation.Runspaces;
using static mpvnet.StaticUsing;
using System.Reflection;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace mpvnet
{
@@ -50,10 +49,10 @@ Using namespace System;
}
catch
{
MsgError("PowerShell Setup Problem\r\n\r\nEnsure you have at least PowerShell 5.1 installed.");
MainForm.Instance.ShowMsgBox("PowerShell Setup Problem\n\nEnsure you have at least PowerShell 5.1 installed.", MessageBoxIcon.Error);
return null;
}
MsgError(ex.ToString());
MainForm.Instance.ShowMsgBox(ex.ToString(), MessageBoxIcon.Error);
}
}
}

4
mpv.net/PythonScript.cs
View File

@@ -1,9 +1,9 @@
using System;
using System.Reflection;
using System.Windows.Forms;
using IronPython.Hosting;
using Microsoft.Scripting.Hosting;
using static mpvnet.StaticUsing;
using PyRT = IronPython.Runtime;
namespace mpvnet
@@ -27,7 +27,7 @@ namespace mpvnet
}
catch (Exception ex)
{
MsgError(ex.ToString());
MainForm.Instance.ShowMsgBox(ex.ToString(), MessageBoxIcon.Error);
}
}
}

120
mpv.net/StringExtensions.cs
View File

@@ -1,120 +0,0 @@
using System;
using System.Linq;
using System.IO;
public static class StringExtensions
{
public static string ExtFull(this string filepath)
{
return Ext(filepath, true);
}
public static string Ext(this string filepath)
{
return Ext(filepath, false);
}
public static string Ext(this string filepath, bool dot)
{
if (string.IsNullOrEmpty(filepath))
return "";
var chars = filepath.ToCharArray();
for (var x = filepath.Length - 1; x >= 0; x += -1)
{
if (chars[x] == Path.DirectorySeparatorChar)
return "";
if (chars[x] == '.')
return filepath.Substring(x + (dot ? 0 : 1)).ToLower();
}
return "";
}
public static string Left(this string value, int index)
{
if (string.IsNullOrEmpty(value) || index < 0)
return "";
if (index > value.Length)
return value;
return value.Substring(0, index);
}
public static string Left(this string value, string start)
{
if (string.IsNullOrEmpty(value) || string.IsNullOrEmpty(start))
return "";
if (!value.Contains(start))
return "";
return value.Substring(0, value.IndexOf(start));
}
public static string LeftLast(this string value, string start)
{
if (!value.Contains(start))
return "";
return value.Substring(0, value.LastIndexOf(start));
}
public static string Right(this string value, string start)
{
if (string.IsNullOrEmpty(value) || string.IsNullOrEmpty(start))
return "";
if (!value.Contains(start))
return "";
return value.Substring(value.IndexOf(start) + start.Length);
}
public static string RightLast(this string value, string start)
{
if (string.IsNullOrEmpty(value) || string.IsNullOrEmpty(start))
return "";
if (!value.Contains(start))
return "";
return value.Substring(value.LastIndexOf(start) + start.Length);
}
public static string[] SplitNoEmpty(this string value, params string[] delimiters)
{
return value.Split(delimiters, StringSplitOptions.RemoveEmptyEntries);
}
public static string[] SplitKeepEmpty(this string value, params string[] delimiters)
{
return value.Split(delimiters, StringSplitOptions.None);
}
public static string[] SplitNoEmptyAndWhiteSpace(this string value, params string[] delimiters)
{
if (string.IsNullOrEmpty(value))
return null;
var a = SplitNoEmpty(value, delimiters);
for (var i = 0; i <= a.Length - 1; i++)
a[i] = a[i].Trim();
var l = a.ToList();
while (l.Contains(""))
l.Remove("");
return l.ToArray();
}
public static string[] SplitLinesNoEmpty(this string value)
{
return SplitNoEmpty(value, Environment.NewLine);
}
}

7
mpv.net/mp.cs
View File

@@ -13,7 +13,6 @@ using System.Windows.Forms;
using static mpvnet.libmpv;
using static mpvnet.Native;
using static mpvnet.StaticUsing;
using PyRT = IronPython.Runtime;
@@ -75,7 +74,7 @@ namespace mpvnet
if (File.Exists(mpvConfPath))
foreach (var i in File.ReadAllLines(mpvConfPath))
if (i.Contains("=") && ! i.StartsWith("#"))
_mpvConf[i.Left("=").Trim()] = i.Right("=").Trim();
_mpvConf[i.Substring(0, i.IndexOf("=")).Trim()] = i.Substring(i.IndexOf("=") + 1).Trim();
}
return _mpvConf;
}
@@ -208,7 +207,7 @@ namespace mpvnet
}
catch (Exception ex)
{
MsgError(ex.GetType().Name + "\r\n\r\n" + ex.ToString());
MainForm.Instance.ShowMsgBox(ex.GetType().Name + "\n\n" + ex.ToString(), MessageBoxIcon.Error);
}
ClientMessage?.Invoke(args);
}
@@ -465,7 +464,7 @@ namespace mpvnet
string[] types = "264 265 3gp aac ac3 avc avi avs bmp divx dts dtshd dtshr dtsma eac3 evo flac flv h264 h265 hevc hvc jpg jpeg m2t m2ts m2v m4a m4v mka mkv mlp mov mp2 mp3 mp4 mpa mpeg mpg mpv mts ogg ogm opus pcm png pva raw rmvb thd thd+ac3 true-hd truehd ts vdr vob vpy w64 wav webm wmv y4m".Split(' ');
string path = get_property_string("path");
List<string> files = Directory.GetFiles(Path.GetDirectoryName(path)).ToList();
files = files.Where((file) => types.Contains(file.Ext())).ToList();
files = files.Where((file) => types.Contains(Path.GetExtension(file).TrimStart(".".ToCharArray()).ToLower())).ToList();
files.Sort(new StringLogicalComparer());
int index = files.IndexOf(path);
files.Remove(path);

1
mpv.net/mpv.net.csproj
View File

@@ -143,7 +143,6 @@
</Compile>
<Compile Include="PowerShellScript.cs" />
<Compile Include="PythonScript.cs" />
<Compile Include="StringExtensions.cs" />
<Compile Include="libmpv.cs" />
<Compile Include="MainForm.cs">
<SubType>Form</SubType>