Updated dumper to remove use State and AcitvationIds

UplayDB · Mar 3, 2023 · cf65eba · cf65eba
1 parent 774ba03
commit cf65eba
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 14 deletions.
diff --git a/Dumperv2/GameLister.cs b/Dumperv2/GameLister.cs
@@ -20,10 +20,8 @@ public static void Work(List<Uplay.Ownership.OwnedGame>? games)
                 OW ow = new();
                 ow.ProductId = game.ProductId;
                 ow.ProductType = ((Uplay.Ownership.OwnedGame.Types.ProductType)game.ProductType).ToString();
-                ow.State = ((Uplay.Ownership.OwnedGame.Types.State)game.State).ToString();
                 ow.TargetPartner = game.TargetPartner.ToString();
                 ow.ProductAssociations = game.ProductAssociations.ToList();
-                ow.ActivationIds = game.ActivationIds.ToList();
 
                 if (owList.FindAll(x => x.ProductId == game.ProductId).Count <= 0)
                 {
@@ -33,22 +31,20 @@ public static void Work(List<Uplay.Ownership.OwnedGame>? games)
 
                 var listdiffconf = owList.Where(x => x.ProductId == game.ProductId
                 && (x.ProductType != ((Uplay.Ownership.OwnedGame.Types.ProductType)game.ProductType).ToString()
-                || x.State != ((Uplay.Ownership.OwnedGame.Types.State)game.State).ToString()
                 || x.TargetPartner != game.TargetPartner.ToString()
                 || x.ProductAssociations != game.ProductAssociations.ToList()
-                || x.ActivationIds != game.ActivationIds.ToList()
                 )).ToList();
 
                 if (listdiffconf.Count > 0)
                 {
                     var ows = owList.Where(x => x.ProductId == game.ProductId).First();
                     ows.ProductType = ((Uplay.Ownership.OwnedGame.Types.ProductType)game.ProductType).ToString();
-                    ows.State = ((Uplay.Ownership.OwnedGame.Types.State)game.State).ToString();
                     ows.TargetPartner = game.TargetPartner.ToString();
                     ows.ProductAssociations = game.ProductAssociations.ToList();
-                    ows.ActivationIds = game.ActivationIds.ToList();
                 }
             }
+
+
             File.WriteAllText("gamelist.json", JsonConvert.SerializeObject(owList, Formatting.Indented));
         }
     }

diff --git a/Dumperv2/Jsons.cs b/Dumperv2/Jsons.cs
@@ -31,10 +31,8 @@ public class OW
         {
             public uint ProductId { get; set; }
             public string ProductType { get; set; }
-            public string State { get; set; }
             public string TargetPartner { get; set; }
             public List<uint> ProductAssociations { get; set; }
-            public List<uint> ActivationIds { get; set; }
         }
     }
 }
diff --git a/Dumperv2/Program.cs b/Dumperv2/Program.cs
@@ -6,7 +6,7 @@ namespace Dumperv2
 {
     internal class Program
     {
-        public static string Version = "0.1";
+        public static string Version = "0.2";
         static void Main(string[] args)
         {
             if (!VersionCheck.Check())

diff --git a/Dumperv2/Version.txt b/Dumperv2/Version.txt
@@ -1 +1 @@
-0.1
+0.2
diff --git a/PipeProxy/Program.cs b/PipeProxy/Program.cs
@@ -80,11 +80,22 @@ static void Main(string[] args)
 
                 foreach (string name in PipeNames)
                 {
-                    var longRunning = new KillMe(name);
-                    NameKill.Add(name,longRunning);
-                    Thread myThread = new Thread(longRunning.ExecuteLongRunningTask);
+                    try
+                    {
+                        if (!name.Contains("process"))
+                            continue;
+
+                        var longRunning = new KillMe(name);
+                        NameKill.Add(name, longRunning);
+                        Thread myThread = new Thread(longRunning.ExecuteLongRunningTask);
+
+                        myThread.Start();
+                    }
+                    catch
+                    { 
+
+                    }
 
-                    myThread.Start();
                 }
 
                 Console.ReadLine();

diff --git a/TestApp/Program.cs b/TestApp/Program.cs
@@ -76,6 +76,10 @@ static void Main(string[] args)
                 OwnershipConnection ownershipConnection = new(socket);
                 ownershipConnection.PushEvent += Ownership_PushEvent;
                 ownershipConnection.GetOwnedGames();
+
+                StoreConnection storeConnection = new(socket);
+                storeConnection.PushEvent += StoreConnection_PushEvent;
+                storeConnection.Init();
                 /*
                 ChannelProfile.GetPendingChannels(login.Ticket,login.SessionId);
                 ChannelProfile.GetActiveChannels(login.Ticket, login.SessionId);
@@ -210,6 +214,12 @@ static void Main(string[] args)
 
         }
 
+        private static void StoreConnection_PushEvent(object? sender, Uplay.Store.Push e)
+        {
+            Console.WriteLine(e.ToString());
+            File.AppendAllText("store_push_event.txt", e.ToString());
+        }
+
         static byte[] Decompress(byte[] data)
         {
             using (var compressedStream = new MemoryStream(data))