From 566d360f10602f23990880ef158c1719a0803558 Mon Sep 17 00:00:00 2001
From: Tomasz Walecki <tomek_w@outlook.com>
Date: Sun, 10 Apr 2022 21:24:48 +0200
Subject: [PATCH] Fix error parsing user data

---
 .../TikTok/UserData/UserData.cs               |  4 +-
 .../MyTikTokBackup.Desktop (Package).wapproj  |  2 +-
 .../Package.appxmanifest                      |  2 +-
 .../ViewModels/UserDataViewModel.cs           | 41 ++++++++++++++-----
 4 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/MyTikTokBackup.Core/TikTok/UserData/UserData.cs b/MyTikTokBackup.Core/TikTok/UserData/UserData.cs
index 4665237..54a8f3b 100644
--- a/MyTikTokBackup.Core/TikTok/UserData/UserData.cs
+++ b/MyTikTokBackup.Core/TikTok/UserData/UserData.cs
@@ -429,8 +429,8 @@ public class DirectMessages
 
     public class ProfileMap
     {
-        [JsonPropertyName("PlatformInfo")]
-        public List<string> PlatformInfo { get; set; }
+        //[JsonPropertyName("PlatformInfo")]
+        //public List<string> PlatformInfo { get; set; }
 
         [JsonPropertyName("bioDescription")]
         public string BioDescription { get; set; }
diff --git a/MyTikTokBackup.Desktop/MyTikTokBackup.Desktop (Package)/MyTikTokBackup.Desktop (Package).wapproj b/MyTikTokBackup.Desktop/MyTikTokBackup.Desktop (Package)/MyTikTokBackup.Desktop (Package).wapproj
index ff929b7..0209f4e 100644
--- a/MyTikTokBackup.Desktop/MyTikTokBackup.Desktop (Package)/MyTikTokBackup.Desktop (Package).wapproj	
+++ b/MyTikTokBackup.Desktop/MyTikTokBackup.Desktop (Package)/MyTikTokBackup.Desktop (Package).wapproj	
@@ -45,7 +45,7 @@
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <PackageCertificateThumbprint>838B58E1D6DCB6498901A2D375CA378C760C2C1C</PackageCertificateThumbprint>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>False</GenerateTestArtifacts>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
diff --git a/MyTikTokBackup.Desktop/MyTikTokBackup.Desktop (Package)/Package.appxmanifest b/MyTikTokBackup.Desktop/MyTikTokBackup.Desktop (Package)/Package.appxmanifest
index 7c2a2bf..21dba8c 100644
--- a/MyTikTokBackup.Desktop/MyTikTokBackup.Desktop (Package)/Package.appxmanifest	
+++ b/MyTikTokBackup.Desktop/MyTikTokBackup.Desktop (Package)/Package.appxmanifest	
@@ -9,7 +9,7 @@
   <Identity
     Name="60490polApki.MyTikTokBackup"
     Publisher="CN=EFEE17C1-DC2A-4553-8CE6-82B55CBC72FE"
-    Version="1.1.10.0" />
+    Version="1.1.12.0" />
 
   <Properties>
     <DisplayName>MyTikTokBackup</DisplayName>
diff --git a/MyTikTokBackup.Desktop/MyTikTokBackup.Desktop/ViewModels/UserDataViewModel.cs b/MyTikTokBackup.Desktop/MyTikTokBackup.Desktop/ViewModels/UserDataViewModel.cs
index 5ba646a..3554a5e 100644
--- a/MyTikTokBackup.Desktop/MyTikTokBackup.Desktop/ViewModels/UserDataViewModel.cs
+++ b/MyTikTokBackup.Desktop/MyTikTokBackup.Desktop/ViewModels/UserDataViewModel.cs
@@ -102,17 +102,38 @@ private async Task ImportUserDataFile()
                 FavoriteVideos.Clear();
                 DownloadedCount = 0;
 
-                using FileStream openStream = File.OpenRead(file.Path);
-                _userData = await JsonSerializer.DeserializeAsync<UserData>(openStream);
+                try
+                {
+                    using FileStream openStream = File.OpenRead(file.Path);
+                    _userData = await JsonSerializer.DeserializeAsync<UserData>(openStream);
+                }
+                catch (Exception ex)
+                {
+                    Log.Error("Can't deserialize user data {0}", ex);
+                    return;
+                }
+
+                try
+                {
+                    FavoriteCount = _userData.Activity.FavoriteVideos.FavoriteVideoList.Count;
+                    LikedCount = _userData.Activity.LikeList.ItemFavoriteList.Count;
+                    HistoryCount = _userData.Activity.VideoBrowsingHistory.VideoList.Count;
+                    UserName = $"@{_userData.Profile.ProfileInformation.ProfileMap.UserName}";
+
+                    Log.Information("{0} FavoriteCount {1}", nameof(UserDataViewModel), FavoriteCount);
 
-                FavoriteCount = _userData.Activity.FavoriteVideos.FavoriteVideoList.Count;
-                LikedCount = _userData.Activity.LikeList.ItemFavoriteList.Count;
-                HistoryCount = _userData.Activity.VideoBrowsingHistory.VideoList.Count;
-                UserName = $"@{_userData.Profile.ProfileInformation.ProfileMap.UserName}";
+                    await GetUrlsAfterRedirects(_userData.Activity.FavoriteVideos.FavoriteVideoList.Select(x => x.Link).ToList(), _cts.Token);
+                    Log.Information("{0} Found {1} Urls", nameof(UserDataViewModel), Urls.Count);
 
-                await GetUrlsAfterRedirects(_userData.Activity.FavoriteVideos.FavoriteVideoList.Select(x => x.Link).ToList(), _cts.Token);
-                var urls = ExcludeAlreadyDownloadedVideos(Urls);
-                await FindFavoriteVideos(urls, _cts.Token);
+                    var urls = ExcludeAlreadyDownloadedVideos(Urls);
+                    Log.Information("{0} Excluded Already Downloaded Videos {1}", nameof(UserDataViewModel), Urls.Count);
+                    await FindFavoriteVideos(urls, _cts.Token);
+                    Log.Information("{0} Found Favorite Videos", nameof(UserDataViewModel));
+                }
+                catch (Exception ex)
+                {
+                    Log.Error(ex.ToString());
+                }
             }
         }
 
@@ -218,7 +239,7 @@ private async Task<IEnumerable<string>> GetUrlsAfterRedirects(List<string> urls,
                 await Task.WhenAll(tasks);
                 await Task.Delay(1000);
             }
-            Log.Information("Found all urls");
+            Log.Information("{0} Found all urls", nameof(UserDataViewModel));
 
             return Urls;
         }