diff --git a/PlexDL.Common.Enums/PlexDL.Common.Enums.nuspec b/PlexDL.Common.Enums/PlexDL.Common.Enums.nuspec new file mode 100644 index 0000000..4a5d123 --- /dev/null +++ b/PlexDL.Common.Enums/PlexDL.Common.Enums.nuspec @@ -0,0 +1,16 @@ + + + + $id$ + 1.7.3 + PlexDL.Common.Enums + BRH Media + false + MIT + https://github.com/BRH-Media/PlexDL + Contains enumerables required for PlexDL dependencies + Initial release + Copyright (c) BRH Media (Baeleigh Harris) 2024 + PlexDL enums package + + \ No newline at end of file diff --git a/PlexDL.Common.Enums/Properties/AssemblyInfo.cs b/PlexDL.Common.Enums/Properties/AssemblyInfo.cs index b069570..78010ad 100644 --- a/PlexDL.Common.Enums/Properties/AssemblyInfo.cs +++ b/PlexDL.Common.Enums/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("PlexDL.Common.Enums")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("Contains enumerables required for PlexDL dependencies")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("BRH Media")] [assembly: AssemblyProduct("PlexDL.Common.Enums")] diff --git a/PlexDL.Common.Pxz.Explorer/PlexDL.Common.Pxz.Explorer.csproj b/PlexDL.Common.Pxz.Explorer/PlexDL.Common.Pxz.Explorer.csproj new file mode 100644 index 0000000..03ce10b --- /dev/null +++ b/PlexDL.Common.Pxz.Explorer/PlexDL.Common.Pxz.Explorer.csproj @@ -0,0 +1,78 @@ + + + + + Debug + AnyCPU + {0A32FB9A-6AA2-4B4A-BD51-3AB9F2706232} + Library + Properties + PlexDL.Common.Pxz.Explorer + PlexDL.Common.Pxz.Explorer + v4.7.2 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + Form + + + PxzExplorer.cs + + + + + {3c18fc31-d361-42fb-ae18-42faacd4e419} + PlexDL.Common.Components + + + {2c0b4243-5d9e-454a-9a7b-dcac2787b13e} + PlexDL.Common.Enums + + + {1764ca80-f851-4e2c-acc8-37696d499d3b} + PlexDL.Common.Pxz + + + {6d5d6fdd-9371-4ebb-8875-eebe170a47cd} + PlexDL.WaitWindow + + + {e3ce262b-b962-44ff-abc0-5ebfb403d51d} + UIHelpers + + + + + PxzExplorer.cs + + + + \ No newline at end of file diff --git a/PlexDL.Common.Pxz.Explorer/Properties/AssemblyInfo.cs b/PlexDL.Common.Pxz.Explorer/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..d06c1f1 --- /dev/null +++ b/PlexDL.Common.Pxz.Explorer/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +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("PlexDL.Common.Pxz.Explorer")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("PlexDL.Common.Pxz.Explorer")] +[assembly: AssemblyCopyright("Copyright © 2024")] +[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("0a32fb9a-6aa2-4b4a-bd51-3ab9f2706232")] + +// 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/PlexDL.Common.Pxz/UI/PxzExplorer.Designer.cs b/PlexDL.Common.Pxz.Explorer/UI/PxzExplorer.Designer.cs similarity index 100% rename from PlexDL.Common.Pxz/UI/PxzExplorer.Designer.cs rename to PlexDL.Common.Pxz.Explorer/UI/PxzExplorer.Designer.cs diff --git a/PlexDL.Common.Pxz/UI/PxzExplorer.cs b/PlexDL.Common.Pxz.Explorer/UI/PxzExplorer.cs similarity index 100% rename from PlexDL.Common.Pxz/UI/PxzExplorer.cs rename to PlexDL.Common.Pxz.Explorer/UI/PxzExplorer.cs diff --git a/PlexDL.Common.Pxz/UI/PxzExplorer.resx b/PlexDL.Common.Pxz.Explorer/UI/PxzExplorer.resx similarity index 100% rename from PlexDL.Common.Pxz/UI/PxzExplorer.resx rename to PlexDL.Common.Pxz.Explorer/UI/PxzExplorer.resx diff --git a/PlexDL.Common.Pxz/PlexDL.Common.Pxz.csproj b/PlexDL.Common.Pxz/PlexDL.Common.Pxz.csproj index 2d7544b..3e1e5cb 100644 --- a/PlexDL.Common.Pxz/PlexDL.Common.Pxz.csproj +++ b/PlexDL.Common.Pxz/PlexDL.Common.Pxz.csproj @@ -37,10 +37,8 @@ - - @@ -51,12 +49,6 @@ - - Form - - - PxzExplorer.cs - @@ -71,10 +63,6 @@ - - {3c18fc31-d361-42fb-ae18-42faacd4e419} - PlexDL.Common.Components - {2c0b4243-5d9e-454a-9a7b-dcac2787b13e} PlexDL.Common.Enums @@ -83,22 +71,10 @@ {aba08e30-bcbb-4eb8-a187-8c8b7037bc48} PlexDL.Common.Security - - {6d5d6fdd-9371-4ebb-8875-eebe170a47cd} - PlexDL.WaitWindow - - - {e3ce262b-b962-44ff-abc0-5ebfb403d51d} - UIHelpers - - - - - PxzExplorer.cs - + \ No newline at end of file diff --git a/PlexDL.Common.Pxz/PlexDL.Common.Pxz.nuspec b/PlexDL.Common.Pxz/PlexDL.Common.Pxz.nuspec new file mode 100644 index 0000000..d3ac5dc --- /dev/null +++ b/PlexDL.Common.Pxz/PlexDL.Common.Pxz.nuspec @@ -0,0 +1,20 @@ + + + + $id$ + 1.7.3 + PlexDL.Common.Pxz + BRH Media + false + MIT + https://github.com/BRH-Media/PlexDL + Provides decoding and encoding for the PXZ (PlexDL XML-Zipped) Format + Initial release + Copyright (c) BRH Media (Baeleigh Harris) 2024 + PlexDL pxz packing xml zip enums security png + + + + + + \ No newline at end of file diff --git a/PlexDL.Common.Pxz/Properties/AssemblyInfo.cs b/PlexDL.Common.Pxz/Properties/AssemblyInfo.cs index 32a012b..c65615e 100644 --- a/PlexDL.Common.Pxz/Properties/AssemblyInfo.cs +++ b/PlexDL.Common.Pxz/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("PlexDL.Common.Pxz")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("Provides decoding and encoding for the PXZ (PlexDL XML-Zipped) Format")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("BRH Media")] [assembly: AssemblyProduct("PlexDL.Common.Pxz")] diff --git a/PlexDL.Common.Pxz/Structures/File/PxzFile.cs b/PlexDL.Common.Pxz/Structures/File/PxzFile.cs index 26129b5..8ca08ca 100644 --- a/PlexDL.Common.Pxz/Structures/File/PxzFile.cs +++ b/PlexDL.Common.Pxz/Structures/File/PxzFile.cs @@ -4,14 +4,12 @@ using PlexDL.Common.Pxz.Enums; using PlexDL.Common.Pxz.Extensions; using PlexDL.Common.Pxz.Structures.File.Record; -using PlexDL.Common.Pxz.UI; using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; using System.Xml.Serialization; -using UIHelpers; // ReSharper disable UnusedMember.Global // ReSharper disable ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator @@ -133,14 +131,6 @@ public List SelectType(PxzRecordType type) return new List(); } - /// - /// Show the PXZ Explorer with the current PXZ file loaded - /// - public void ShowInformation() - { - PxzExplorer.ShowPxzExplorer(this); - } - /// /// Load a record from the PXZ index /// @@ -279,7 +269,7 @@ public void Load(string path) if (idxFile == null) { if (!ParseSilent) - UIMessages.Error(@"PXZ index couldn't be found or it isn't valid"); + throw new Exception(@"PXZ index couldn't be found or it isn't valid"); return; } @@ -336,12 +326,12 @@ public void Load(string path) //check authenticity flag, and warn if it's been altered if (tamperedWith) if (!ParseSilent) - UIMessages.Warning("Content has been modified\n\nThe MD5 checksums stored do not match the checksums calculated, which is an indication that the contents may have been altered outside of the PXZ handler. The file will continue loading after you close this message."); + throw new Exception("Content has been modified\n\nThe MD5 checksums stored do not match the checksums calculated, which is an indication that the contents may have been altered outside of the PXZ handler. The file will continue loading after you close this message."); } - catch (Exception ex) + catch (Exception) { if (!ParseSilent) - UIMessages.Error(ex.ToString()); + throw; } } } diff --git a/PlexDL.Common.Security/PlexDL.Common.Security.nuspec b/PlexDL.Common.Security/PlexDL.Common.Security.nuspec new file mode 100644 index 0000000..d9fbb54 --- /dev/null +++ b/PlexDL.Common.Security/PlexDL.Common.Security.nuspec @@ -0,0 +1,19 @@ + + + + $id$ + 1.7.3 + PlexDL.Common.Security + BRH Media + false + MIT + https://github.com/BRH-Media/PlexDL + Provides security functionality (i.e., encryption/decryption) for various PlexDL functions + Initial release + Copyright (c) BRH Media (Baeleigh Harris) 2024 + PlexDL enums security package + + + + + \ No newline at end of file diff --git a/PlexDL.Common.Security/Properties/AssemblyInfo.cs b/PlexDL.Common.Security/Properties/AssemblyInfo.cs index 6958232..3dc5fb0 100644 --- a/PlexDL.Common.Security/Properties/AssemblyInfo.cs +++ b/PlexDL.Common.Security/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("PlexDL.Common.Security")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("Provides security functionality (i.e., encryption/decryption) for various PlexDL functions")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("BRH Media")] [assembly: AssemblyProduct("PlexDL.Common.Security")] diff --git a/PlexDL.sln b/PlexDL.sln index 9f4d74b..1f99989 100644 --- a/PlexDL.sln +++ b/PlexDL.sln @@ -45,6 +45,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexDL.Common.BarcodeHandle EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexDL.Common.Shodan", "PlexDL.Common.Shodan\PlexDL.Common.Shodan.csproj", "{5CA1F4F9-C5CB-4AFF-96CD-9B8F78968EAA}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexDL.Common.Pxz.Explorer", "PlexDL.Common.Pxz.Explorer\PlexDL.Common.Pxz.Explorer.csproj", "{0A32FB9A-6AA2-4B4A-BD51-3AB9F2706232}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -133,6 +135,10 @@ Global {5CA1F4F9-C5CB-4AFF-96CD-9B8F78968EAA}.Debug|Any CPU.Build.0 = Debug|Any CPU {5CA1F4F9-C5CB-4AFF-96CD-9B8F78968EAA}.Release|Any CPU.ActiveCfg = Release|Any CPU {5CA1F4F9-C5CB-4AFF-96CD-9B8F78968EAA}.Release|Any CPU.Build.0 = Release|Any CPU + {0A32FB9A-6AA2-4B4A-BD51-3AB9F2706232}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A32FB9A-6AA2-4B4A-BD51-3AB9F2706232}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A32FB9A-6AA2-4B4A-BD51-3AB9F2706232}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A32FB9A-6AA2-4B4A-BD51-3AB9F2706232}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PlexDL/PlexDL.csproj b/PlexDL/PlexDL.csproj index ec7817d..5f7c122 100644 --- a/PlexDL/PlexDL.csproj +++ b/PlexDL/PlexDL.csproj @@ -354,6 +354,10 @@ {2c0b4243-5d9e-454a-9a7b-dcac2787b13e} PlexDL.Common.Enums + + {0a32fb9a-6aa2-4b4a-bd51-3ab9f2706232} + PlexDL.Common.Pxz.Explorer + {1764ca80-f851-4e2c-acc8-37696d499d3b} PlexDL.Common.Pxz diff --git a/PlexDL/UI/Forms/Home.cs b/PlexDL/UI/Forms/Home.cs index a724029..209d35a 100644 --- a/PlexDL/UI/Forms/Home.cs +++ b/PlexDL/UI/Forms/Home.cs @@ -16,7 +16,6 @@ using PlexDL.Common.Logging; using PlexDL.Common.Net; using PlexDL.Common.PlayerLaunchers; -using PlexDL.Common.Pxz.UI; using PlexDL.Common.Renderers.Forms.GridView; using PlexDL.Common.SearchFramework; using PlexDL.Common.Security; @@ -38,6 +37,7 @@ using System.Threading; using System.Windows.Forms; using System.Xml; +using PlexDL.Common.Pxz.UI; using UIHelpers; using Directory = System.IO.Directory; diff --git a/PlexDL/packages.config b/PlexDL/packages.config index 289631a..5c7776a 100644 --- a/PlexDL/packages.config +++ b/PlexDL/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file