diff --git a/MakeZipWindows.bat b/MakeZipWindows.bat
deleted file mode 100644
index 0f0678d58..000000000
--- a/MakeZipWindows.bat
+++ /dev/null
@@ -1 +0,0 @@
-dotnet %~dp0/windowszipmaker/Packagemaker.dll
\ No newline at end of file
diff --git a/MakeZipWindows.ps1 b/MakeZipWindows.ps1
new file mode 100644
index 000000000..4b248f53a
--- /dev/null
+++ b/MakeZipWindows.ps1
@@ -0,0 +1,33 @@
+#!powershell
+#
+$include_files = @( 'addon.py', 'addon.xml', 'LICENSE', 'README.md', 'service.py' )
+$include_paths = @( 'resources/' )
+$exclude_paths = @( 'test/' )
+
+# Get addon metadata
+[xml]$XmlDocument = Get-Content -LiteralPath 'addon.xml'
+$name = $XmlDocument.addon.id
+$version = $XmlDocument.addon.version
+$git_hash = Invoke-Expression 'git rev-parse --short HEAD'
+$zip_name = "$name-$version-$git_hash.zip"
+
+# Remove file if it exists
+if (Test-Path -LiteralPath $zip_name) {
+ Remove-Item -LiteralPath $zip_name
+}
+
+# Create ZIP file
+Add-Type -AssemblyName System.IO.Compression
+
+Write-Host '= Building new package'
+$zip_file = [System.IO.Compression.ZipFile]::Open($zip_name, 'Create')
+ForEach ($file in $include_files) {
+ [System.IO.Compression.ZipFileExtensions]::CreateEntryFromFile($zip_file, $file, "$name/$file")
+}
+ForEach ($path in $include_paths) {
+ Get-ChildItem -Recurse -File -LiteralPath $path | ForEach-Object {
+ [System.IO.Compression.ZipFileExtensions]::CreateEntryFromFile($zip_file, $_.FullName, "$name/$(Resolve-Path -Path $_.FullName -Relative)")
+ }
+}
+$zip_file.Dispose()
+Write-Host "= Successfully wrote package as: $zip_name"
diff --git a/packagemaker/Packagemaker.csproj b/packagemaker/Packagemaker.csproj
deleted file mode 100644
index 4e65fa88d..000000000
--- a/packagemaker/Packagemaker.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- Exe
- netcoreapp2.1
-
-
-
-
-
-
-
diff --git a/packagemaker/Program.cs b/packagemaker/Program.cs
deleted file mode 100644
index e5d324451..000000000
--- a/packagemaker/Program.cs
+++ /dev/null
@@ -1,129 +0,0 @@
- using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Reflection;
-
-namespace plugin.video.vrt.nu.packagemaker
-{
- class Program
- {
- private const string ZipfileName = "plugin.video.vrt.nu.zip";
- private const string SubFolderName = "plugin.video.vrt.nu";
- private const string ZipFolderName = "zip";
-
- static void Main(string[] args)
- {
- var dllLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-
- var rootFolder = Path.Combine(dllLocation, @"..");
-#if DEBUG
- rootFolder = Path.Combine(dllLocation, @"..", @"..", @"..", @"..");
-#endif
- rootFolder = Path.GetFullPath(rootFolder);//gives nicer output in logs
-
- var destination = Path.Combine(rootFolder, ZipFolderName, SubFolderName);
-
- var zipDestination = Path.Combine(rootFolder, ZipFolderName, ZipfileName);
- RemoveDestinationZip(zipDestination);
-
- var vrtPluginRoot = Path.Combine(rootFolder, SubFolderName);
-
- var copiedFiles = CopyFilesToDestination(rootFolder, vrtPluginRoot, destination);
- DeleteUnecesaryFiles(destination, copiedFiles);
-
- CreateZipFile(zipDestination, destination);
-
- RemoveDestinationDirectory(destination);
-
- Console.WriteLine($"Created zip at {Path.GetFullPath(zipDestination)}");
- Console.WriteLine("Type any key to exit");
- Console.ReadLine();
- }
-
- private static void CreateZipFile(string zipfileName, string destination)
- {
- Console.WriteLine("Creating zipfile");
- ZipFile.CreateFromDirectory(destination, zipfileName, CompressionLevel.NoCompression, true);
- }
-
- private static void DeleteUnecesaryFiles(string destination, IEnumerable copiedFiles)
- {
- foreach (var itemToDelete in copiedFiles.Where(x => x.EndsWith("pyc") || x.EndsWith("pyproj") || x.EndsWith("user")))
- {
- Console.WriteLine($"Deleting {itemToDelete}");
- File.Delete(itemToDelete);
- }
-
- Console.WriteLine("Deletings tests folder");
- Directory.Delete(Path.Combine(destination, "vrtnutests"), true);
- }
-
- private static string[] CopyFilesToDestination(string root, string pluginVideoVrtNuRoot, string destination)
- {
- DirectoryCopy(pluginVideoVrtNuRoot, destination, true);
-
- File.Copy(Path.Combine(root, "LICENSE"), Path.Combine(destination, "LICENSE"));
- var copiedFiles = Directory.GetFiles(destination, string.Empty, SearchOption.AllDirectories);
- return copiedFiles;
- }
-
- private static void RemoveDestinationZip(string zipfileName)
- {
- if (File.Exists(zipfileName))
- {
- Console.WriteLine("Removing Zipfile");
- File.Delete(zipfileName);
- }
- }
-
- private static void RemoveDestinationDirectory(string destination)
- {
- if (Directory.Exists(destination))
- {
- Console.WriteLine("Removing Directory");
- Directory.Delete(destination, true);
- }
- }
-
- private static void DirectoryCopy(string sourceDirName, string destDirName, bool copySubDirs)
- {
- // Get the subdirectories for the specified directory.
- DirectoryInfo dir = new DirectoryInfo(sourceDirName);
-
- if (!dir.Exists)
- {
- throw new DirectoryNotFoundException(
- "Source directory does not exist or could not be found: "
- + sourceDirName);
- }
-
- DirectoryInfo[] dirs = dir.GetDirectories();
- // If the destination directory doesn't exist, create it.
- if (!Directory.Exists(destDirName))
- {
- Directory.CreateDirectory(destDirName);
- }
-
- // Get the files in the directory and copy them to the new location.
- FileInfo[] files = dir.GetFiles();
- foreach (FileInfo file in files)
- {
- string temppath = Path.Combine(destDirName, file.Name);
- file.CopyTo(temppath, false);
- }
-
- // If copying subdirectories, copy them and their contents to new location.
- if (copySubDirs)
- {
- foreach (DirectoryInfo subdir in dirs)
- {
- string temppath = Path.Combine(destDirName, subdir.Name);
- DirectoryCopy(subdir.FullName, temppath, copySubDirs);
- }
- }
- }
- }
-}
diff --git a/packagemaker/Properties/PublishProfiles/FolderProfile.pubxml b/packagemaker/Properties/PublishProfiles/FolderProfile.pubxml
deleted file mode 100644
index ee5cc98cd..000000000
--- a/packagemaker/Properties/PublishProfiles/FolderProfile.pubxml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- FileSystem
- Release
- Any CPU
- netcoreapp2.1
- bin\Debug\netcoreapp2.1\publish\
- false
- <_IsPortable>true
-
-
\ No newline at end of file
diff --git a/windowszipmaker/Packagemaker.deps.json b/windowszipmaker/Packagemaker.deps.json
deleted file mode 100644
index 1fa5b884c..000000000
--- a/windowszipmaker/Packagemaker.deps.json
+++ /dev/null
@@ -1,328 +0,0 @@
-{
- "runtimeTarget": {
- "name": ".NETCoreApp,Version=v2.1",
- "signature": "21f5a0be07c42fcb985ccd5538b94fab62aaa33f"
- },
- "compilationOptions": {},
- "targets": {
- ".NETCoreApp,Version=v2.1": {
- "Packagemaker/1.0.0": {
- "dependencies": {
- "System.IO.Compression.ZipFile": "4.3.0"
- },
- "runtime": {
- "Packagemaker.dll": {}
- }
- },
- "runtime.native.System/4.3.0": {},
- "runtime.native.System.IO.Compression/4.3.0": {},
- "System.Buffers/4.3.0": {
- "dependencies": {
- "System.Diagnostics.Debug": "4.3.0",
- "System.Diagnostics.Tracing": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Threading": "4.3.0"
- }
- },
- "System.Collections/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0"
- }
- },
- "System.Diagnostics.Debug/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0"
- }
- },
- "System.Diagnostics.Tracing/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0"
- }
- },
- "System.Globalization/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0"
- }
- },
- "System.IO/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
- }
- },
- "System.IO.Compression/4.3.0": {
- "dependencies": {
- "System.Buffers": "4.3.0",
- "System.Collections": "4.3.0",
- "System.Diagnostics.Debug": "4.3.0",
- "System.IO": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Runtime.InteropServices": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading": "4.3.0",
- "System.Threading.Tasks": "4.3.0",
- "runtime.native.System": "4.3.0",
- "runtime.native.System.IO.Compression": "4.3.0"
- },
- "runtimeTargets": {
- "runtime/unix/lib/_._": {
- "rid": "unix",
- "assetType": "runtime"
- },
- "runtime/win/lib/_._": {
- "rid": "win",
- "assetType": "runtime"
- }
- }
- },
- "System.IO.Compression.ZipFile/4.3.0": {
- "dependencies": {
- "System.Buffers": "4.3.0",
- "System.IO": "4.3.0",
- "System.IO.Compression": "4.3.0",
- "System.IO.FileSystem": "4.3.0",
- "System.IO.FileSystem.Primitives": "4.3.0",
- "System.Resources.ResourceManager": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Extensions": "4.3.0",
- "System.Text.Encoding": "4.3.0"
- }
- },
- "System.IO.FileSystem/4.3.0": {
- "dependencies": {
- "System.IO": "4.3.0",
- "System.IO.FileSystem.Primitives": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Handles": "4.3.0",
- "System.Text.Encoding": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
- }
- },
- "System.IO.FileSystem.Primitives/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0"
- }
- },
- "System.Reflection/4.3.0": {
- "dependencies": {
- "System.IO": "4.3.0",
- "System.Reflection.Primitives": "4.3.0",
- "System.Runtime": "4.3.0"
- }
- },
- "System.Reflection.Primitives/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0"
- }
- },
- "System.Resources.ResourceManager/4.3.0": {
- "dependencies": {
- "System.Globalization": "4.3.0",
- "System.Reflection": "4.3.0",
- "System.Runtime": "4.3.0"
- }
- },
- "System.Runtime/4.3.0": {},
- "System.Runtime.Extensions/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0"
- }
- },
- "System.Runtime.Handles/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0"
- }
- },
- "System.Runtime.InteropServices/4.3.0": {
- "dependencies": {
- "System.Reflection": "4.3.0",
- "System.Reflection.Primitives": "4.3.0",
- "System.Runtime": "4.3.0",
- "System.Runtime.Handles": "4.3.0"
- }
- },
- "System.Text.Encoding/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0"
- }
- },
- "System.Threading/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0",
- "System.Threading.Tasks": "4.3.0"
- }
- },
- "System.Threading.Tasks/4.3.0": {
- "dependencies": {
- "System.Runtime": "4.3.0"
- }
- }
- }
- },
- "libraries": {
- "Packagemaker/1.0.0": {
- "type": "project",
- "serviceable": false,
- "sha512": ""
- },
- "runtime.native.System/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==",
- "path": "runtime.native.system/4.3.0",
- "hashPath": "runtime.native.system.4.3.0.nupkg.sha512"
- },
- "runtime.native.System.IO.Compression/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-INBPonS5QPEgn7naufQFXJEp3zX6L4bwHgJ/ZH78aBTpeNfQMtf7C6VrAFhlq2xxWBveIOWyFzQjJ8XzHMhdOQ==",
- "path": "runtime.native.system.io.compression/4.3.0",
- "hashPath": "runtime.native.system.io.compression.4.3.0.nupkg.sha512"
- },
- "System.Buffers/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-ratu44uTIHgeBeI0dE8DWvmXVBSo4u7ozRZZHOMmK/JPpYyo0dAfgSiHlpiObMQ5lEtEyIXA40sKRYg5J6A8uQ==",
- "path": "system.buffers/4.3.0",
- "hashPath": "system.buffers.4.3.0.nupkg.sha512"
- },
- "System.Collections/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==",
- "path": "system.collections/4.3.0",
- "hashPath": "system.collections.4.3.0.nupkg.sha512"
- },
- "System.Diagnostics.Debug/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==",
- "path": "system.diagnostics.debug/4.3.0",
- "hashPath": "system.diagnostics.debug.4.3.0.nupkg.sha512"
- },
- "System.Diagnostics.Tracing/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==",
- "path": "system.diagnostics.tracing/4.3.0",
- "hashPath": "system.diagnostics.tracing.4.3.0.nupkg.sha512"
- },
- "System.Globalization/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==",
- "path": "system.globalization/4.3.0",
- "hashPath": "system.globalization.4.3.0.nupkg.sha512"
- },
- "System.IO/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==",
- "path": "system.io/4.3.0",
- "hashPath": "system.io.4.3.0.nupkg.sha512"
- },
- "System.IO.Compression/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-YHndyoiV90iu4iKG115ibkhrG+S3jBm8Ap9OwoUAzO5oPDAWcr0SFwQFm0HjM8WkEZWo0zvLTyLmbvTkW1bXgg==",
- "path": "system.io.compression/4.3.0",
- "hashPath": "system.io.compression.4.3.0.nupkg.sha512"
- },
- "System.IO.Compression.ZipFile/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-G4HwjEsgIwy3JFBduZ9quBkAu+eUwjIdJleuNSgmUojbH6O3mlvEIme+GHx/cLlTAPcrnnL7GqvB9pTlWRfhOg==",
- "path": "system.io.compression.zipfile/4.3.0",
- "hashPath": "system.io.compression.zipfile.4.3.0.nupkg.sha512"
- },
- "System.IO.FileSystem/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==",
- "path": "system.io.filesystem/4.3.0",
- "hashPath": "system.io.filesystem.4.3.0.nupkg.sha512"
- },
- "System.IO.FileSystem.Primitives/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-6QOb2XFLch7bEc4lIcJH49nJN2HV+OC3fHDgsLVsBVBk3Y4hFAnOBGzJ2lUu7CyDDFo9IBWkSsnbkT6IBwwiMw==",
- "path": "system.io.filesystem.primitives/4.3.0",
- "hashPath": "system.io.filesystem.primitives.4.3.0.nupkg.sha512"
- },
- "System.Reflection/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==",
- "path": "system.reflection/4.3.0",
- "hashPath": "system.reflection.4.3.0.nupkg.sha512"
- },
- "System.Reflection.Primitives/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==",
- "path": "system.reflection.primitives/4.3.0",
- "hashPath": "system.reflection.primitives.4.3.0.nupkg.sha512"
- },
- "System.Resources.ResourceManager/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==",
- "path": "system.resources.resourcemanager/4.3.0",
- "hashPath": "system.resources.resourcemanager.4.3.0.nupkg.sha512"
- },
- "System.Runtime/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==",
- "path": "system.runtime/4.3.0",
- "hashPath": "system.runtime.4.3.0.nupkg.sha512"
- },
- "System.Runtime.Extensions/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==",
- "path": "system.runtime.extensions/4.3.0",
- "hashPath": "system.runtime.extensions.4.3.0.nupkg.sha512"
- },
- "System.Runtime.Handles/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==",
- "path": "system.runtime.handles/4.3.0",
- "hashPath": "system.runtime.handles.4.3.0.nupkg.sha512"
- },
- "System.Runtime.InteropServices/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==",
- "path": "system.runtime.interopservices/4.3.0",
- "hashPath": "system.runtime.interopservices.4.3.0.nupkg.sha512"
- },
- "System.Text.Encoding/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==",
- "path": "system.text.encoding/4.3.0",
- "hashPath": "system.text.encoding.4.3.0.nupkg.sha512"
- },
- "System.Threading/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==",
- "path": "system.threading/4.3.0",
- "hashPath": "system.threading.4.3.0.nupkg.sha512"
- },
- "System.Threading.Tasks/4.3.0": {
- "type": "package",
- "serviceable": true,
- "sha512": "sha512-LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==",
- "path": "system.threading.tasks/4.3.0",
- "hashPath": "system.threading.tasks.4.3.0.nupkg.sha512"
- }
- }
-}
\ No newline at end of file
diff --git a/windowszipmaker/Packagemaker.dll b/windowszipmaker/Packagemaker.dll
deleted file mode 100644
index 4fdc2efd7..000000000
Binary files a/windowszipmaker/Packagemaker.dll and /dev/null differ
diff --git a/windowszipmaker/Packagemaker.pdb b/windowszipmaker/Packagemaker.pdb
deleted file mode 100644
index 59dccc5f2..000000000
Binary files a/windowszipmaker/Packagemaker.pdb and /dev/null differ
diff --git a/windowszipmaker/Packagemaker.runtimeconfig.json b/windowszipmaker/Packagemaker.runtimeconfig.json
deleted file mode 100644
index 79949366e..000000000
--- a/windowszipmaker/Packagemaker.runtimeconfig.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "runtimeOptions": {
- "tfm": "netcoreapp2.1",
- "framework": {
- "name": "Microsoft.NETCore.App",
- "version": "2.1.0"
- }
- }
-}
\ No newline at end of file