From 6fdc8841fba1c00d0b3fefa87f1c4abed722ba25 Mon Sep 17 00:00:00 2001
From: Michael Becker <alcexhim@gmail.com>
Date: Thu, 10 Sep 2020 05:49:18 -0400
Subject: [PATCH] reorganize associations and add ContentType and
 HintComparison

---
 .../Associations/PlainText.uexml              | 22 +++++++++++++++++
 .../UniversalEditor.Essential.csproj          |  4 ++++
 .../FileSystem}/Abomination.uexml             |  4 ++--
 ...UniversalEditor.Plugins.Abomination.csproj |  7 ++++++
 .../Associations/PKZip.uexml                  |  2 +-
 .../UniversalEditor.Plugins.FileSystem.csproj |  4 ----
 .../Associations}/Cabinet.uexml               |  4 ++--
 .../Associations/InstallShieldScript.uexml    | 24 ++-----------------
 .../Associations}/PKG.uexml                   |  2 +-
 .../Associations}/Z.uexml                     |  2 +-
 ...iversalEditor.Plugins.InstallShield.csproj |  3 +++
 .../Associations/Kronosaur.uexml              |  2 +-
 .../Associations/SegaA3DA.uexml               |  2 +-
 .../Associations/Database/PSFDataFormat.uexml |  2 +-
 .../Associations/PlayStation/GIM.uexml        |  2 +-
 .../Associations/PlayStation/PKG.uexml        |  2 +-
 .../SynalysisBinaryGrammarDataFormat.uexml    |  2 +-
 .../Associations/UnrealPackage.uexml          |  6 ++++-
 .../Associations/UnrealUMOD.uexml             |  2 +-
 19 files changed, 57 insertions(+), 41 deletions(-)
 create mode 100644 Libraries/UniversalEditor.Essential/Associations/PlainText.uexml
 rename Plugins/{UniversalEditor.Plugins.FileSystem/Associations => UniversalEditor.Plugins.Abomination/Associations/FileSystem}/Abomination.uexml (91%)
 rename Plugins/{UniversalEditor.Plugins.FileSystem/Associations/InstallShield => UniversalEditor.Plugins.InstallShield/Associations}/Cabinet.uexml (86%)
 rename Plugins/{UniversalEditor.Plugins.FileSystem/Associations/InstallShield => UniversalEditor.Plugins.InstallShield/Associations}/PKG.uexml (86%)
 rename Plugins/{UniversalEditor.Plugins.FileSystem/Associations/InstallShield => UniversalEditor.Plugins.InstallShield/Associations}/Z.uexml (87%)

diff --git a/Libraries/UniversalEditor.Essential/Associations/PlainText.uexml b/Libraries/UniversalEditor.Essential/Associations/PlainText.uexml
new file mode 100644
index 00000000..2f03830a
--- /dev/null
+++ b/Libraries/UniversalEditor.Essential/Associations/PlainText.uexml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UniversalEditor Version="4.0">
+	<Associations>
+		<Association>
+			<Filters>
+				<Filter Title="Plain text document">
+					<FileNameFilters>
+						<FileNameFilter>*.txt</FileNameFilter>
+						<FileNameFilter>*.exc</FileNameFilter>
+						<FileNameFilter>*.log</FileNameFilter>
+					</FileNameFilters>
+				</Filter>
+			</Filters>
+			<ObjectModels>
+				<ObjectModel TypeName="UniversalEditor.ObjectModels.Text.Plain.PlainTextObjectModel" />
+			</ObjectModels>
+			<DataFormats>
+				<DataFormat TypeName="UniversalEditor.DataFormats.Text.Plain.PlainTextDataFormat" />
+			</DataFormats>
+		</Association>
+	</Associations>
+</UniversalEditor>
\ No newline at end of file
diff --git a/Libraries/UniversalEditor.Essential/UniversalEditor.Essential.csproj b/Libraries/UniversalEditor.Essential/UniversalEditor.Essential.csproj
index 10119a85..b6968181 100644
--- a/Libraries/UniversalEditor.Essential/UniversalEditor.Essential.csproj
+++ b/Libraries/UniversalEditor.Essential/UniversalEditor.Essential.csproj
@@ -258,6 +258,10 @@
     <Folder Include="DataFormats\Package\OpenDocument\" />
     <Folder Include="DataFormats\FileSystem\" />
     <Folder Include="DataFormats\FileSystem\ZIP\" />
+    <Folder Include="Associations\" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Associations\PlainText.uexml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Plugins/UniversalEditor.Plugins.FileSystem/Associations/Abomination.uexml b/Plugins/UniversalEditor.Plugins.Abomination/Associations/FileSystem/Abomination.uexml
similarity index 91%
rename from Plugins/UniversalEditor.Plugins.FileSystem/Associations/Abomination.uexml
rename to Plugins/UniversalEditor.Plugins.Abomination/Associations/FileSystem/Abomination.uexml
index 7c9a4852..67f7dc66 100644
--- a/Plugins/UniversalEditor.Plugins.FileSystem/Associations/Abomination.uexml
+++ b/Plugins/UniversalEditor.Plugins.Abomination/Associations/FileSystem/Abomination.uexml
@@ -3,7 +3,7 @@
 	<Associations>
 		<Association>
 			<Filters>
-				<Filter Title="Abomination: The Nemesis Project AWF archive">
+				<Filter Title="Abomination: The Nemesis Project AWF archive" ContentType="application/x-abomination-awf">
 					<FileNameFilters>
 						<FileNameFilter>*.awf</FileNameFilter>
 					</FileNameFilters>
@@ -18,7 +18,7 @@
 		</Association>
 		<Association>
 			<Filters>
-				<Filter Title="Abomination: The Nemesis Project CLT archive">
+				<Filter Title="Abomination: The Nemesis Project CLT archive" ContentType="application/x-abomination-clt">
 					<FileNameFilters>
 						<FileNameFilter>*.clt</FileNameFilter>
 					</FileNameFilters>
diff --git a/Plugins/UniversalEditor.Plugins.Abomination/UniversalEditor.Plugins.Abomination.csproj b/Plugins/UniversalEditor.Plugins.Abomination/UniversalEditor.Plugins.Abomination.csproj
index 996d6ab7..1f16fadd 100644
--- a/Plugins/UniversalEditor.Plugins.Abomination/UniversalEditor.Plugins.Abomination.csproj
+++ b/Plugins/UniversalEditor.Plugins.Abomination/UniversalEditor.Plugins.Abomination.csproj
@@ -50,6 +50,13 @@
       <Name>UniversalEditor.Essential</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Associations\" />
+    <Folder Include="Associations\FileSystem\" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Associations\FileSystem\Abomination.uexml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Plugins/UniversalEditor.Plugins.FileSystem/Associations/PKZip.uexml b/Plugins/UniversalEditor.Plugins.FileSystem/Associations/PKZip.uexml
index 2d07a1b8..84b64ec5 100644
--- a/Plugins/UniversalEditor.Plugins.FileSystem/Associations/PKZip.uexml
+++ b/Plugins/UniversalEditor.Plugins.FileSystem/Associations/PKZip.uexml
@@ -3,7 +3,7 @@
 	<Associations>
 		<Association>
 			<Filters>
-				<Filter Title="PKWARE ZIP archive">
+				<Filter Title="PKWARE ZIP archive" ContentType="application/zip" HintComparison="MagicThenFilter">
 					<FileNameFilters>
 						<FileNameFilter>*.zip</FileNameFilter>
 						<FileNameFilter>*.zipx</FileNameFilter>
diff --git a/Plugins/UniversalEditor.Plugins.FileSystem/UniversalEditor.Plugins.FileSystem.csproj b/Plugins/UniversalEditor.Plugins.FileSystem/UniversalEditor.Plugins.FileSystem.csproj
index 7ddd1013..92fb0597 100644
--- a/Plugins/UniversalEditor.Plugins.FileSystem/UniversalEditor.Plugins.FileSystem.csproj
+++ b/Plugins/UniversalEditor.Plugins.FileSystem/UniversalEditor.Plugins.FileSystem.csproj
@@ -321,9 +321,6 @@
     <EmbeddedResource Include="Associations\CFL.uexml" />
     <EmbeddedResource Include="Associations\CPIO.uexml" />
     <EmbeddedResource Include="Associations\FAT.uexml" />
-    <EmbeddedResource Include="Associations\InstallShield\Cabinet.uexml" />
-    <EmbeddedResource Include="Associations\InstallShield\PKG.uexml" />
-    <EmbeddedResource Include="Associations\InstallShield\Z.uexml" />
     <EmbeddedResource Include="Associations\ISO9660.uexml" />
     <EmbeddedResource Include="Associations\IZArc.uexml" />
     <EmbeddedResource Include="Associations\LHA.uexml" />
@@ -350,7 +347,6 @@
     <EmbeddedResource Include="Associations\KenSilverman\GRP.uexml" />
     <EmbeddedResource Include="Associations\187RideOrDie.uexml" />
     <EmbeddedResource Include="Associations\2NBFPCK.uexml" />
-    <EmbeddedResource Include="Associations\Abomination.uexml" />
     <EmbeddedResource Include="Associations\AlienNationsGD.uexml" />
     <EmbeddedResource Include="Associations\AquarnoidGOB.uexml" />
     <EmbeddedResource Include="Associations\Arcanum.uexml" />
diff --git a/Plugins/UniversalEditor.Plugins.FileSystem/Associations/InstallShield/Cabinet.uexml b/Plugins/UniversalEditor.Plugins.InstallShield/Associations/Cabinet.uexml
similarity index 86%
rename from Plugins/UniversalEditor.Plugins.FileSystem/Associations/InstallShield/Cabinet.uexml
rename to Plugins/UniversalEditor.Plugins.InstallShield/Associations/Cabinet.uexml
index 4f7a15f6..4c3f9580 100644
--- a/Plugins/UniversalEditor.Plugins.FileSystem/Associations/InstallShield/Cabinet.uexml
+++ b/Plugins/UniversalEditor.Plugins.InstallShield/Associations/Cabinet.uexml
@@ -3,7 +3,7 @@
 	<Associations>
 		<Association>
 			<Filters>
-				<Filter Title="InstallShield cabinet">
+				<Filter Title="InstallShield cabinet" ContentType="application/x-installshield-cab">
 					<FileNameFilters>
 						<FileNameFilter>*.cab</FileNameFilter>
 					</FileNameFilters>
@@ -23,7 +23,7 @@
 		</Association>
 		<Association>
 			<Filters>
-				<Filter Title="InstallShield cabinet header">
+				<Filter Title="InstallShield cabinet header" ContentType="application/x-installshield-hdr">
 					<FileNameFilters>
 						<FileNameFilter>*.hdr</FileNameFilter>
 					</FileNameFilters>
diff --git a/Plugins/UniversalEditor.Plugins.InstallShield/Associations/InstallShieldScript.uexml b/Plugins/UniversalEditor.Plugins.InstallShield/Associations/InstallShieldScript.uexml
index e69b5d64..40126ab6 100644
--- a/Plugins/UniversalEditor.Plugins.InstallShield/Associations/InstallShieldScript.uexml
+++ b/Plugins/UniversalEditor.Plugins.InstallShield/Associations/InstallShieldScript.uexml
@@ -3,7 +3,7 @@
 	<Associations>
 		<Association>
 			<Filters>
-				<Filter Title="InstallShield compiled script (INS)">
+				<Filter Title="InstallShield compiled script (INS)" ContentType="application/x-installshield-ins">
 					<FileNameFilters>
 						<FileNameFilter>*.ins</FileNameFilter>
 					</FileNameFilters>
@@ -25,7 +25,7 @@
 		</Association>
 		<Association>
 			<Filters>
-				<Filter Title="InstallShield compiled script (INX)">
+				<Filter Title="InstallShield compiled script (INX)" ContentType="application/x-installshield-inx">
 					<FileNameFilters>
 						<FileNameFilter>*.inx</FileNameFilter>
 					</FileNameFilters>
@@ -43,25 +43,5 @@
 				<DataFormat TypeName="UniversalEditor.DataFormats.InstallShield.Script.InstallShieldScriptV2DataFormat" />
 			</DataFormats>
 		</Association>
-		<Association>
-			<Filters>
-				<Filter Title="InstallShield installation package">
-					<FileNameFilters>
-						<FileNameFilter>*.pkg</FileNameFilter>
-					</FileNameFilters>
-					<MagicByteSequences>
-						<MagicByteSequence>
-							<MagicByte Type="HexString">4AA3</MagicByte>
-						</MagicByteSequence>
-					</MagicByteSequences>
-				</Filter>
-			</Filters>
-			<ObjectModels>
-				<ObjectModel TypeName="UniversalEditor.ObjectModels.FileSystem.FileSystemObjectModel" />
-			</ObjectModels>
-			<DataFormats>
-				<DataFormat TypeName="UniversalEditor.DataFormats.FileSystem.InstallShield.PKG.PKGDataFormat" />
-			</DataFormats>
-		</Association>
 	</Associations>
 </UniversalEditor>
\ No newline at end of file
diff --git a/Plugins/UniversalEditor.Plugins.FileSystem/Associations/InstallShield/PKG.uexml b/Plugins/UniversalEditor.Plugins.InstallShield/Associations/PKG.uexml
similarity index 86%
rename from Plugins/UniversalEditor.Plugins.FileSystem/Associations/InstallShield/PKG.uexml
rename to Plugins/UniversalEditor.Plugins.InstallShield/Associations/PKG.uexml
index cadfd5f0..938a4609 100644
--- a/Plugins/UniversalEditor.Plugins.FileSystem/Associations/InstallShield/PKG.uexml
+++ b/Plugins/UniversalEditor.Plugins.InstallShield/Associations/PKG.uexml
@@ -3,7 +3,7 @@
 	<Associations>
 		<Association>
 			<Filters>
-				<Filter Title="InstallShield archive index">
+				<Filter Title="InstallShield archive index" ContentType="application/x-installshield-pkg">
 					<FileNameFilters>
 						<FileNameFilter>*.pkg</FileNameFilter>
 					</FileNameFilters>
diff --git a/Plugins/UniversalEditor.Plugins.FileSystem/Associations/InstallShield/Z.uexml b/Plugins/UniversalEditor.Plugins.InstallShield/Associations/Z.uexml
similarity index 87%
rename from Plugins/UniversalEditor.Plugins.FileSystem/Associations/InstallShield/Z.uexml
rename to Plugins/UniversalEditor.Plugins.InstallShield/Associations/Z.uexml
index 4a1dd434..bb60d8ab 100644
--- a/Plugins/UniversalEditor.Plugins.FileSystem/Associations/InstallShield/Z.uexml
+++ b/Plugins/UniversalEditor.Plugins.InstallShield/Associations/Z.uexml
@@ -3,7 +3,7 @@
 	<Associations>
 		<Association>
 			<Filters>
-				<Filter Title="InstallShield archive">
+				<Filter Title="InstallShield archive" ContentType="application/x-installshield-z">
 					<FileNameFilters>
 						<FileNameFilter>*.z</FileNameFilter>
 					</FileNameFilters>
diff --git a/Plugins/UniversalEditor.Plugins.InstallShield/UniversalEditor.Plugins.InstallShield.csproj b/Plugins/UniversalEditor.Plugins.InstallShield/UniversalEditor.Plugins.InstallShield.csproj
index 3e6ce1e7..6fe65811 100644
--- a/Plugins/UniversalEditor.Plugins.InstallShield/UniversalEditor.Plugins.InstallShield.csproj
+++ b/Plugins/UniversalEditor.Plugins.InstallShield/UniversalEditor.Plugins.InstallShield.csproj
@@ -64,6 +64,9 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Associations\InstallShieldScript.uexml" />
+    <EmbeddedResource Include="Associations\Cabinet.uexml" />
+    <EmbeddedResource Include="Associations\PKG.uexml" />
+    <EmbeddedResource Include="Associations\Z.uexml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Plugins/UniversalEditor.Plugins.Kronosaur/Associations/Kronosaur.uexml b/Plugins/UniversalEditor.Plugins.Kronosaur/Associations/Kronosaur.uexml
index d16bff9e..9b45e49f 100644
--- a/Plugins/UniversalEditor.Plugins.Kronosaur/Associations/Kronosaur.uexml
+++ b/Plugins/UniversalEditor.Plugins.Kronosaur/Associations/Kronosaur.uexml
@@ -3,7 +3,7 @@
 	<Associations>
 		<Association>
 			<Filters>
-				<Filter Title="Kronosaur/Neurohack Transcendence TDB archive">
+				<Filter Title="Kronosaur/Neurohack Transcendence TDB archive" ContentType="application/x-kronosaur-tdb">
 					<FileNameFilters>
 						<FileNameFilter>*.tdb</FileNameFilter>
 					</FileNameFilters>
diff --git a/Plugins/UniversalEditor.Plugins.Sega/Associations/SegaA3DA.uexml b/Plugins/UniversalEditor.Plugins.Sega/Associations/SegaA3DA.uexml
index d22cfa48..d14f7753 100644
--- a/Plugins/UniversalEditor.Plugins.Sega/Associations/SegaA3DA.uexml
+++ b/Plugins/UniversalEditor.Plugins.Sega/Associations/SegaA3DA.uexml
@@ -3,7 +3,7 @@
 	<Associations>
 		<Association>
 			<Filters>
-				<Filter Title="Sega A3DA configuration file">
+				<Filter Title="Sega A3DA configuration file" ContentType="application/x-sega-a3da">
 					<FileNameFilters>
 						<FileNameFilter>*.a3da</FileNameFilter>
 					</FileNameFilters>
diff --git a/Plugins/UniversalEditor.Plugins.Sony/Associations/Database/PSFDataFormat.uexml b/Plugins/UniversalEditor.Plugins.Sony/Associations/Database/PSFDataFormat.uexml
index b88d507a..25bd5ba9 100644
--- a/Plugins/UniversalEditor.Plugins.Sony/Associations/Database/PSFDataFormat.uexml
+++ b/Plugins/UniversalEditor.Plugins.Sony/Associations/Database/PSFDataFormat.uexml
@@ -3,7 +3,7 @@
 	<Associations>
 		<Association>
 			<Filters>
-				<Filter Title="Sony PSF (PARAM.SFO) database">
+				<Filter Title="Sony PSF (PARAM.SFO) database" ContentType="application/x-sony-sfo">
 					<FileNameFilters>
 						<FileNameFilter>*.sfo</FileNameFilter>
 					</FileNameFilters>
diff --git a/Plugins/UniversalEditor.Plugins.Sony/Associations/PlayStation/GIM.uexml b/Plugins/UniversalEditor.Plugins.Sony/Associations/PlayStation/GIM.uexml
index 800949d8..9f81cc16 100644
--- a/Plugins/UniversalEditor.Plugins.Sony/Associations/PlayStation/GIM.uexml
+++ b/Plugins/UniversalEditor.Plugins.Sony/Associations/PlayStation/GIM.uexml
@@ -3,7 +3,7 @@
 	<Associations>
 		<Association>
 			<Filters>
-				<Filter Title="PlayStation GIM image">
+				<Filter Title="PlayStation GIM image" ContentType="application/x-sony-gim">
 					<FileNameFilters>
 						<FileNameFilter>*.gim</FileNameFilter>
 					</FileNameFilters>
diff --git a/Plugins/UniversalEditor.Plugins.Sony/Associations/PlayStation/PKG.uexml b/Plugins/UniversalEditor.Plugins.Sony/Associations/PlayStation/PKG.uexml
index 37c87ca7..4bce8857 100644
--- a/Plugins/UniversalEditor.Plugins.Sony/Associations/PlayStation/PKG.uexml
+++ b/Plugins/UniversalEditor.Plugins.Sony/Associations/PlayStation/PKG.uexml
@@ -3,7 +3,7 @@
 	<Associations>
 		<Association>
 			<Filters>
-				<Filter Title="PlayStation Network package">
+				<Filter Title="PlayStation Network package" ContentType="application/x-sony-pkg">
 					<FileNameFilters>
 						<FileNameFilter>*.pkg</FileNameFilter>
 					</FileNameFilters>
diff --git a/Plugins/UniversalEditor.Plugins.Synalysis/Associations/SynalysisBinaryGrammarDataFormat.uexml b/Plugins/UniversalEditor.Plugins.Synalysis/Associations/SynalysisBinaryGrammarDataFormat.uexml
index 6398b418..04655843 100644
--- a/Plugins/UniversalEditor.Plugins.Synalysis/Associations/SynalysisBinaryGrammarDataFormat.uexml
+++ b/Plugins/UniversalEditor.Plugins.Synalysis/Associations/SynalysisBinaryGrammarDataFormat.uexml
@@ -3,7 +3,7 @@
 	<Associations>
 		<Association>
 			<Filters>
-				<Filter Title="Synalysis XML grammar definition">
+				<Filter Title="Synalysis XML grammar definition" ContentType="text/x-synalysis-grammar+xml">
 					<FileNameFilters>
 						<FileNameFilter>*.grammar</FileNameFilter>
 					</FileNameFilters>
diff --git a/Plugins/UniversalEditor.Plugins.UnrealEngine/Associations/UnrealPackage.uexml b/Plugins/UniversalEditor.Plugins.UnrealEngine/Associations/UnrealPackage.uexml
index c6d19597..db95430e 100644
--- a/Plugins/UniversalEditor.Plugins.UnrealEngine/Associations/UnrealPackage.uexml
+++ b/Plugins/UniversalEditor.Plugins.UnrealEngine/Associations/UnrealPackage.uexml
@@ -3,11 +3,15 @@
 	<Associations>
 		<Association>
 			<Filters>
-				<Filter Title="Unreal Engine package">
+				<Filter Title="Unreal Engine package" ContentType="application/x-unreal-package">
 					<FileNameFilters>
 						<FileNameFilter>*.u</FileNameFilter>
 						<FileNameFilter>*.utx</FileNameFilter>
 						<FileNameFilter>*.upk</FileNameFilter>
+						<FileNameFilter>*.usx</FileNameFilter>
+						<FileNameFilter>*.uax</FileNameFilter>
+						<FileNameFilter>*.unr</FileNameFilter>
+						<FileNameFilter>*.ukx</FileNameFilter>
 					</FileNameFilters>
 					<MagicByteSequences>
 						<MagicByteSequence>
diff --git a/Plugins/UniversalEditor.Plugins.UnrealEngine/Associations/UnrealUMOD.uexml b/Plugins/UniversalEditor.Plugins.UnrealEngine/Associations/UnrealUMOD.uexml
index 0cd4abe5..5b80afd2 100644
--- a/Plugins/UniversalEditor.Plugins.UnrealEngine/Associations/UnrealUMOD.uexml
+++ b/Plugins/UniversalEditor.Plugins.UnrealEngine/Associations/UnrealUMOD.uexml
@@ -3,7 +3,7 @@
 	<Associations>
 		<Association>
 			<Filters>
-				<Filter Title="Unreal Engine UMOD installer">
+				<Filter Title="Unreal Engine UMOD installer" ContentType="application/x-unreal-umod">
 					<FileNameFilters>
 						<FileNameFilter>*.umod</FileNameFilter>
 					</FileNameFilters>