Fix some bugs

Jack-Myth · Aug 23, 2019 · eb9b3e9 · eb9b3e9
1 parent 75ed13b
commit eb9b3e9
Show file tree

Hide file tree

Showing 9 changed files with 124 additions and 106 deletions.
diff --git a/SteamDepotDownloader-GUI/ManifestIDSelector.cs b/SteamDepotDownloader-GUI/ManifestIDSelector.cs
@@ -96,10 +96,23 @@ private async void ManifestIDSelector_LoadAsync(object sender, EventArgs e)
                 }
                 HtmlAgilityPack.HtmlDocument doc = new HtmlAgilityPack.HtmlDocument();
                 doc.LoadHtml(webPageStr);
+                if (doc.DocumentNode.SelectSingleNode("//title").GetDirectInnerText() == "Just a moment... · Steam Database")
+                {
+                    /*if (MessageBox.Show(Resources.FailedToGetManifestHistory + "\n" + Resources.refreshCookieRequest
+                        , "SteamDepotDownloaderGUI", MessageBoxButtons.YesNo, MessageBoxIcon.Error) == DialogResult.Yes)*/
+                    {
+                        ConfigStore.TheConfig.StoredCookies.Remove("__cfduid");
+                        ConfigStore.TheConfig.StoredCookies.Remove("cf_clearance");
+                        goto Refresh;
+                    }
+                    /*PendingReturnManifestID = ContentDownloader.INVALID_MANIFEST_ID;
+                    Close();
+                    return;*/
+                }
                 ManifestHistoryRecord manifestHistoryRecord= new ManifestHistoryRecord();
                 var DepotInfoNode = doc.DocumentNode.SelectNodes("//div[@class='wrapper-info scope-depot']/div/table/tbody/tr");
                 //Check if xpath is succeed.
-                if (DepotInfoNode.Count != 0)
+                if (DepotInfoNode != null)
                 {
                     //The sequence for these data seems to be fixed,so use Index directly.
                     //Actually maybe use ChildNodes[0] will be better?
@@ -109,20 +122,13 @@ private async void ManifestIDSelector_LoadAsync(object sender, EventArgs e)
                     manifestHistoryRecord.DepotName = DepotInfoNode[3].ChildNodes[3].GetDirectInnerText();
                     manifestHistoryRecord.LastUpdate = DepotInfoNode[4].SelectSingleNode("//i").GetDirectInnerText();
                 }
-                DepotInfoNode = doc.DocumentNode.SelectNodes("//div[@id='manifests']/div[@class='table-responsive']/table/tbody/tr");
-                if (DepotInfoNode.Count == 0)
+                else
                 {
-                    if(MessageBox.Show(Resources.FailedToGetManifestHistory+"\n"+Resources.refreshCookieRequest
-                        , "SteamDepotDownloaderGUI", MessageBoxButtons.YesNo, MessageBoxIcon.Error)==DialogResult.Yes)
-                    {
-                        ConfigStore.TheConfig.StoredCookies.Remove("__cfduid");
-                        ConfigStore.TheConfig.StoredCookies.Remove("cf_clearance");
-                        goto Refresh;
-                    }
-                    PendingReturnManifestID = ContentDownloader.INVALID_MANIFEST_ID;
+                    MessageBox.Show(Resources.nomanifesthistory, this.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);
                     Close();
                     return;
                 }
+                DepotInfoNode = doc.DocumentNode.SelectNodes("//div[@id='manifests']/div[@class='table-responsive']/table/tbody/tr");
                 manifestHistoryRecord.HistoryCollection = new List<ManifestHistoryRecord.ManifestHistoryRecordSingle>();
                 for (int i = 0; i < DepotInfoNode.Count; i++)
                 {

diff --git a/SteamDepotDownloader-GUI/Properties/AssemblyInfo.cs b/SteamDepotDownloader-GUI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.1.0")]
+[assembly: AssemblyFileVersion("1.2.1.0")]
diff --git a/SteamDepotDownloader-GUI/Properties/Resources.Designer.cs b/SteamDepotDownloader-GUI/Properties/Resources.Designer.cs
diff --git a/SteamDepotDownloader-GUI/Properties/Resources.resx b/SteamDepotDownloader-GUI/Properties/Resources.resx
@@ -231,4 +231,7 @@ To use ManifestID for other branch, try Advanced Input</value>
   <data name="refreshCookieRequest" xml:space="preserve">
     <value>It may caused by invalid cookies,do you want to input new cookies?</value>
   </data>
+  <data name="nomanifesthistory" xml:space="preserve">
+    <value>SteamDB doesn't have the infomation of this Depot</value>
+  </data>
 </root>
diff --git a/SteamDepotDownloader-GUI/Properties/Resources.zh.resx b/SteamDepotDownloader-GUI/Properties/Resources.zh.resx
@@ -228,4 +228,7 @@
   <data name="refreshCookieRequest" xml:space="preserve">
     <value>这可能是由于过期的Cookies引起的，你想要重新输入Cookies吗？</value>
   </data>
+  <data name="nomanifesthistory" xml:space="preserve">
+    <value>SteamDB 没有这个Depot的信息</value>
+  </data>
 </root>
diff --git a/SteamDepotDownloader-GUI/Settings.cs b/SteamDepotDownloader-GUI/Settings.cs
@@ -33,14 +33,17 @@ public Settings()
 
         private void buttonClearCache_Click(object sender, EventArgs e)
         {
-            var FileList = System.IO.Directory.GetFiles(Program.CacheDir);
-            foreach (string FileName in FileList)
+            if (System.IO.Directory.Exists(Program.CacheDir))
             {
-                try
+                var FileList = System.IO.Directory.GetFiles(Program.CacheDir);
+                foreach (string FileName in FileList)
                 {
-                    System.IO.File.Delete(FileName);
+                    try
+                    {
+                        System.IO.File.Delete(FileName);
+                    }
+                    catch { };
                 }
-                catch { };
             }
             DepotDownloader.ConfigStore.TheConfig.LoginKeys.Clear();
             DepotDownloader.ConfigStore.TheConfig.LastManifests.Clear();

diff --git a/SteamDepotDownloader-GUI/SteamDepotDownloader-GUI.csproj b/SteamDepotDownloader-GUI/SteamDepotDownloader-GUI.csproj
@@ -42,7 +42,8 @@
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>By JackMyth.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="HtmlAgilityPack, Version=1.11.12.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
@@ -206,7 +207,6 @@
     <EmbeddedResource Include="Waiting.resx">
       <DependentUpon>Waiting.cs</DependentUpon>
     </EmbeddedResource>
-    <None Include="By JackMyth.pfx" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>