diff --git a/README.md b/README.md index 6ec6bae..d4a8fa7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -![](https://raw.githubusercontent.com/stax76/mpv.net/master/img/mpvnet.png) +![](https://raw.githubusercontent.com/stax76/mpv.net/master/docs/img/mpvnet.png) ![GitHub closed pull requests](https://img.shields.io/github/issues-pr-closed/stax76/mpv.net) ![GitHub closed issues](https://img.shields.io/github/issues-closed/stax76/mpv.net) ![GitHub All Releases](https://img.shields.io/github/downloads/stax76/mpv.net/total) ![GitHub tag (latest by date)](https://img.shields.io/github/tag-date/stax76/mpv.net) ![GitHub stars](https://img.shields.io/github/stars/stax76/mpv.net) @@ -90,19 +90,19 @@ Features - Update check and update routine -## [Support](Manual.md#support) +## [Support](docs/Manual.md#support) -[Support section of the manual.](Manual.md#support) +[Support section of the manual.](docs/Manual.md#support) -## [Download](Manual.md#download) +## [Download](docs/Manual.md#download) -[Download section of the manual.](Manual.md#download) +[Download section of the manual.](docs/Manual.md#download) -## [Manual](Manual.md) +## [Manual](docs/Manual.md) -[The mpv.net documentation.](Manual.md) +[The mpv.net documentation.](docs/Manual.md) Screenshots @@ -110,39 +110,39 @@ Screenshots #### Main Window -![Main Window](https://raw.githubusercontent.com/stax76/mpv.net/master/img/Main.png) +![Main Window](docs/img/Main.png) #### Context Menu Context menu using dark mode. -![Context Menu](https://raw.githubusercontent.com/stax76/mpv.net/master/img/Menu.jpg) +![Context Menu](https://raw.githubusercontent.com/stax76/mpv.net/master/docs/img/Menu.jpg) #### Config Editor Searchable config editor as alternative to edit the conf file manually. -![](https://raw.githubusercontent.com/stax76/mpv.net/master/img/ConfEditor.png) +![](https://raw.githubusercontent.com/stax76/mpv.net/master/docs/img/ConfEditor.png) #### Terminal OSD console and status printed on the terminal. -![](https://raw.githubusercontent.com/stax76/mpv.net/master/img/Terminal.png) +![](https://raw.githubusercontent.com/stax76/mpv.net/master/docs/img/Terminal.png) #### Input Editor Searchable key and mouse binding editor. -![Input Editor](https://raw.githubusercontent.com/stax76/mpv.net/master/img/InputEditor.png) +![Input Editor](https://raw.githubusercontent.com/stax76/mpv.net/master/docs/img/InputEditor.png) #### Command Palette Command Palette to find commands and shortcut keys easily. -![Command Palette](https://raw.githubusercontent.com/stax76/mpv.net/master/img/CommandPalette.png) +![Command Palette](https://raw.githubusercontent.com/stax76/mpv.net/master/docs/img/CommandPalette.png) diff --git a/Changelog.md b/docs/Changelog.md similarity index 100% rename from Changelog.md rename to docs/Changelog.md diff --git a/LICENSE.txt b/docs/License.txt similarity index 100% rename from LICENSE.txt rename to docs/License.txt diff --git a/Manual.md b/docs/Manual.md similarity index 100% rename from Manual.md rename to docs/Manual.md diff --git a/img/CommandPalette.png b/docs/img/CommandPalette.png similarity index 100% rename from img/CommandPalette.png rename to docs/img/CommandPalette.png diff --git a/img/ConfEditor.png b/docs/img/ConfEditor.png similarity index 100% rename from img/ConfEditor.png rename to docs/img/ConfEditor.png diff --git a/img/InputEditor.png b/docs/img/InputEditor.png similarity index 100% rename from img/InputEditor.png rename to docs/img/InputEditor.png diff --git a/img/Main.png b/docs/img/Main.png similarity index 100% rename from img/Main.png rename to docs/img/Main.png diff --git a/img/MediaSearch.png b/docs/img/MediaSearch.png similarity index 100% rename from img/MediaSearch.png rename to docs/img/MediaSearch.png diff --git a/img/Menu.jpg b/docs/img/Menu.jpg similarity index 100% rename from img/Menu.jpg rename to docs/img/Menu.jpg diff --git a/img/Terminal.png b/docs/img/Terminal.png similarity index 100% rename from img/Terminal.png rename to docs/img/Terminal.png diff --git a/img/mpvnet-santa.png b/docs/img/mpvnet-santa.png similarity index 100% rename from img/mpvnet-santa.png rename to docs/img/mpvnet-santa.png diff --git a/img/mpvnet.ico b/docs/img/mpvnet.ico similarity index 100% rename from img/mpvnet.ico rename to docs/img/mpvnet.ico diff --git a/img/mpvnet.pdn b/docs/img/mpvnet.pdn similarity index 100% rename from img/mpvnet.pdn rename to docs/img/mpvnet.pdn diff --git a/img/mpvnet.png b/docs/img/mpvnet.png similarity index 100% rename from img/mpvnet.png rename to docs/img/mpvnet.png diff --git a/extensions/ScriptingExtension/CSScriptLibrary.dll b/extensions/ScriptingExtension/CSScriptLibrary.dll deleted file mode 100644 index f790088..0000000 Binary files a/extensions/ScriptingExtension/CSScriptLibrary.dll and /dev/null differ diff --git a/extensions/ScriptingExtension/Properties/AssemblyInfo.cs b/extensions/ScriptingExtension/Properties/AssemblyInfo.cs deleted file mode 100644 index 1510960..0000000 --- a/extensions/ScriptingExtension/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("RatingExtension")] -[assembly: AssemblyDescription("RatingExtension")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Frank Skare (stax76)")] -[assembly: AssemblyProduct("RatingExtension")] -[assembly: AssemblyCopyright("Copyright (C) 2017-2020 Frank Skare (stax76)")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("55c88710-539d-4402-84c8-31694841c731")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/extensions/ScriptingExtension/ScriptingExtension.cs b/extensions/ScriptingExtension/ScriptingExtension.cs deleted file mode 100644 index 8f01666..0000000 --- a/extensions/ScriptingExtension/ScriptingExtension.cs +++ /dev/null @@ -1,56 +0,0 @@ - -// This extension implements the C# scripting feature of mpv.net which -// is based on CS-Script (https://www.cs-script.net). - -// I also use this extension to code scripts in order to have full -// code completion and debugger support, once the script code is -// finished I move it from the extension to a standalone script. - -using System; -using System.ComponentModel.Composition; -using System.Collections.Generic; -using System.IO; - -using mpvnet; -using CSScriptLibrary; -using static mpvnet.Core; - -// the file name of extensions must end with 'Extension' -namespace ScriptingExtension -{ - [Export(typeof(IExtension))] - public class ScriptingExtension : IExtension - { - //Script Script; - - public ScriptingExtension() - { - //Script = new Script(); - List files = new List(); - - if (Directory.Exists(core.ConfigFolder + "scripts-cs")) - files.AddRange(Directory.GetFiles(core.ConfigFolder + "scripts-cs", "*.cs")); - - if (Directory.Exists(Folder.Startup + "scripts")) - foreach (string path in Directory.GetFiles(Folder.Startup + "scripts", "*.cs")) - files.AddRange(Directory.GetFiles(Folder.Startup + "scripts", "*.cs")); - - if (files.Count == 0) - return; - - CSScriptLibrary.CSScript.EvaluatorConfig.Engine = EvaluatorEngine.CodeDom; - - foreach (string file in files) - { - try - { - CSScriptLibrary.CSScript.Evaluator.LoadCode(File.ReadAllText(file)); - } - catch (Exception e) - { - App.ShowException(e); - } - } - } - } -} diff --git a/extensions/ScriptingExtension/ScriptingExtension.csproj b/extensions/ScriptingExtension/ScriptingExtension.csproj deleted file mode 100644 index 2a8c199..0000000 --- a/extensions/ScriptingExtension/ScriptingExtension.csproj +++ /dev/null @@ -1,64 +0,0 @@ - - - - - Debug - AnyCPU - {94255EF2-C823-4D82-9017-0E993CC0F5A1} - Library - Properties - ScriptingExtension - ScriptingExtension - v4.8 - 512 - - - - true - ..\..\mpv.net\bin\Extensions\ScriptingExtension\ - DEBUG;TRACE - full - AnyCPU - 7.3 - prompt - MinimumRecommendedRules.ruleset - - - ..\..\mpv.net\bin\Extensions\ScriptingExtension\ - TRACE - true - pdbonly - AnyCPU - 7.3 - prompt - MinimumRecommendedRules.ruleset - - - - .\CSScriptLibrary.dll - - - - - - - - - - - - - - - - - - - - {1751f378-8edf-4b62-be6d-304c7c287089} - mpv.net - False - - - - \ No newline at end of file diff --git a/extensions/ScriptingExtension/ScriptingExtension.sln b/extensions/ScriptingExtension/ScriptingExtension.sln deleted file mode 100644 index f3fb348..0000000 --- a/extensions/ScriptingExtension/ScriptingExtension.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29123.88 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptingExtension", "ScriptingExtension.csproj", "{55C88710-539D-4402-84C8-31694841C731}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {55C88710-539D-4402-84C8-31694841C731}.Debug|x64.ActiveCfg = Debug|x64 - {55C88710-539D-4402-84C8-31694841C731}.Debug|x64.Build.0 = Debug|x64 - {55C88710-539D-4402-84C8-31694841C731}.Debug|x86.ActiveCfg = Debug|x86 - {55C88710-539D-4402-84C8-31694841C731}.Debug|x86.Build.0 = Debug|x86 - {55C88710-539D-4402-84C8-31694841C731}.Release|x64.ActiveCfg = Release|x64 - {55C88710-539D-4402-84C8-31694841C731}.Release|x64.Build.0 = Release|x64 - {55C88710-539D-4402-84C8-31694841C731}.Release|x86.ActiveCfg = Release|x86 - {55C88710-539D-4402-84C8-31694841C731}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {C8A53BF6-B00A-4215-B9D7-801ADB9C8F60} - EndGlobalSection -EndGlobal diff --git a/extensions/ScriptingExtension/script.cs b/extensions/ScriptingExtension/script.cs deleted file mode 100644 index dfba005..0000000 --- a/extensions/ScriptingExtension/script.cs +++ /dev/null @@ -1,19 +0,0 @@ - -using System.IO; - -using mpvnet; -using static mpvnet.Core; - -class Script -{ - public Script() - { - core.Shutdown += Shutdown; - } - - void Shutdown() - { - foreach (string file in Directory.GetFiles(@"C:\Users\frank\Desktop\aaa")) - File.Delete(file); - } -} diff --git a/mpv.net/App.config b/src/App.config similarity index 100% rename from mpv.net/App.config rename to src/App.config diff --git a/mpv.net/DynamicGUI/DynamicGUI.cs b/src/DynamicGUI/DynamicGUI.cs similarity index 100% rename from mpv.net/DynamicGUI/DynamicGUI.cs rename to src/DynamicGUI/DynamicGUI.cs diff --git a/mpv.net/DynamicGUI/OptionSettingControl.xaml b/src/DynamicGUI/OptionSettingControl.xaml similarity index 100% rename from mpv.net/DynamicGUI/OptionSettingControl.xaml rename to src/DynamicGUI/OptionSettingControl.xaml diff --git a/mpv.net/DynamicGUI/OptionSettingControl.xaml.cs b/src/DynamicGUI/OptionSettingControl.xaml.cs similarity index 100% rename from mpv.net/DynamicGUI/OptionSettingControl.xaml.cs rename to src/DynamicGUI/OptionSettingControl.xaml.cs diff --git a/mpv.net/DynamicGUI/StringSettingControl.xaml b/src/DynamicGUI/StringSettingControl.xaml similarity index 100% rename from mpv.net/DynamicGUI/StringSettingControl.xaml rename to src/DynamicGUI/StringSettingControl.xaml diff --git a/mpv.net/DynamicGUI/StringSettingControl.xaml.cs b/src/DynamicGUI/StringSettingControl.xaml.cs similarity index 100% rename from mpv.net/DynamicGUI/StringSettingControl.xaml.cs rename to src/DynamicGUI/StringSettingControl.xaml.cs diff --git a/mpv.net/DynamicGUI/Tommy.cs b/src/DynamicGUI/Tommy.cs similarity index 100% rename from mpv.net/DynamicGUI/Tommy.cs rename to src/DynamicGUI/Tommy.cs diff --git a/mpv.net/Misc/App.cs b/src/Misc/App.cs similarity index 100% rename from mpv.net/Misc/App.cs rename to src/Misc/App.cs diff --git a/src/Misc/CSharpScriptHost.cs b/src/Misc/CSharpScriptHost.cs new file mode 100644 index 0000000..a7797ad --- /dev/null +++ b/src/Misc/CSharpScriptHost.cs @@ -0,0 +1,74 @@ + +using System; +using System.CodeDom.Compiler; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Security.Cryptography; +using System.Text; + +using Microsoft.CSharp; + +namespace mpvnet +{ + class CSharpScriptHost + { + static List References = new List(); + + public static void ExecuteScriptsInFolder(string folder) + { + if (Directory.Exists(folder)) + foreach (string file in Directory.GetFiles(folder, "*.cs")) + App.RunTask(() => Execute(file)); + } + + static void Execute(string file) + { + string code = File.ReadAllText(file); + string filename = Path.GetFileNameWithoutExtension(file) + " " + GetMD5(code) + ".dll"; + string outputFile = Path.Combine(Path.GetTempPath(), filename); + + if (!File.Exists(outputFile)) + Compile(outputFile, file); + + if (File.Exists(outputFile)) + References.Add(Assembly.LoadFile(outputFile).CreateInstance("Script")); + } + + public static void Compile(string outputFile, string file) + { + CSharpCodeProvider provider = new CSharpCodeProvider(); + CompilerParameters parameters = new CompilerParameters(); + + string[] dependencies = { + "Microsoft.VisualBasic.dll", + "System.Core.dll", "System.Data.dll", "System.dll", "System.Drawing.dll", "System.Web.dll", + "System.Windows.Forms.dll", "System.Xaml.dll", "System.Xml.dll", "System.Xml.Linq.dll", + "WPF\\PresentationCore.dll", "WPF\\PresentationFramework.dll", "WPF\\WindowsBase.dll" + }; + + foreach (string i in dependencies) + parameters.ReferencedAssemblies.Add(i); + + parameters.OutputAssembly = outputFile; + CompilerResults results = provider.CompileAssemblyFromFile(parameters, file); + + var errors = results.Errors.Cast().Select((i) => "Line Number " + + i.Line + "\r\n" + "Error Number: " + i.ErrorNumber + "\r\n" + i.ErrorText); + + if (errors.Count() > 0) + ConsoleHelp.WriteError(string.Join("\r\n\r\n", errors), Path.GetFileName(file)); + } + + static string GetMD5(string code) + { + using (MD5 md5 = MD5.Create()) + { + byte[] inputBuffer = Encoding.UTF8.GetBytes(code); + byte[] hashBuffer = md5.ComputeHash(inputBuffer); + return BitConverter.ToString(md5.ComputeHash(inputBuffer)).Replace("-", ""); + } + } + } +} diff --git a/mpv.net/Misc/Commands.cs b/src/Misc/Commands.cs similarity index 100% rename from mpv.net/Misc/Commands.cs rename to src/Misc/Commands.cs diff --git a/mpv.net/Misc/Extension.cs b/src/Misc/Extension.cs similarity index 100% rename from mpv.net/Misc/Extension.cs rename to src/Misc/Extension.cs diff --git a/mpv.net/Misc/ExtensionMethods.cs b/src/Misc/ExtensionMethods.cs similarity index 100% rename from mpv.net/Misc/ExtensionMethods.cs rename to src/Misc/ExtensionMethods.cs diff --git a/mpv.net/Misc/Help.cs b/src/Misc/Help.cs similarity index 100% rename from mpv.net/Misc/Help.cs rename to src/Misc/Help.cs diff --git a/mpv.net/Misc/Misc.cs b/src/Misc/Misc.cs similarity index 100% rename from mpv.net/Misc/Misc.cs rename to src/Misc/Misc.cs diff --git a/mpv.net/Misc/PowerShell.cs b/src/Misc/PowerShell.cs similarity index 100% rename from mpv.net/Misc/PowerShell.cs rename to src/Misc/PowerShell.cs diff --git a/mpv.net/Misc/Program.cs b/src/Misc/Program.cs similarity index 100% rename from mpv.net/Misc/Program.cs rename to src/Misc/Program.cs diff --git a/mpv.net/Misc/Theme.cs b/src/Misc/Theme.cs similarity index 100% rename from mpv.net/Misc/Theme.cs rename to src/Misc/Theme.cs diff --git a/mpv.net/Misc/UpdateCheck.cs b/src/Misc/UpdateCheck.cs similarity index 100% rename from mpv.net/Misc/UpdateCheck.cs rename to src/Misc/UpdateCheck.cs diff --git a/mpv.net/Native/MediaInfo.cs b/src/Native/MediaInfo.cs similarity index 100% rename from mpv.net/Native/MediaInfo.cs rename to src/Native/MediaInfo.cs diff --git a/mpv.net/Native/Native.cs b/src/Native/Native.cs similarity index 100% rename from mpv.net/Native/Native.cs rename to src/Native/Native.cs diff --git a/mpv.net/Native/NativeHelp.cs b/src/Native/NativeHelp.cs similarity index 100% rename from mpv.net/Native/NativeHelp.cs rename to src/Native/NativeHelp.cs diff --git a/mpv.net/Native/StockIcon.cs b/src/Native/StockIcon.cs similarity index 100% rename from mpv.net/Native/StockIcon.cs rename to src/Native/StockIcon.cs diff --git a/mpv.net/Native/TaskDialog.cs b/src/Native/TaskDialog.cs similarity index 100% rename from mpv.net/Native/TaskDialog.cs rename to src/Native/TaskDialog.cs diff --git a/mpv.net/Native/Taskbar.cs b/src/Native/Taskbar.cs similarity index 100% rename from mpv.net/Native/Taskbar.cs rename to src/Native/Taskbar.cs diff --git a/mpv.net/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs similarity index 100% rename from mpv.net/Properties/AssemblyInfo.cs rename to src/Properties/AssemblyInfo.cs diff --git a/mpv.net/Properties/Resources.Designer.cs b/src/Properties/Resources.Designer.cs similarity index 100% rename from mpv.net/Properties/Resources.Designer.cs rename to src/Properties/Resources.Designer.cs diff --git a/mpv.net/Properties/Resources.resx b/src/Properties/Resources.resx similarity index 100% rename from mpv.net/Properties/Resources.resx rename to src/Properties/Resources.resx diff --git a/mpv.net/Properties/Settings.Designer.cs b/src/Properties/Settings.Designer.cs similarity index 100% rename from mpv.net/Properties/Settings.Designer.cs rename to src/Properties/Settings.Designer.cs diff --git a/mpv.net/Properties/Settings.settings b/src/Properties/Settings.settings similarity index 100% rename from mpv.net/Properties/Settings.settings rename to src/Properties/Settings.settings diff --git a/Release.ps1 b/src/Release.ps1 similarity index 100% rename from Release.ps1 rename to src/Release.ps1 diff --git a/mpv.net/Resources/editor.toml.txt b/src/Resources/editor.toml.txt similarity index 100% rename from mpv.net/Resources/editor.toml.txt rename to src/Resources/editor.toml.txt diff --git a/mpv.net/Resources/input.conf.txt b/src/Resources/input.conf.txt similarity index 100% rename from mpv.net/Resources/input.conf.txt rename to src/Resources/input.conf.txt diff --git a/mpv.net/Resources/mpv.conf.txt b/src/Resources/mpv.conf.txt similarity index 100% rename from mpv.net/Resources/mpv.conf.txt rename to src/Resources/mpv.conf.txt diff --git a/mpv.net/Resources/mpvnet-santa.png b/src/Resources/mpvnet-santa.png similarity index 100% rename from mpv.net/Resources/mpvnet-santa.png rename to src/Resources/mpvnet-santa.png diff --git a/mpv.net/Resources/mpvnet.ico b/src/Resources/mpvnet.ico similarity index 100% rename from mpv.net/Resources/mpvnet.ico rename to src/Resources/mpvnet.ico diff --git a/mpv.net/Resources/mpvnet.png b/src/Resources/mpvnet.png similarity index 100% rename from mpv.net/Resources/mpvnet.png rename to src/Resources/mpvnet.png diff --git a/mpv.net/Resources/theme.txt b/src/Resources/theme.txt similarity index 100% rename from mpv.net/Resources/theme.txt rename to src/Resources/theme.txt diff --git a/setup.iss b/src/Setup.iss similarity index 100% rename from setup.iss rename to src/Setup.iss diff --git a/mpv.net/WPF/AboutWindow.xaml b/src/WPF/AboutWindow.xaml similarity index 100% rename from mpv.net/WPF/AboutWindow.xaml rename to src/WPF/AboutWindow.xaml diff --git a/mpv.net/WPF/AboutWindow.xaml.cs b/src/WPF/AboutWindow.xaml.cs similarity index 100% rename from mpv.net/WPF/AboutWindow.xaml.cs rename to src/WPF/AboutWindow.xaml.cs diff --git a/mpv.net/WPF/CommandPaletteWindow.xaml b/src/WPF/CommandPaletteWindow.xaml similarity index 100% rename from mpv.net/WPF/CommandPaletteWindow.xaml rename to src/WPF/CommandPaletteWindow.xaml diff --git a/mpv.net/WPF/CommandPaletteWindow.xaml.cs b/src/WPF/CommandPaletteWindow.xaml.cs similarity index 100% rename from mpv.net/WPF/CommandPaletteWindow.xaml.cs rename to src/WPF/CommandPaletteWindow.xaml.cs diff --git a/mpv.net/WPF/ConfWindow.xaml b/src/WPF/ConfWindow.xaml similarity index 100% rename from mpv.net/WPF/ConfWindow.xaml rename to src/WPF/ConfWindow.xaml diff --git a/mpv.net/WPF/ConfWindow.xaml.cs b/src/WPF/ConfWindow.xaml.cs similarity index 100% rename from mpv.net/WPF/ConfWindow.xaml.cs rename to src/WPF/ConfWindow.xaml.cs diff --git a/mpv.net/WPF/EverythingWindow.xaml b/src/WPF/EverythingWindow.xaml similarity index 100% rename from mpv.net/WPF/EverythingWindow.xaml rename to src/WPF/EverythingWindow.xaml diff --git a/mpv.net/WPF/EverythingWindow.xaml.cs b/src/WPF/EverythingWindow.xaml.cs similarity index 100% rename from mpv.net/WPF/EverythingWindow.xaml.cs rename to src/WPF/EverythingWindow.xaml.cs diff --git a/mpv.net/WPF/InputWindow.xaml b/src/WPF/InputWindow.xaml similarity index 100% rename from mpv.net/WPF/InputWindow.xaml rename to src/WPF/InputWindow.xaml diff --git a/mpv.net/WPF/InputWindow.xaml.cs b/src/WPF/InputWindow.xaml.cs similarity index 100% rename from mpv.net/WPF/InputWindow.xaml.cs rename to src/WPF/InputWindow.xaml.cs diff --git a/mpv.net/WPF/LearnWindow.xaml b/src/WPF/LearnWindow.xaml similarity index 100% rename from mpv.net/WPF/LearnWindow.xaml rename to src/WPF/LearnWindow.xaml diff --git a/mpv.net/WPF/LearnWindow.xaml.cs b/src/WPF/LearnWindow.xaml.cs similarity index 100% rename from mpv.net/WPF/LearnWindow.xaml.cs rename to src/WPF/LearnWindow.xaml.cs diff --git a/mpv.net/WPF/Resources.xaml b/src/WPF/Resources.xaml similarity index 100% rename from mpv.net/WPF/Resources.xaml rename to src/WPF/Resources.xaml diff --git a/mpv.net/WPF/SearchTextBoxUserControl.xaml b/src/WPF/SearchTextBoxUserControl.xaml similarity index 100% rename from mpv.net/WPF/SearchTextBoxUserControl.xaml rename to src/WPF/SearchTextBoxUserControl.xaml diff --git a/mpv.net/WPF/SearchTextBoxUserControl.xaml.cs b/src/WPF/SearchTextBoxUserControl.xaml.cs similarity index 100% rename from mpv.net/WPF/SearchTextBoxUserControl.xaml.cs rename to src/WPF/SearchTextBoxUserControl.xaml.cs diff --git a/mpv.net/WPF/SetupWindow.xaml b/src/WPF/SetupWindow.xaml similarity index 100% rename from mpv.net/WPF/SetupWindow.xaml rename to src/WPF/SetupWindow.xaml diff --git a/mpv.net/WPF/SetupWindow.xaml.cs b/src/WPF/SetupWindow.xaml.cs similarity index 100% rename from mpv.net/WPF/SetupWindow.xaml.cs rename to src/WPF/SetupWindow.xaml.cs diff --git a/mpv.net/WPF/WPF.cs b/src/WPF/WPF.cs similarity index 100% rename from mpv.net/WPF/WPF.cs rename to src/WPF/WPF.cs diff --git a/mpv.net/WinForms/MainForm.Designer.cs b/src/WinForms/MainForm.Designer.cs similarity index 100% rename from mpv.net/WinForms/MainForm.Designer.cs rename to src/WinForms/MainForm.Designer.cs diff --git a/mpv.net/WinForms/MainForm.cs b/src/WinForms/MainForm.cs similarity index 99% rename from mpv.net/WinForms/MainForm.cs rename to src/WinForms/MainForm.cs index e0a395e..ee50bf5 100644 --- a/mpv.net/WinForms/MainForm.cs +++ b/src/WinForms/MainForm.cs @@ -8,8 +8,6 @@ using System.Linq; using System.Collections.Generic; using System.ComponentModel; using System.Globalization; -using System.Diagnostics; -using System.Threading.Tasks; using static mpvnet.Core; using static WinAPI; @@ -851,7 +849,8 @@ namespace mpvnet MinimumSize = new Size(FontHeight * 9, FontHeight * 9); UpdateCheck.DailyCheck(); core.LoadScripts(); - Task.Run(() => App.Extension = new Extension()); + App.RunTask(() => App.Extension = new Extension()); + CSharpScriptHost.ExecuteScriptsInFolder(core.ConfigFolder + "scripts-cs"); ShownTickCount = Environment.TickCount; App.ShowSetup(); } diff --git a/mpv.net/WinForms/MainForm.resx b/src/WinForms/MainForm.resx similarity index 100% rename from mpv.net/WinForms/MainForm.resx rename to src/WinForms/MainForm.resx diff --git a/mpv.net/WinForms/Menu.cs b/src/WinForms/Menu.cs similarity index 100% rename from mpv.net/WinForms/Menu.cs rename to src/WinForms/Menu.cs diff --git a/mpv.net/app.manifest b/src/app.manifest similarity index 100% rename from mpv.net/app.manifest rename to src/app.manifest diff --git a/extensions/RatingExtension/Properties/AssemblyInfo.cs b/src/extensions/RatingExtension/Properties/AssemblyInfo.cs similarity index 100% rename from extensions/RatingExtension/Properties/AssemblyInfo.cs rename to src/extensions/RatingExtension/Properties/AssemblyInfo.cs diff --git a/extensions/RatingExtension/RatingExtension.cs b/src/extensions/RatingExtension/RatingExtension.cs similarity index 100% rename from extensions/RatingExtension/RatingExtension.cs rename to src/extensions/RatingExtension/RatingExtension.cs diff --git a/extensions/RatingExtension/RatingExtension.csproj b/src/extensions/RatingExtension/RatingExtension.csproj similarity index 91% rename from extensions/RatingExtension/RatingExtension.csproj rename to src/extensions/RatingExtension/RatingExtension.csproj index e610099..f82832d 100644 --- a/extensions/RatingExtension/RatingExtension.csproj +++ b/src/extensions/RatingExtension/RatingExtension.csproj @@ -15,7 +15,7 @@ true - ..\..\mpv.net\bin\Extensions\RatingExtension\ + C:\Users\frank\OneDrive\Settings\mpv.net\extensions\RatingExtension\ DEBUG;TRACE full AnyCPU @@ -24,7 +24,7 @@ MinimumRecommendedRules.ruleset - ..\..\mpv.net\bin\Extensions\RatingExtension\ + C:\Users\frank\OneDrive\Settings\mpv.net\extensions\RatingExtension\ TRACE true pdbonly @@ -50,7 +50,7 @@ - + {1751f378-8edf-4b62-be6d-304c7c287089} mpv.net False diff --git a/mpv.net/mpv.net.csproj b/src/mpv.net.csproj similarity index 96% rename from mpv.net/mpv.net.csproj rename to src/mpv.net.csproj index 35b44f9..9d9cf11 100644 --- a/mpv.net/mpv.net.csproj +++ b/src/mpv.net.csproj @@ -76,11 +76,8 @@ + - - License.txt - PreserveNewest - @@ -180,12 +177,6 @@ Designer Resources.Designer.cs - - Changelog.md - - - Manual.md - README.md diff --git a/mpv.net.sln b/src/mpv.net.sln similarity index 72% rename from mpv.net.sln rename to src/mpv.net.sln index f6a313d..da1d6c4 100644 --- a/mpv.net.sln +++ b/src/mpv.net.sln @@ -3,12 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28729.10 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mpv.net", "mpv.net\mpv.net.csproj", "{1751F378-8EDF-4B62-BE6D-304C7C287089}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mpv.net", "mpv.net.csproj", "{1751F378-8EDF-4B62-BE6D-304C7C287089}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RatingExtension", "extensions\RatingExtension\RatingExtension.csproj", "{55C88710-539D-4402-84C8-31694841C731}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptingExtension", "extensions\ScriptingExtension\ScriptingExtension.csproj", "{94255EF2-C823-4D82-9017-0E993CC0F5A1}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -23,10 +21,6 @@ Global {55C88710-539D-4402-84C8-31694841C731}.Debug|Any CPU.Build.0 = Debug|Any CPU {55C88710-539D-4402-84C8-31694841C731}.Release|Any CPU.ActiveCfg = Release|Any CPU {55C88710-539D-4402-84C8-31694841C731}.Release|Any CPU.Build.0 = Release|Any CPU - {94255EF2-C823-4D82-9017-0E993CC0F5A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {94255EF2-C823-4D82-9017-0E993CC0F5A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94255EF2-C823-4D82-9017-0E993CC0F5A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {94255EF2-C823-4D82-9017-0E993CC0F5A1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/mpv.net/mpv/Core.cs b/src/mpv/Core.cs similarity index 99% rename from mpv.net/mpv/Core.cs rename to src/mpv/Core.cs index 6c0e7e0..3c1d8ea 100644 --- a/mpv.net/mpv/Core.cs +++ b/src/mpv/Core.cs @@ -1220,11 +1220,11 @@ namespace mpvnet if (!File.Exists(ConfigFolder + "history.txt")) return; - int totalMinutes = Convert.ToInt32((DateTime.Now - LastHistoryStartDateTime).TotalMinutes); + double totalMinutes = (DateTime.Now - LastHistoryStartDateTime).TotalMinutes; if (LastHistoryPath != null && totalMinutes > 1 && !HistoryDiscard()) File.AppendAllText(ConfigFolder + "history.txt", DateTime.Now.ToString().Substring(0, 16) + - " " + totalMinutes.ToString().PadLeft(3) + " " + LastHistoryPath + "\r\n"); + " " + Convert.ToInt32(totalMinutes).ToString().PadLeft(3) + " " + LastHistoryPath + "\r\n"); LastHistoryPath = path; LastHistoryStartDateTime = DateTime.Now; diff --git a/mpv.net/mpv/libmpv.cs b/src/mpv/libmpv.cs similarity index 100% rename from mpv.net/mpv/libmpv.cs rename to src/mpv/libmpv.cs diff --git a/mpv.net/mpvnet.ico b/src/mpvnet.ico similarity index 100% rename from mpv.net/mpvnet.ico rename to src/mpvnet.ico diff --git a/mpv.net/packages.config b/src/packages.config similarity index 100% rename from mpv.net/packages.config rename to src/packages.config diff --git a/scripts/c-sharp/dynamic-context-menu-items.cs b/src/scripts/c-sharp/dynamic-context-menu-items.cs similarity index 100% rename from scripts/c-sharp/dynamic-context-menu-items.cs rename to src/scripts/c-sharp/dynamic-context-menu-items.cs diff --git a/scripts/c-sharp/key-binding.cs b/src/scripts/c-sharp/key-binding.cs similarity index 100% rename from scripts/c-sharp/key-binding.cs rename to src/scripts/c-sharp/key-binding.cs diff --git a/scripts/c-sharp/observe-property-and-draw-text.cs b/src/scripts/c-sharp/observe-property-and-draw-text.cs similarity index 100% rename from scripts/c-sharp/observe-property-and-draw-text.cs rename to src/scripts/c-sharp/observe-property-and-draw-text.cs diff --git a/scripts/c-sharp/pause-when-minimize.cs b/src/scripts/c-sharp/pause-when-minimize.cs similarity index 100% rename from scripts/c-sharp/pause-when-minimize.cs rename to src/scripts/c-sharp/pause-when-minimize.cs diff --git a/scripts/javascript/seek-show-position.js b/src/scripts/javascript/seek-show-position.js similarity index 100% rename from scripts/javascript/seek-show-position.js rename to src/scripts/javascript/seek-show-position.js diff --git a/scripts/javascript/show-playlist.js b/src/scripts/javascript/show-playlist.js similarity index 100% rename from scripts/javascript/show-playlist.js rename to src/scripts/javascript/show-playlist.js diff --git a/scripts/lua/pause-when-minimize.lua b/src/scripts/lua/pause-when-minimize.lua similarity index 100% rename from scripts/lua/pause-when-minimize.lua rename to src/scripts/lua/pause-when-minimize.lua diff --git a/scripts/powershell/open-file-dialog.ps1 b/src/scripts/powershell/open-file-dialog.ps1 similarity index 100% rename from scripts/powershell/open-file-dialog.ps1 rename to src/scripts/powershell/open-file-dialog.ps1 diff --git a/scripts/powershell/pause-when-minimize.ps1 b/src/scripts/powershell/pause-when-minimize.ps1 similarity index 100% rename from scripts/powershell/pause-when-minimize.ps1 rename to src/scripts/powershell/pause-when-minimize.ps1 diff --git a/scripts/powershell/show-in-file-explorer.ps1 b/src/scripts/powershell/show-in-file-explorer.ps1 similarity index 100% rename from scripts/powershell/show-in-file-explorer.ps1 rename to src/scripts/powershell/show-in-file-explorer.ps1