Merge pull request #15 from XElementDev/AdminPrivilegesIssue_20180630

IanStorm · web-flow · commit e5206cfb2929 · 2018-06-30T20:03:14.000+02:00
AdminPrivilegesIssue_20180630
diff --git a/DataCreator/DataCreator/Data/Games/CodMw3.cs b/DataCreator/DataCreator/Data/Games/CodMw3.cs
@@ -1,4 +1,7 @@
-﻿using System.ComponentModel.Composition;
+﻿using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using XElement.CloudSyncHelper.Serialization.DataTypes;
+using XElement.DotNet.System.Environment;
 
 namespace XElement.CloudSyncHelper.DataCreator.Data.Games
 {
@@ -15,9 +18,25 @@ public CodMw3() : base( "5015F2D9-3547-4958-8CBE-CDF8E91B43A1" )
         }
 
 
+        // TODO: Include
+        private List<AbstractLinkInfo> GetLinksForWin10()
+        {
+            /*
+             * Location: <install-folder>\players2\save\
+             *                                      ↑ folder link to "save" folder
+             * see https://pcgamingwiki.com/wiki/Call_of_Duty:_Modern_Warfare_3
+             */
+            return new List<AbstractLinkInfo>();
+        }
+
+
         protected override void OnImportsSatisfied()
         {
-            this.DefinitionInfo = this._definitionFactory.GetSteamCloud();
+            var osConfigs = new List<OsConfigurationInfo>
+            {
+                this._osConfigFactory.Get( this.GetLinksForWin10(), OsId.Win10 )
+            };
+            this.DefinitionInfo = this._definitionFactory.Get( osConfigs );
             return;
         }
     }
diff --git a/DataCreator/DataCreator/Data/Games/LegoBatman3.cs b/DataCreator/DataCreator/Data/Games/LegoBatman3.cs
@@ -16,11 +16,14 @@ public LegoBatman3() : base( "A1F8ED7C-B93F-4F32-AEFF-E63EF632618D" )
                                          SpecialCharacters.REGISTERED_TRADEMARK, 
                                          SpecialCharacters.TRADEMARK );
             this.TechnicalNameMatcher = matcher;
+            return;
         }
 
+
         protected override void OnImportsSatisfied()
         {
             this.DefinitionInfo = this._definitionFactory.GetSteamCloud();
+            return;
         }
     }
 }
diff --git a/DataCreator/DataCreator/Data/Games/LoversInADangerousSpacetime.cs b/DataCreator/DataCreator/Data/Games/LoversInADangerousSpacetime.cs
@@ -0,0 +1,24 @@
+﻿using System.ComponentModel.Composition;
+
+namespace XElement.CloudSyncHelper.DataCreator.Data.Games
+{
+    [Export( typeof( AbstractGameInfo ) )]
+    internal class LoversInADangerousSpacetime : AbstractGameInfo
+    {
+        [ImportingConstructor]
+        public LoversInADangerousSpacetime() : base( "3526A2B7-715C-4D22-88AD-BCDB5E129D9B" )
+        {
+            this.ApplicationName = "Lovers in a Dangerous Spacetime";
+            this.FolderName = this.ApplicationName;
+            this.TechnicalNameMatcher = this.ApplicationName;
+            return;
+        }
+
+
+        protected override void OnImportsSatisfied()
+        {
+            this.DefinitionInfo = this._definitionFactory.GetSteamCloud();
+            return;
+        }
+    }
+}
diff --git a/DataCreator/DataCreator/Data/Games/MiniMetro.cs b/DataCreator/DataCreator/Data/Games/MiniMetro.cs
@@ -0,0 +1,24 @@
+﻿using System.ComponentModel.Composition;
+
+namespace XElement.CloudSyncHelper.DataCreator.Data.Games
+{
+    [Export( typeof( AbstractGameInfo ) )]
+    internal class MiniMetro : AbstractGameInfo
+    {
+        [ImportingConstructor]
+        public MiniMetro() : base( "06A5DCA9-C60D-4C92-BED1-B9250766CF69" )
+        {
+            this.ApplicationName = "Mini Metro";
+            this.FolderName = "Mini Metro 2015 [Mini Metro]";
+            this.TechnicalNameMatcher = this.ApplicationName;
+            return;
+        }
+
+
+        protected override void OnImportsSatisfied()
+        {
+            this.DefinitionInfo = this._definitionFactory.GetSteamCloud();
+            return;
+        }
+    }
+}
diff --git a/DataCreator/DataCreator/Data/Games/OrcsMustDie2.cs b/DataCreator/DataCreator/Data/Games/OrcsMustDie2.cs
@@ -10,13 +10,15 @@ public OrcsMustDie2() : base( "41128DF6-5E43-45A1-9DA3-70EE2760FCFE" )
         {
             this.ApplicationName = "Orcs Must Die! 2";
             this.FolderName = "Orcs Must Die 2012 [Orcs Must Die! 2]";
-            this.TechnicalNameMatcher = "Orcs Must Die! 2";
+            this.TechnicalNameMatcher = this.ApplicationName;
+            return;
         }
 
 
         protected override void OnImportsSatisfied()
         {
             this.DefinitionInfo = this._definitionFactory.GetSteamCloud();
+            return;
         }
     }
 }
diff --git a/DataCreator/DataCreator/Data/Games/Overcooked.cs b/DataCreator/DataCreator/Data/Games/Overcooked.cs
@@ -0,0 +1,24 @@
+﻿using System.ComponentModel.Composition;
+
+namespace XElement.CloudSyncHelper.DataCreator.Data.Games
+{
+    [Export( typeof( AbstractGameInfo ) )]
+    internal class Overcooked : AbstractGameInfo
+    {
+        [ImportingConstructor]
+        public Overcooked() : base( "2C7C633B-B3B0-4B9C-BB0B-790D2B6384E7" )
+        {
+            this.ApplicationName = "Overcooked";
+            this.FolderName = "Overcooked 2016 [Overcooked]";
+            this.TechnicalNameMatcher = this.ApplicationName;
+            return;
+        }
+
+
+        protected override void OnImportsSatisfied()
+        {
+            this.DefinitionInfo = this._definitionFactory.GetSteamCloud();
+            return;
+        }
+    }
+}
diff --git a/DataCreator/DataCreator/Data/Games/Payday2.cs b/DataCreator/DataCreator/Data/Games/Payday2.cs
@@ -11,11 +11,14 @@ public Payday2() : base( "A48B8D74-6D6E-4E97-B32F-61BD596F6149" )
             this.ApplicationName = "PAYDAY 2";
             this.FolderName = "Payday 2013 [PAYDAY 2]";
             this.TechnicalNameMatcher = this.ApplicationName;
+            return;
         }
 
+
         protected override void OnImportsSatisfied()
         {
             this.DefinitionInfo = this._definitionFactory.GetSteamCloud();
+            return;
         }
     }
 }
diff --git a/DataCreator/DataCreator/Data/Games/Reus.cs b/DataCreator/DataCreator/Data/Games/Reus.cs
@@ -0,0 +1,49 @@
+﻿using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.IO;
+using XElement.CloudSyncHelper.Serialization.DataTypes;
+using XElement.DotNet.System.Environment;
+
+namespace XElement.CloudSyncHelper.DataCreator.Data.Games
+{
+    [Export( typeof( AbstractGameInfo ) )]
+    internal class Reus : AbstractGameInfo
+    {
+        [ImportingConstructor]
+        public Reus() : base( "DE8BF438-D9D5-442B-A1E9-93685B4ED382" )
+        {
+            this.ApplicationName = "Reus";
+            this.FolderName = "Reus 2013 [Reus]";
+            this.TechnicalNameMatcher = this.ApplicationName;
+            return;
+        }
+
+
+        private List<AbstractLinkInfo> GetLinksForWin10()
+        {
+            var destTargetName = "Saves";
+            return new List<AbstractLinkInfo>
+            {
+                new FolderLinkInfo
+                {
+                    DestinationRoot = Environment.SpecialFolder.MyDocuments,
+                    DestinationSubFolderPath = Path.Combine("Reus"),
+                    DestinationTargetName = destTargetName,
+                    SourceId = destTargetName
+                }
+            };
+        }
+
+
+        protected override void OnImportsSatisfied()
+        {
+            var osConfigs = new List<OsConfigurationInfo>
+            {
+                this._osConfigFactory.Get( this.GetLinksForWin10(), OsId.Win10 )
+            };
+            this.DefinitionInfo = this._definitionFactory.Get( osConfigs );
+            return;
+        }
+    }
+}
diff --git a/DataCreator/DataCreator/Data/Games/RiskOfRain.cs b/DataCreator/DataCreator/Data/Games/RiskOfRain.cs
@@ -11,11 +11,14 @@ public RiskOfRain() : base( "F0C7E626-408D-4C70-9B41-83C6C7C6BBEC" )
             this.ApplicationName = "Risk of Rain";
             this.FolderName = "Risk of Rain 2013 [Risk of Rain]";
             this.TechnicalNameMatcher = this.ApplicationName;
+            return;
         }
 
+
         protected override void OnImportsSatisfied()
         {
             this.DefinitionInfo = this._definitionFactory.GetSteamCloud();
+            return;
         }
     }
 }
diff --git a/DataCreator/DataCreator/Data/Games/RocketLeague.cs b/DataCreator/DataCreator/Data/Games/RocketLeague.cs
@@ -10,12 +10,15 @@ public RocketLeague() : base( "F4B10EAD-6195-47F3-A99E-CBDB4C93029C" )
         {
             this.ApplicationName = "Rocket League";
             this.FolderName = "Rocket League 2015 [Rocket League]";
-            this.TechnicalNameMatcher = "Rocket League";
+            this.TechnicalNameMatcher = this.ApplicationName;
+            return;
         }
 
+
         protected override void OnImportsSatisfied()
         {
             this.DefinitionInfo = this._definitionFactory.GetSteamCloud();
+            return;
         }
     }
 }
diff --git a/DataCreator/DataCreator/Data/Games/SegaAllStars2013.cs b/DataCreator/DataCreator/Data/Games/SegaAllStars2013.cs
@@ -11,11 +11,14 @@ public SegaAllStars2013() : base( "0074BFE1-1954-4A3B-9ACE-A313F9C868FE" )
             this.ApplicationName = "Sonic & All-Stars Racing Transformed";
             this.FolderName = "Sega All-Stars 2013 [Sonic _ All-Stars Racing Transformed]";
             this.TechnicalNameMatcher = this.ApplicationName;
+            return;
         }
 
+
         protected override void OnImportsSatisfied()
         {
             this.DefinitionInfo = this._definitionFactory.GetSteamCloud();
+            return;
         }
     }
 }
diff --git a/DataCreator/DataCreator/Data/Games/Starbound.cs b/DataCreator/DataCreator/Data/Games/Starbound.cs
@@ -1,4 +1,7 @@
-﻿using System.ComponentModel.Composition;
+﻿using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using XElement.CloudSyncHelper.Serialization.DataTypes;
+using XElement.DotNet.System.Environment;
 
 namespace XElement.CloudSyncHelper.DataCreator.Data.Games
 {
@@ -11,11 +14,33 @@ public Starbound() : base( "E33D0478-9ABC-49DC-9FA0-C9312BC5CF91" )
             this.ApplicationName = "Starbound";
             this.FolderName = "Starbound 2013 [Starbound]";
             this.TechnicalNameMatcher = this.ApplicationName;
+            return;
         }
 
+
+        // TODO: Include
+        private List<AbstractLinkInfo> GetLinksForWin10()
+        {
+            /*
+             * Locations: 
+             *  1) <install-folder>\storage\player\
+             *                                  ↑ folder link to "player" folder
+             *  2) <install-folder>\storage\universe\
+             *                                  ↑ folder link to "universe" folder
+             * see https://pcgamingwiki.com/wiki/Starbound
+             */
+            return new List<AbstractLinkInfo>();
+        }
+
+
         protected override void OnImportsSatisfied()
         {
-            this.DefinitionInfo = this._definitionFactory.GetSteamCloud();
+            var osConfigs = new List<OsConfigurationInfo>
+            {
+                this._osConfigFactory.Get( this.GetLinksForWin10(), OsId.Win10 )
+            };
+            this.DefinitionInfo = this._definitionFactory.Get( osConfigs );
+            return;
         }
     }
 }
diff --git a/DataCreator/DataCreator/Data/Games/SteamWorldDig.cs b/DataCreator/DataCreator/Data/Games/SteamWorldDig.cs
@@ -11,11 +11,14 @@ public SteamWorldDig() : base( "464D0492-C5A6-49AE-B425-12ED3A46B082" )
             this.ApplicationName = "SteamWorld Dig";
             this.FolderName = "SteamWorld 2013 [SteamWorld Dig]";
             this.TechnicalNameMatcher = this.ApplicationName;
+            return;
         }
 
+
         protected override void OnImportsSatisfied()
         {
             this.DefinitionInfo = this._definitionFactory.GetSteamCloud();
+            return;
         }
     }
 }
diff --git a/DataCreator/DataCreator/Data/Games/Terraria.cs b/DataCreator/DataCreator/Data/Games/Terraria.cs
@@ -11,11 +11,14 @@ public Terraria() : base( "367CBED1-9FF1-4226-9BAF-E3230AE19EFB" )
             this.ApplicationName = "Terraria";
             this.FolderName = "Terraria 2011 [Terraria]";
             this.TechnicalNameMatcher = "Terraria";
+            return;
         }
 
+
         protected override void OnImportsSatisfied()
         {
             this.DefinitionInfo = this._definitionFactory.GetSteamCloud();
+            return;
         }
     }
 }
diff --git a/DataCreator/DataCreator/Data/Games/TheWalkingDeadS1.cs b/DataCreator/DataCreator/Data/Games/TheWalkingDeadS1.cs
@@ -10,12 +10,15 @@ public TheWalkingDeadS1() : base( "28BD5524-AC8D-4F07-8987-524A4384722C" )
         {
             this.ApplicationName = "The Walking Dead";
             this.FolderName = "The Walking Dead 2012-2013 [The Walking Dead]";
-            this.TechnicalNameMatcher = "The Walking Dead";
+            this.TechnicalNameMatcher = this.ApplicationName;
+            return;
         }
 
+
         protected override void OnImportsSatisfied()
         {
             this.DefinitionInfo = this._definitionFactory.GetSteamCloud();
+            return;
         }
     }
 }
diff --git a/DataCreator/DataCreator/DataCreator.csproj b/DataCreator/DataCreator/DataCreator.csproj
@@ -45,6 +45,7 @@
     <Compile Include="Data\AbstractManagerT1.cs" />
     <Compile Include="Data\AbstractToolInfo.cs" />
     <Compile Include="Data\AbstractGameInfo.cs" />
+    <Compile Include="Data\Games\Reus.cs" />
     <Compile Include="Data\Games\BatmanArkhamOrigins.cs" />
     <Compile Include="Data\Games\BatmanArkhamCity.cs" />
     <Compile Include="Data\Games\BioshockRemastered.cs" />
@@ -54,6 +55,9 @@
     <Compile Include="Data\Games\DungeonOfTheEndless.cs" />
     <Compile Include="Data\Games\DefendYourLife.cs" />
     <Compile Include="Data\Games\AiWarFleetCommand.cs" />
+    <Compile Include="Data\Games\Overcooked.cs" />
+    <Compile Include="Data\Games\MiniMetro.cs" />
+    <Compile Include="Data\Games\LoversInADangerousSpacetime.cs" />
     <Compile Include="Data\Games\GoatSimulator.cs" />
     <Compile Include="Data\Games\FM2017Touch.cs" />
     <Compile Include="Data\Games\FM2017.cs" />
diff --git a/UI/Win32/CloudSyncHelper_win32/Properties/AssemblyInfo.cs b/UI/Win32/CloudSyncHelper_win32/Properties/AssemblyInfo.cs
@@ -41,8 +41,8 @@
 
 
 // ↓    Following the idea of Semantic Versioning, as described in https://semver.org/
-[assembly: AssemblyVersion( "0.4.0" )]
-[assembly: AssemblyFileVersion( "0.4.0" )]
+[assembly: AssemblyVersion( "0.4.1" )]
+[assembly: AssemblyFileVersion( "0.4.1" )]
 
 #if DEBUG
 [assembly: InternalsVisibleTo( "Test_XElement.CloudSyncHelper.UI.Win32" )]
diff --git a/UI/Win32/LinkCreator/Logic/Server.cs b/UI/Win32/LinkCreator/Logic/Server.cs
diff --git a/UI/Win32/LinkCreator/ServiceAdapter/ServerAdapter.cs b/UI/Win32/LinkCreator/ServiceAdapter/ServerAdapter.cs
diff --git a/deployment/CloudSyncHelper.xml b/deployment/CloudSyncHelper.xml

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,14 @@ public LegoBatman3() : base( "A1F8ED7C-B93F-4F32-AEFF-E63EF632618D" )`
`16`	`16`	`SpecialCharacters.REGISTERED_TRADEMARK,`
`17`	`17`	`SpecialCharacters.TRADEMARK );`
`18`	`18`	`this.TechnicalNameMatcher = matcher;`
	`19`	`+ return;`
`19`	`20`	`}`
`20`	`21`
	`22`	`+`
`21`	`23`	`protected override void OnImportsSatisfied()`
`22`	`24`	`{`
`23`	`25`	`this.DefinitionInfo = this._definitionFactory.GetSteamCloud();`
	`26`	`+ return;`
`24`	`27`	`}`
`25`	`28`	`}`
`26`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,15 @@ public OrcsMustDie2() : base( "41128DF6-5E43-45A1-9DA3-70EE2760FCFE" )`
`10`	`10`	`{`
`11`	`11`	`this.ApplicationName = "Orcs Must Die! 2";`
`12`	`12`	`this.FolderName = "Orcs Must Die 2012 [Orcs Must Die! 2]";`
`13`		`- this.TechnicalNameMatcher = "Orcs Must Die! 2";`
	`13`	`+ this.TechnicalNameMatcher = this.ApplicationName;`
	`14`	`+ return;`
`14`	`15`	`}`
`15`	`16`
`16`	`17`
`17`	`18`	`protected override void OnImportsSatisfied()`
`18`	`19`	`{`
`19`	`20`	`this.DefinitionInfo = this._definitionFactory.GetSteamCloud();`
	`21`	`+ return;`
`20`	`22`	`}`
`21`	`23`	`}`
`22`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,14 @@ public Payday2() : base( "A48B8D74-6D6E-4E97-B32F-61BD596F6149" )`
`11`	`11`	`this.ApplicationName = "PAYDAY 2";`
`12`	`12`	`this.FolderName = "Payday 2013 [PAYDAY 2]";`
`13`	`13`	`this.TechnicalNameMatcher = this.ApplicationName;`
	`14`	`+ return;`
`14`	`15`	`}`
`15`	`16`
	`17`	`+`
`16`	`18`	`protected override void OnImportsSatisfied()`
`17`	`19`	`{`
`18`	`20`	`this.DefinitionInfo = this._definitionFactory.GetSteamCloud();`
	`21`	`+ return;`
`19`	`22`	`}`
`20`	`23`	`}`
`21`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,14 @@ public RiskOfRain() : base( "F0C7E626-408D-4C70-9B41-83C6C7C6BBEC" )`
`11`	`11`	`this.ApplicationName = "Risk of Rain";`
`12`	`12`	`this.FolderName = "Risk of Rain 2013 [Risk of Rain]";`
`13`	`13`	`this.TechnicalNameMatcher = this.ApplicationName;`
	`14`	`+ return;`
`14`	`15`	`}`
`15`	`16`
	`17`	`+`
`16`	`18`	`protected override void OnImportsSatisfied()`
`17`	`19`	`{`
`18`	`20`	`this.DefinitionInfo = this._definitionFactory.GetSteamCloud();`
	`21`	`+ return;`
`19`	`22`	`}`
`20`	`23`	`}`
`21`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,15 @@ public RocketLeague() : base( "F4B10EAD-6195-47F3-A99E-CBDB4C93029C" )`
`10`	`10`	`{`
`11`	`11`	`this.ApplicationName = "Rocket League";`
`12`	`12`	`this.FolderName = "Rocket League 2015 [Rocket League]";`
`13`		`- this.TechnicalNameMatcher = "Rocket League";`
	`13`	`+ this.TechnicalNameMatcher = this.ApplicationName;`
	`14`	`+ return;`
`14`	`15`	`}`
`15`	`16`
	`17`	`+`
`16`	`18`	`protected override void OnImportsSatisfied()`
`17`	`19`	`{`
`18`	`20`	`this.DefinitionInfo = this._definitionFactory.GetSteamCloud();`
	`21`	`+ return;`
`19`	`22`	`}`
`20`	`23`	`}`
`21`	`24`	`}`