Fix local file/tempfile handling

Author: t0815

MyCBZ/Models/Page.cs

@@ -175,6 +175,19 @@ protected void RequestTemporaryFile()
                 {
                     MessageLogger.Instance.Log(LogMessageEvent.LOGMESSAGE_TYPE_WARNING, "No Entry with name [" + Name + "] exists in archive!");
                 }
+            } else
+            {
+                if (ReadOnly)
+                {
+                    FileInfo tempFileInfo = new FileInfo(TempPath);
+                    FileStream ImageStream = File.Open(TempPath, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+                    FileStream localFile = File.OpenRead(LocalPath);
+
+                    localFile.CopyTo(ImageStream);
+
+                    ImageStream.Close();
+                    localFile.Close();
+                }
             }
         }
 
@@ -275,12 +288,9 @@ private void LoadImage()
 
             if (Image == null)
             {
-                if (Compressed && ImageEntry != null)
-                {
-                    RequestTemporaryFile();
-                    ImageStream = File.Open(TempPath, FileMode.Open, FileAccess.ReadWrite);
-                    Image = Image.FromStream(ImageStream);
-                }
+                RequestTemporaryFile();
+                ImageStream = File.Open(TempPath, FileMode.Open, FileAccess.ReadWrite);
+                Image = Image.FromStream(ImageStream);  
             }
 
             if (Image != null)

MyCBZ/Models/ProjectModel.cs

@@ -233,20 +233,20 @@ public void AddImages(List<LocalFile> fileList, int maxIndex = 0)
                 {
                     FileInfo localCopyInfo = fileObject.FileInfo.CopyTo(PathHelper.ResolvePath(WorkingDir) + ProjectGUID + "\\" + fileObject.FileInfo.Name);
 
-                    Page cBZImage = new Page(localCopyInfo, FileAccess.ReadWrite);
-                    cBZImage.Size = fileObject.FileSize;
-                    cBZImage.Number = index + 1;
-                    cBZImage.Index = index;
-                    cBZImage.LocalPath = fileObject.FullPath;
-                    cBZImage.Compressed = false;
-                    cBZImage.LastModified = fileObject.FileInfo.LastWriteTime;
-                    cBZImage.Name = fileObject.FileInfo.Name;
-                    cBZImage.TempPath = localCopyInfo.FullName;
+                    Page page = new Page(localCopyInfo, FileAccess.ReadWrite);
+                    page.Size = fileObject.FileSize;
+                    page.Number = index + 1;
+                    page.Index = index;
+                    page.LocalPath = fileObject.FullPath;
+                    page.Compressed = false;
+                    page.LastModified = fileObject.FileInfo.LastWriteTime;
+                    page.Name = fileObject.FileInfo.Name;
+                    page.TempPath = localCopyInfo.FullName;
                     fileObject.FileInfo = localCopyInfo;
 
-                    Pages.Add(cBZImage);
+                    Pages.Add(page);
 
-                    OnImageLoaded(new ItemLoadProgressEvent(index, Pages.Count, cBZImage));
+                    OnImageLoaded(new ItemLoadProgressEvent(index, Pages.Count, page));
 
                     index++;
                 } catch (Exception ef)
@@ -264,6 +264,8 @@ public void AddImages(List<LocalFile> fileList, int maxIndex = 0)
             }
 
             OnOperationFinished(new OperationFinishedEvent(index, Pages.Count));
+
+            UpdatePageIndices();
         }
 
         public List<LocalFile> LoadDirectory(String path)