Merge remote-tracking branch 'refs/remotes/origin/ISO' into XEX

Gualdimar · Oct 28, 2016 · ec41f77 · ec41f77
2 parents 02dba8a + aadc61f
commit ec41f77
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/Velocity/isodialog.cpp b/Velocity/isodialog.cpp
@@ -73,6 +73,7 @@ void ISODialog::LoadDirectory(QObject *parent, std::vector<GdfxFileEntry> direct
         }
 
         item->setData(IsoTreeWidgetItemDataMagic, Qt::UserRole, (quint32)curEntry.magic);
+        item->setData(IsoTreeWidgetItemIsDirectory, Qt::UserRole, (bool)(curEntry.attributes & GdfxDirectory));
     }
 }
 
@@ -102,8 +103,13 @@ void ISODialog::showContextMenu(QPoint point)
     QPoint globalPos = ui->treeWidget->mapToGlobal(point);
     QMenu contextMenu;
 
-    if (ui->treeWidget->selectedItems().size() != 0)
-        contextMenu.addAction(QPixmap(":/Images/extract.png"), "Extract");
+    if (ui->treeWidget->selectedItems().size() == 1)
+    {
+        QTreeWidgetItem *selectedTreeWidgetItem = ui->treeWidget->selectedItems().at(0);
+        bool isDirectory = selectedTreeWidgetItem->data(IsoTreeWidgetItemIsDirectory, Qt::UserRole).toBool();
+        if (!isDirectory)
+            contextMenu.addAction(QPixmap(":/Images/extract.png"), "Extract");
+    }
 
     QAction *selectedItem = contextMenu.exec(globalPos);
     if (selectedItem == NULL)
@@ -115,7 +121,11 @@ void ISODialog::showContextMenu(QPoint point)
         QString pathInISO = selectedItem->data(IsoTreeWidgetItemDataPathInISO, Qt::UserRole).toString();
 
         QString outDirectory = QFileDialog::getExistingDirectory(this, "Choose a place to extract the file to", QtHelpers::DesktopLocation());
-        iso->ExtractFile(outDirectory.toStdString(), pathInISO.toStdString());
+
+        SingleProgressDialog *progressDialog = new SingleProgressDialog(FileSystemISO, iso, OpExtract, pathInISO, outDirectory, NULL, this);
+        progressDialog->setModal(true);
+        progressDialog->show();
+        progressDialog->start();
 
         statusBar->showMessage("File extracted successfully", 5000);
     }

diff --git a/Velocity/isodialog.h b/Velocity/isodialog.h
@@ -24,7 +24,8 @@ class ISODialog;
 enum IsoTreeWidgetItemData
 {
     IsoTreeWidgetItemDataPathInISO = 0,
-    IsoTreeWidgetItemDataMagic = 1
+    IsoTreeWidgetItemDataMagic = 1,
+    IsoTreeWidgetItemIsDirectory = 2
 };
 
 class ISODialog : public QDialog

diff --git a/Velocity/singleprogressdialog.cpp b/Velocity/singleprogressdialog.cpp
@@ -30,6 +30,10 @@ SingleProgressDialog::SingleProgressDialog(FileSystem system, void *device, Oper
             setWindowTitle("Extracting All Files");
             ui->lblIcon->setPixmap(QPixmap(":/Images/extract.png"));
             break;
+        case OpExtract:
+            setWindowTitle("Extracting File");
+            ui->lblIcon->setPixmap(QPixmap(":/Images/extract.png"));
+            break;
     }
 }
 
@@ -106,12 +110,18 @@ void SingleProgressDialog::start()
                 break;
             }
             case FileSystemISO:
+            {
+                ISO *iso = reinterpret_cast<ISO*>(device);
                 if (op == OpExtractAll)
                 {
-                    ISO *iso = reinterpret_cast<ISO*>(device);
                     iso->ExtractAll(externalPath.toStdString(), UpdateProgress, this);
                 }
+                else if (op == OpExtract)
+                {
+                    iso->ExtractFile(externalPath.toStdString(), internalPath.toStdString(), UpdateProgress, this);
+                }
                 break;
+            }
         }
     }
     catch (string error)

diff --git a/XboxInternals/Disc/ISO.cpp b/XboxInternals/Disc/ISO.cpp
@@ -217,7 +217,9 @@ void ISO::ReadFileListing(vector<GdfxFileEntry> *entryList, DWORD sector, int si
     io->SetPosition(entryAddress);
 
     GdfxFileEntry current;
-    while (true)
+    DWORD bytesLeft = size;
+
+    while (bytesLeft != 0)
     {
         current.address = io->GetPosition();
         current.fileIndex = 0;
@@ -265,6 +267,9 @@ void ISO::ReadFileListing(vector<GdfxFileEntry> *entryList, DWORD sector, int si
             }
         }
 
+        // calculate the amount of bytes left in the file listing table to process
+        bytesLeft -= entryAddress - current.address;
+
         // back up to the entry
         io->SetPosition(entryAddress);