Allow saves without images

counter185 · Aug 29, 2021 · cb3e0a0 · cb3e0a0
1 parent 769e966
commit cb3e0a0
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 15 deletions.
diff --git a/PSPSync/FTPClient.cs b/PSPSync/FTPClient.cs
@@ -373,7 +373,7 @@ public string[] DirectoryListSimple(string directory)
                 }
 
             }
-            catch (WebException) { Console.WriteLine(directory);/*Console.WriteLine(ex.ToString());*/ }
+            catch (WebException) { /*Console.WriteLine(directory);Console.WriteLine(ex.ToString());*/ }
             /* Return an Empty string Array if an Exception Occurs */
             return new string[0];
         }
@@ -392,7 +392,7 @@ public string[] DirectoryListSimple(string directory)
             }
             catch (WebException e)
             {
-                Console.WriteLine(e.Message);
+                //Console.WriteLine(e.Message);
                 return false;
             }
 

diff --git a/PSPSync/MTPDevice.cs b/PSPSync/MTPDevice.cs
@@ -16,7 +16,7 @@ public class MTPDevice
             device.Connect();
             try
             {
-                Console.WriteLine(device.FriendlyName);
+                //Console.WriteLine("Connecting to " + device.FriendlyName);
                 if (!device.FriendlyName.EndsWith(":\\"))   //that means it's already mounted as a drive. don't trust it.
                 {
                     foreach (string a in device.GetDirectories("/"))

diff --git a/PSPSync/MainWindow.xaml.cs b/PSPSync/MainWindow.xaml.cs
@@ -297,7 +297,6 @@ private void SD2toSD1_Click(object sender, RoutedEventArgs e)
         public void CopySave(SaveMeta srcMeta, SaveMeta otherMeta, NamedStream[] files, IStorageDevice dest, int updateDevice) {
             SetMgrEnabled(false);
             string id = GetGameID(srcMeta.directory);
-            Console.WriteLine(dest.HasSave(id) + " " + id);
             if (dest.HasSave(id))
             {
                 if (otherMeta == null)

diff --git a/PSPSync/SDs/FTPSaveDir.cs b/PSPSync/SDs/FTPSaveDir.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using System.IO;
 using System.Windows.Media.Animation;
+using System.Windows.Media;
 
 namespace PSPSync
 {
@@ -63,7 +64,7 @@ public NamedStream[] ReadSave(string directory)
                     }
                 }
                 MemoryStream file = client.Download(directory + "/" + files[x]);
-                Console.WriteLine(directory + "/" + files[x]);
+                //Console.WriteLine(directory + "/" + files[x]);
                 file.Position = 0;
                 ret[x] = new NamedStream(file, filename);
             }
@@ -81,7 +82,7 @@ public List<SaveMeta> ScanSaves()
             foreach (string dr2 in ss)
             {
                 string a = mainDir + dr2;
-                if (!client.FileExists(a + "/PARAM.SFO") || !client.FileExists(a + "/ICON0.PNG"))
+                if (!client.FileExists(a + "/PARAM.SFO"))
                 {
                     continue;
                 }
@@ -102,11 +103,16 @@ public List<SaveMeta> ScanSaves()
                 title = Encoding.UTF8.GetString(reader);
                 b.Close();
 
-                MemoryStream imageStream = client.Download(a + "/ICON0.PNG");
-                Console.WriteLine(a);
-                imageStream.Position = 0;
 
-                saves.Add(new SaveMeta(title, info, info2, a, MTPSaveDir.BitmapFromStream(imageStream), new System.DateTime(0)));
+                ImageSource thumbnailImg = null;
+                if (client.FileExists(a + "/ICON0.PNG"))
+                {
+                    MemoryStream imageStream = client.Download(a + "/ICON0.PNG");
+                    imageStream.Position = 0;
+                    thumbnailImg = MTPSaveDir.BitmapFromStream(imageStream);
+                }
+
+                saves.Add(new SaveMeta(title, info, info2, a, thumbnailImg, new System.DateTime(0)));
             }
             return saves;
         }
@@ -122,7 +128,6 @@ public void WriteSave(string directoryName, NamedStream[] files)
             {
                 client.Upload(dr + "/" + stm.name, stm.stream);
             }
-            Console.WriteLine("done holy shit");
         }
 
         public GeneralDeviceSpeed GetDeviceSpeed() {

diff --git a/PSPSync/SDs/MTPSaveDir.cs b/PSPSync/SDs/MTPSaveDir.cs
@@ -136,7 +136,6 @@ public void WriteSave(string directoryName, NamedStream[] files)
             {
                 parent.device.UploadFile(stm.stream, dr + "/" + stm.name);
             }
-            Console.WriteLine("done holy shit");
         }
 
         public GeneralDeviceSpeed GetDeviceSpeed()

diff --git a/PSPSync/SDs/PSPSaveDir.cs b/PSPSync/SDs/PSPSaveDir.cs
@@ -62,7 +62,7 @@ public List<SaveMeta> ScanSaves()
                 b.Seek(0x12B0, SeekOrigin.Begin);
                 b.Read(reader, 0, 128);
                 title = Encoding.UTF8.GetString(reader);
-                saves.Add(new SaveMeta(title, info, info2, a, BitmapFromUri(new Uri(a + "/ICON0.PNG")), File.GetLastWriteTime(a + "/PARAM.SFO")));
+                saves.Add(new SaveMeta(title, info, info2, a, (File.Exists(a+"/ICON0.PNG") ? BitmapFromUri(new Uri(a + "/ICON0.PNG")) : null), File.GetLastWriteTime(a + "/PARAM.SFO")));
                 b.Close();
             }
             return saves;
@@ -119,7 +119,6 @@ public void WriteSave(string directoryName, NamedStream[] files)
                 }
                 a.Close();
             }
-            Console.WriteLine("done holy shit");
         }
 
         public GeneralDeviceSpeed GetDeviceSpeed()

diff --git a/PSPSync/SaveListItem.xaml b/PSPSync/SaveListItem.xaml
@@ -7,6 +7,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
+        <Label x:Name="MissingIcon" Content="Missing ICON0.PNG" HorizontalAlignment="Left" Margin="10,20,0,0" VerticalAlignment="Top" Height="43" Width="126" Foreground="White"/>
         <Image x:Name="GamePic" HorizontalAlignment="Left" Height="75" VerticalAlignment="Top" Width="136" Margin="0,13,0,0"/>
         <Label x:Name="GameName" Content="Game name" HorizontalAlignment="Left" Margin="141,0,0,0" VerticalAlignment="Top" FontSize="14" Foreground="White"/>
         <Label x:Name="GameInfo" Content="info" HorizontalAlignment="Left" Margin="141,13,0,0" VerticalAlignment="Top" FontSize="11" Foreground="White"/>

diff --git a/PSPSync/SaveListItem.xaml.cs b/PSPSync/SaveListItem.xaml.cs
@@ -36,7 +36,11 @@ public SaveListItem()
                 this.GameInfo.Content = a.info;
                 this.GameInfo2.Content = a.info2;
                 this.GameDate.Content = a.timeModified.ToString();
-                this.GamePic.Source = a.thumbnail;
+                if (a.thumbnail != null)
+                {
+                    this.MissingIcon.Visibility = Visibility.Hidden;
+                    this.GamePic.Source = a.thumbnail;
+                }
             }
             else {
                 this.GameName.Content = "Corrupted data (no PARAM.SFO)";