From cc7d47f3ab2e382da683ec944f88e462c1613812 Mon Sep 17 00:00:00 2001
From: "giantpune@gmail.com"
 <giantpune@gmail.com@389f4c8b-5dfe-645f-db0e-df882bc27289>
Date: Sat, 11 Dec 2010 10:12:50 +0000
Subject: [PATCH] * add access functions to the nandBin class to get the
 cluster map for whole nand and for a given file * change the nandExtract
 program a bit.  move nand extraction to a thread to keep it from hanging the
 main thread * add pretty block map

git-svn-id: http://wiiqt.googlecode.com/svn/trunk@15 389f4c8b-5dfe-645f-db0e-df882bc27289
---
 WiiQt/nandbin.cpp           |  56 +++++++--
 WiiQt/nandbin.h             |  15 +++
 nandExtract/black.png       | Bin 0 -> 2913 bytes
 nandExtract/blue.png        | Bin 0 -> 2979 bytes
 nandExtract/green.png       | Bin 0 -> 2917 bytes
 nandExtract/grey.png        | Bin 0 -> 2926 bytes
 nandExtract/includes.h      |  35 ------
 nandExtract/main.cpp        |   2 +
 nandExtract/nandExtract.pro |   9 +-
 nandExtract/nandwindow.cpp  | 236 ++++++++++++++++++++++++++++++++----
 nandExtract/nandwindow.h    |  29 +++--
 nandExtract/nandwindow.ui   |  50 ++++++++
 nandExtract/pink.png        | Bin 0 -> 2939 bytes
 nandExtract/rc.qrc          |   9 ++
 14 files changed, 362 insertions(+), 79 deletions(-)
 create mode 100755 nandExtract/black.png
 create mode 100755 nandExtract/blue.png
 create mode 100755 nandExtract/green.png
 create mode 100755 nandExtract/grey.png
 delete mode 100755 nandExtract/includes.h
 create mode 100755 nandExtract/pink.png
 create mode 100644 nandExtract/rc.qrc

diff --git a/WiiQt/nandbin.cpp b/WiiQt/nandbin.cpp
index 914ee19..cd39ac4 100755
--- a/WiiQt/nandbin.cpp
+++ b/WiiQt/nandbin.cpp
@@ -5,6 +5,7 @@ NandBin::NandBin( QObject * parent, const QString &path ) : QObject( parent )
 {
     type = -1;
     fatNames = false;
+    fstInited = false;
     root = NULL;
 
     if( !path.isEmpty() )
@@ -22,6 +23,7 @@ NandBin::~NandBin()
 
 bool NandBin::SetPath( const QString &path )
 {
+    fstInited = false;
     //nandPath = path;
     if( f.isOpen() )
 	f.close();
@@ -160,7 +162,10 @@ bool NandBin::ExtractDir( fst_t fst, QString parent )
 
     QFileInfo fi( parent + "/" + filename );
     if( filename != "/" && !fi.exists() && !QDir().mkpath( fi.absoluteFilePath() ) )
+    {
+	emit SendError( tr( "Can\'t create directory \"%1\"" ).arg( fi.absoluteFilePath() ) );
 	return false;
+    }
 
     if( fst.sub != 0xffff && !ExtractFST( fst.sub, fi.absoluteFilePath() ) )
 	return false;
@@ -179,22 +184,18 @@ bool NandBin::ExtractFile( fst_t fst, QString parent )
     if( fst.size && !data.size() )//dont worry if files dont have anything in them anyways
 	return false;
 
-    QFile out( fi.absoluteFilePath() );
-    if( out.exists() )// !! delete existing files
-	out.remove();
-
-    if( !out.open( QIODevice::WriteOnly ) )
+    if( !WriteFile( fi.absoluteFilePath(), data ) )
     {
-	emit SendError( tr( "Can't open \"%1\" for writing" ).arg( fi.absoluteFilePath() ) );
+	emit SendError( tr( "Error writing \"%1\"" ).arg( fi.absoluteFilePath() ) );
 	return false;
     }
-    out.write( data );
-    out.close();
     return true;
 }
 
 bool NandBin::InitNand( QIcon dirs, QIcon files )
 {
+    fstInited = false;
+    fats.clear();
     type = GetDumpType( f.size() );
     if( type < 0 || type > 3 )
 	return false;
@@ -211,6 +212,16 @@ bool NandBin::InitNand( QIcon dirs, QIcon files )
     loc_fat = loc_super;
     loc_fst = loc_fat + 0x0C + n_fatlen[ type ];
 
+    //cache all the entries
+    for( quint16 i = 0; i < 0x17ff; i++ )
+	fsts[ i ] = GetFST( i );
+
+    //cache all the fats
+    for( quint16 i = 0; i < 0x8000; i++ )
+	fats << GetFAT( i );
+
+    fstInited = true;
+
     if( root )
 	delete root;
 
@@ -220,7 +231,7 @@ bool NandBin::InitNand( QIcon dirs, QIcon files )
     root = new QTreeWidgetItem( QStringList() << nandPath );
     AddChildren( root, 0 );
 
-    ShowInfo();
+    //ShowInfo();
     return true;
 }
 
@@ -349,6 +360,11 @@ fst_t NandBin::GetFST( quint16 entry )
 	fst.filename[ 0 ] = '\0';
 	return fst;
     }
+    if( fstInited )//we've already read this once, just give back the one we already know
+    {
+	//qDebug() << "reading from cache" << hex << entry;
+	return fsts[ entry ];
+    }
     // compensate for 64 bytes of ecc data every 64 fst entries
     quint32 n_fst[] = { 0, 2, 2 };
     int loc_entry = ( ( ( entry / 0x40 ) * n_fst[ type ] ) + entry ) * 0x20;
@@ -390,6 +406,8 @@ fst_t NandBin::GetFST( quint16 entry )
 
 quint16 NandBin::GetFAT( quint16 fat_entry )
 {
+    if( fstInited )
+	return fats.at( fat_entry );
     /*
     * compensate for "off-16" storage at beginning of superblock
     * 53 46 46 53   XX XX XX XX   00 00 00 00
@@ -508,6 +526,26 @@ QByteArray NandBin::GetFile( fst_t fst )
     return data;
 }
 
+const QList<quint16> NandBin::GetFatsForFile( quint16 i )
+{
+    //qDebug() << "NandBin::GetFatsForFile" << i;
+    QList<quint16> ret;
+    fst_t fst = GetFST( i );
+
+    if( fst.filename[ 0 ] == '\0' )
+	return ret;
+
+    quint16 fat = fst.sub;
+    quint16 j = 0;//just to make sure a broken nand doesnt lead to an endless loop
+    while ( fat < 0x8000 && fat > 0 && ++j )
+    {
+	ret << fat;
+	fat = GetFAT( fat );
+    }
+
+    return ret;
+}
+
 void NandBin::SetFixNamesForFAT( bool fix )
 {
     fatNames = fix;
diff --git a/WiiQt/nandbin.h b/WiiQt/nandbin.h
index 4f90a1c..2a19781 100755
--- a/WiiQt/nandbin.h
+++ b/WiiQt/nandbin.h
@@ -78,6 +78,12 @@ public:
     //ie...  /title/00000001/00000002/data/setting.txt
     const QByteArray GetData( const QString &path );
 
+    //returns the fats for this nand.
+    const QList<quint16> GetFats() { return fats; }
+
+    //get the fats for a given file
+    const QList<quint16> GetFatsForFile( quint16 i );
+
 
 private:
     QByteArray key;
@@ -93,6 +99,15 @@ private:
     QIcon groupIcon;
     QIcon keyIcon;
 
+    //read all the fst and remember them rather than seeking back and forth in the file all the time
+    // uses ~120KiB RAM
+    bool fstInited;
+    fst_t fsts[ 0x17ff ];
+
+    //cache the fat to keep from having to look them up repeatedly
+    // uses ~64KiB
+    QList<quint16>fats;
+
     int GetDumpType( quint64 fileSize );
     bool GetKey( int type );
     QByteArray ReadKeyfile( QString path );
diff --git a/nandExtract/black.png b/nandExtract/black.png
new file mode 100755
index 0000000000000000000000000000000000000000..060039de976dca86cffd8d198494e634970d94b6
GIT binary patch
literal 2913
zcmV-n3!e0eP)<h;3K|Lk000e1NJLTq000UA000UI0ssI20#I1$00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z0001tNkl<Zc-l;kL2kuR3<Ak-&XfCJtu_o@<bA0ld1V-JJ<nr%?VZ`#-<jRn-QBhG
zfwnD3rIo7pq)YlFPErVMffo99)Z2EF#MlsebX6<eyF+kd+YU(*N~zj=W=kC>c||};
zTS@oKv?Z8uA_UHRXR8uYjv30kUH5qPF6B$nm!C_bA)HpLfBX#qyASO%Mzsj~00000
LNkvXXu0mjfHBM`T

literal 0
HcmV?d00001

diff --git a/nandExtract/blue.png b/nandExtract/blue.png
new file mode 100755
index 0000000000000000000000000000000000000000..974f56ee0d29eb67373813a45c0162661a4566ce
GIT binary patch
literal 2979
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
Ze*iRar^C$_Vw?Z~002ovPDHLkV1jM!jcot`

literal 0
HcmV?d00001

diff --git a/nandExtract/green.png b/nandExtract/green.png
new file mode 100755
index 0000000000000000000000000000000000000000..e83e3b96e707d125316e02f6d32abd026103e655
GIT binary patch
literal 2917
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
P00000NkvXXu0mjfa}jF^

literal 0
HcmV?d00001

diff --git a/nandExtract/grey.png b/nandExtract/grey.png
new file mode 100755
index 0000000000000000000000000000000000000000..803096b455d0bafbf2d89935b36dfa6c4125a40a
GIT binary patch
literal 2926
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
Y00V}q_P_FfSO5S307*qoM6N<$g7dz2WdHyG

literal 0
HcmV?d00001

diff --git a/nandExtract/includes.h b/nandExtract/includes.h
deleted file mode 100755
index 8723e2e..0000000
--- a/nandExtract/includes.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef INCLUDES_H
-#define INCLUDES_H
-
-
-#include <QAction>
-#include <QDialog>
-#include <QDir>
-#include <QFile>
-#include <QFileDialog>
-#include <QGraphicsScene>
-#include <QGraphicsPixmapItem>
-#include <QLayout>
-#include <QList>
-#include <QMainWindow>
-#include <QMenu>
-#include <QMessageBox>
-//#include <QNetworkAccessManager>
-//#include <QNetworkReply>
-#include <QObject>
-#include <QProcess>
-#include <QQueue>
-#include <QSettings>
-#include <QtDebug>
-#include <QTimer>
-#include <QtGui>
-#include <QtGui/QMainWindow>
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
-#include <qpushbutton.h>
-#include <QWidget>
-//#include <QDomDocument>
-//#include <QDomElement>
-
-
-#endif // INCLUDES_H
diff --git a/nandExtract/main.cpp b/nandExtract/main.cpp
index dd679f9..e207aa8 100755
--- a/nandExtract/main.cpp
+++ b/nandExtract/main.cpp
@@ -3,6 +3,8 @@
 
 int main(int argc, char *argv[])
 {
+    Q_INIT_RESOURCE( rc );
+
     QApplication a(argc, argv);
     NandWindow w;
     w.show();
diff --git a/nandExtract/nandExtract.pro b/nandExtract/nandExtract.pro
index 5d4798d..0d95f71 100755
--- a/nandExtract/nandExtract.pro
+++ b/nandExtract/nandExtract.pro
@@ -9,10 +9,15 @@ SOURCES += main.cpp \
     ../WiiQt/tools.cpp \
     ../WiiQt/savebanner.cpp \
     ../WiiQt/aes.c \
-    ../WiiQt/sha1.c
+    ../WiiQt/sha1.c \
+    nandthread.cpp
 
 HEADERS += nandwindow.h \
     ../WiiQt/nandbin.h \
-    ../WiiQt/tools.h
+    ../WiiQt/tools.h \
+    nandthread.h
 
 FORMS += nandwindow.ui
+
+RESOURCES += \
+    rc.qrc
diff --git a/nandExtract/nandwindow.cpp b/nandExtract/nandwindow.cpp
index acb4772..3c00a2a 100755
--- a/nandExtract/nandwindow.cpp
+++ b/nandExtract/nandwindow.cpp
@@ -1,12 +1,38 @@
 #include "nandwindow.h"
 #include "ui_nandwindow.h"
 
-NandWindow::NandWindow(QWidget *parent) :
-    QMainWindow(parent),
-    ui(new Ui::NandWindow),
-    nandBin( this )
+NandWindow::NandWindow( QWidget *parent ) : QMainWindow( parent ), ui( new Ui::NandWindow ), nThread( this )
 {
-    ui->setupUi(this);
+    ui->setupUi( this );
+    freeSpace = 0;
+
+    //setup the block map
+    ui->graphicsView_blocks->setScene( &gv );
+    ui->graphicsView_blocks->setAlignment( Qt::AlignRight );
+    ui->graphicsView_blocks->setRenderHint( QPainter::Antialiasing );
+
+    QPixmap blue( ":/blue.png" );
+    QPixmap green( ":/green.png" );
+    QPixmap pink( ":/pink.png" );
+    QPixmap grey( ":/grey.png" );
+
+    quint16 i = 0;
+    for( quint16 y = 0; y < 352; y += 11 )
+    {
+	for( quint16 x = 0; x < 1408; x += 11 )
+	{
+	    pmi[ i ] = new QGraphicsPixmapItem( grey );
+	    pmi[ i ]->setPos( x, y );
+	    gv.addItem( pmi[ i ] );//items belong to this now.  no need to delete them
+
+	    i++;
+	}
+    }
+
+    //put the progressbar on the status bar
+    ui->progressBar->setVisible( false );
+    ui->statusBar->addPermanentWidget( ui->progressBar, 0 );
+
     //ui->treeWidget->header()->resizeSection( 0, 300 );//name
     QFontMetrics fm( fontMetrics() );
     ui->treeWidget->header()->resizeSection( 0, fm.width( QString( 22, 'W' ) ) );//name
@@ -19,8 +45,12 @@ NandWindow::NandWindow(QWidget *parent) :
     ui->treeWidget->header()->resizeSection( 7, fm.width( "WWWWW" ) );//attr
 
 
-    connect( &nandBin, SIGNAL( SendError( QString ) ), this, SLOT( GetError( QString ) ) );
-    connect( &nandBin, SIGNAL( SendText( QString ) ), this, SLOT( GetStatusUpdate( QString ) ) );
+    //connect( &nandBin, SIGNAL( SendError( QString ) ), this, SLOT( GetError( QString ) ) );
+    //connect( &nandBin, SIGNAL( SendText( QString ) ), this, SLOT( GetStatusUpdate( QString ) ) );
+    connect( &nThread, SIGNAL( SendError( QString ) ), this, SLOT( GetError( QString ) ) );
+    connect( &nThread, SIGNAL( SendText( QString ) ), this, SLOT( GetStatusUpdate( QString ) ) );
+    connect( &nThread, SIGNAL( SendExtractDone() ), this, SLOT( ThreadIsDone() ) );
+    connect( &nThread, SIGNAL( SendProgress( int ) ), ui->progressBar, SLOT( setValue( int ) ) );
 }
 
 NandWindow::~NandWindow()
@@ -28,6 +58,13 @@ NandWindow::~NandWindow()
     delete ui;
 }
 
+void NandWindow::ThreadIsDone()
+{
+    qDebug() << "NandWindow::ThreadIsDone";
+    ui->progressBar->setVisible( false );
+    ui->statusBar->showMessage( "Done extracting", 5000 );
+}
+
 void NandWindow::changeEvent(QEvent *e)
 {
     QMainWindow::changeEvent(e);
@@ -47,17 +84,10 @@ void NandWindow::GetStatusUpdate( QString s )
 
 void NandWindow::GetError( QString str )
 {
+    QMessageBox::warning( this, tr( "Error" ), str, QMessageBox::Ok );
     qWarning() << str;
 }
 
-void NandWindow::ExtractShit()
-{
-    ui->statusBar->showMessage( "Trying to extract..." );
-    nandBin.ExtractToDir( exItem, exPath );//who cares if it returns false?  not me.  thats what the qDebug() info is for
-    ui->statusBar->showMessage( "Done", 5000 );
-
-}
-
 //nand window right-clicked
 void NandWindow::on_treeWidget_customContextMenuRequested( QPoint pos )
 {
@@ -84,11 +114,8 @@ void NandWindow::on_treeWidget_customContextMenuRequested( QPoint pos )
 	    if( path.isEmpty() )
 		return;
 
-	    exPath = path;
-	    exItem = item;
-
-	    //ghetto, but gives the dialog box time to dissappear before the gui freezes as it extracts the nand
-	    QTimer::singleShot( 250, this, SLOT( ExtractShit() ) );
+	    ui->progressBar->setVisible( true );
+	    nThread.Extract( item, path );
 	}
     }
 }
@@ -100,7 +127,8 @@ void NandWindow::on_actionOpen_Nand_triggered()
     if( path.isEmpty() )
 	return;
 
-    if( !nandBin.SetPath( path ) )
+    blocks.clear();
+    if( !nThread.SetPath( path ) )
     {
 	qDebug() << " error in nandBin.SetPath";
 	ui->statusBar->showMessage( "Error setting path to " + path );
@@ -112,7 +140,8 @@ void NandWindow::on_actionOpen_Nand_triggered()
     groupIcon.addPixmap( style()->standardPixmap( QStyle::SP_DirClosedIcon ), QIcon::Normal, QIcon::Off );
     groupIcon.addPixmap( style()->standardPixmap( QStyle::SP_DirOpenIcon ), QIcon::Normal, QIcon::On );
     keyIcon.addPixmap( style()->standardPixmap( QStyle::SP_FileIcon ) );
-    if( !nandBin.InitNand( groupIcon, keyIcon ) )
+
+    if( !nThread.InitNand( groupIcon, keyIcon ) )
     {
 	qDebug() << " error in nandBin.InitNand()";
 	ui->statusBar->showMessage( "Error reading " + path );
@@ -120,9 +149,12 @@ void NandWindow::on_actionOpen_Nand_triggered()
     }
 
     ui->treeWidget->clear();
+    GetBlocksfromNand();
+    DrawBlockMap();
 
     //get an item holding a tree with all the items of the nand
-    QTreeWidgetItem* tree = nandBin.GetTree();
+    //QTreeWidgetItem* tree = nandBin.GetTree();
+    QTreeWidgetItem* tree = nThread.GetTree();
 
     //take the actual contents of the nand from the made up root and add them to the gui widget
     ui->treeWidget->addTopLevelItems( tree->takeChildren() );
@@ -135,6 +167,160 @@ void NandWindow::on_actionOpen_Nand_triggered()
 	ui->treeWidget->topLevelItem( 0 )->setExpanded( true );
 
     ui->statusBar->showMessage( "Loaded " + path, 5000 );
-
-    //nandBin.GetData( "/title/00000001/00000002/data/setting.txt" );//testing 1,2,1,2
+}
+
+void NandWindow::GetBlocksfromNand()
+{
+    blocks.clear();
+    freeSpace = 0;
+
+    QList<quint16> clusters = nThread.GetFats();
+    if( !clusters.size() == 0x8000 )
+    {
+	QMessageBox::warning( this, tr( "Error" ), tr( "Expected 0x8000 clusters from the nand, but got %1 instead!" ).arg( clusters.size(), 0, 16 ), QMessageBox::Ok );
+	return;
+    }
+    //QString str;
+    for( quint16 i = 0; i < 0x8000; i += 8 )//first cluster of each block.
+    {
+	quint16 thisBlock = clusters.at( i );
+
+	//str += QString( "%1 " ).arg( thisBlock, 4, 16 );
+	if( thisBlock == 0xFFFC
+	    || thisBlock == 0xFFFD )
+	{
+	    //qDebug() << "adding" << hex << thisBlock;
+	    blocks << thisBlock;
+	    continue;
+	}
+	bool used = 0;
+	for( quint16 j = i; j < i + 8; j++ )//each individual cluster
+	{
+	    thisBlock = clusters.at( i );
+	    if( thisBlock == 0xFFFE )
+		freeSpace += 0x800;
+
+	    else used = true;
+	}
+	blocks << ( used ? 1 : 0xfffe ); // just put 1 for used blocks
+    }
+
+}
+
+QList<quint16> NandWindow::ToBlocks( QList<quint16> clusters )
+{
+    //qDebug() << "NandWindow::ToBlocks" << clusters;
+    QList<quint16> ret;
+    quint16 size = clusters.size();
+    for( quint16 i = 0; i < size; i++ )
+    {
+	quint16 block = ( clusters.at( i ) / 8 );
+	if( !ret.contains( block ) )
+	    ret << block;
+    }
+    return ret;
+}
+
+//expects blocks, not clusters!!
+void NandWindow::DrawBlockMap( QList<quint16> newFile )
+{
+    if( blocks.size() != 0x1000 )
+    {
+	qWarning() << "NandWindow::DrawBlockMap -> current blocks are fucked up, son" << hex << blocks.size();
+	return;
+    }
+    QPixmap blue( ":/blue.png" );
+    QPixmap green( ":/green.png" );
+    QPixmap pink( ":/pink.png" );
+    QPixmap grey( ":/grey.png" );
+    QPixmap black( ":/black.png" );
+
+    for( quint16 i = 0; i < 0x1000; i++ )
+    {
+	quint16 thisBlock;
+	if( !newFile.contains( i ) )
+	{
+	    thisBlock = blocks.at( i );
+	}
+	else
+	{
+	    thisBlock = 2;
+	}
+	switch( thisBlock )
+	{
+	default:
+	case 1://used, but not in this file
+	    pmi[ i ]->setPixmap( green );
+	    break;
+	case 2://used in this file
+	    pmi[ i ]->setPixmap( pink );
+	    break;
+	case 0xFFFE://free block
+	    pmi[ i ]->setPixmap( grey );
+	    break;
+	case 0xFFFC://reserved
+	    pmi[ i ]->setPixmap( blue );
+	    break;
+	case 0xFFFD: // bad block
+	    pmi[ i ]->setPixmap( black );
+	    break;
+	}
+    }
+
+
+}
+
+//show nand usage
+void NandWindow::on_actionShow_Usage_triggered()
+{
+    //128x32
+    /*QList<quint16> clusters = nThread.GetFats();//each of these is 0x4000 bytes ( neglecting the ecc )
+    quint16 badBlocks = 0;
+    quint16 reserved = 0;
+    quint16 freeBlocks = 0;
+    QList<quint16>badOnes;
+    for( quint16 i = 0; i < 0x8000; i++ )
+    {
+	quint16 fat = GetFAT( i );
+	if( 0xfffc == fat )
+	    reserved++;
+	else if( 0xfffd == fat )
+	{
+	    badBlocks++;
+	    if( i % 8 == 0 )
+	    {
+		badOnes << ( i / 8 );
+	    }
+	}
+	else if( 0xfffe == fat )
+	    freeBlocks++;
+    }
+    if( badBlocks )
+	 badBlocks /= 8;
+
+    if( reserved )
+	 reserved /= 8;
+
+    if( freeBlocks )
+	 freeBlocks /= 8;*/
+}
+
+//some item in the nand tree was clicked
+void NandWindow::on_treeWidget_currentItemChanged( QTreeWidgetItem* current, QTreeWidgetItem* previous )
+{
+    Q_UNUSED( previous );
+
+    if( !current || current->text( 6 ) == "00" )
+	return;
+    bool ok = false;
+    quint16 entry = current->text( 1 ).toInt( &ok );
+    if( !ok )
+    {
+	qDebug() << "NandWindow::on_treeWidget_currentItemChanged ->" << current->text( 1 ) << "isnt a decimal number";
+	return;
+    }
+
+    QList<quint16> blocks = ToBlocks( nThread.GetFatsForFile( entry ) );
+    //qDebug() << "blocks for" << current->text( 0 ) << blocks;
+    DrawBlockMap( blocks );
 }
diff --git a/nandExtract/nandwindow.h b/nandExtract/nandwindow.h
index 6a2509c..8df0f59 100755
--- a/nandExtract/nandwindow.h
+++ b/nandExtract/nandwindow.h
@@ -1,8 +1,10 @@
 #ifndef NANDWINDOW_H
 #define NANDWINDOW_H
 
-#include "includes.h"
-#include "../WiiQt/nandbin.h"
+#include "../WiiQt/includes.h"
+//#include "../WiiQt/nandbin.h"
+
+#include "nandthread.h"
 
 namespace Ui {
     class NandWindow;
@@ -20,21 +22,32 @@ protected:
 private:
     Ui::NandWindow *ui;
 
-    NandBin nandBin;
+    NandThread nThread;
+
+    //changes the blocks in the blockmap with different colors
+    void DrawBlockMap( QList<quint16> newFile = QList<quint16>() );
+    QGraphicsScene gv;//scene to hold the blockmap images
+    QGraphicsPixmapItem *pmi[ 0x1000 ];//pointers to all the blocks in the display
+    //quint16 ClusterToBlock( quint16 cluster );
+
+    QList<quint16> blocks;
+    quint32 freeSpace;
+    void GetBlocksfromNand();
+
+    QList<quint16> ToBlocks( QList<quint16> clusters );
+
 
-    //just put these here and create a slot to make the GUI not
-    //look so ugly when it hangs while stuff is extracting
-    QString exPath;
-    QTreeWidgetItem* exItem;
 
 public slots:
     void GetError( QString );
     void GetStatusUpdate( QString );
+    void ThreadIsDone();
 
 private slots:
+    void on_treeWidget_currentItemChanged(QTreeWidgetItem* current, QTreeWidgetItem* previous);
+    void on_actionShow_Usage_triggered();
     void on_actionOpen_Nand_triggered();
     void on_treeWidget_customContextMenuRequested(QPoint pos);
-    void ExtractShit();
 };
 
 #endif // NANDWINDOW_H
diff --git a/nandExtract/nandwindow.ui b/nandExtract/nandwindow.ui
index 3d101ef..a1d6b94 100755
--- a/nandExtract/nandwindow.ui
+++ b/nandExtract/nandwindow.ui
@@ -15,6 +15,12 @@
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QGridLayout" name="gridLayout">
+    <property name="margin">
+     <number>2</number>
+    </property>
+    <property name="spacing">
+     <number>2</number>
+    </property>
     <item row="0" column="0">
      <widget class="QTreeWidget" name="treeWidget">
       <property name="contextMenuPolicy">
@@ -62,6 +68,35 @@
       </column>
      </widget>
     </item>
+    <item row="1" column="0">
+     <widget class="QGraphicsView" name="graphicsView_blocks">
+      <property name="interactive">
+       <bool>false</bool>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+      </property>
+      <property name="renderHints">
+       <set>QPainter::Antialiasing|QPainter::HighQualityAntialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
+      </property>
+      <property name="cacheMode">
+       <set>QGraphicsView::CacheBackground</set>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="0">
+     <widget class="QProgressBar" name="progressBar">
+      <property name="maximumSize">
+       <size>
+        <width>150</width>
+        <height>16777215</height>
+       </size>
+      </property>
+      <property name="value">
+       <number>24</number>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menuBar">
@@ -79,7 +114,14 @@
     </property>
     <addaction name="actionOpen_Nand"/>
    </widget>
+   <widget class="QMenu" name="menuInfo">
+    <property name="title">
+     <string>Info</string>
+    </property>
+    <addaction name="actionShow_Usage"/>
+   </widget>
    <addaction name="menuFile"/>
+   <addaction name="menuInfo"/>
   </widget>
   <widget class="QToolBar" name="mainToolBar">
    <attribute name="toolBarArea">
@@ -98,6 +140,14 @@
     <string>Ctrl+O</string>
    </property>
   </action>
+  <action name="actionShow_Usage">
+   <property name="text">
+    <string>Show Usage...</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+U</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>
diff --git a/nandExtract/pink.png b/nandExtract/pink.png
new file mode 100755
index 0000000000000000000000000000000000000000..36afc61701f15260a450fcdcd9b8999a0cdde2e0
GIT binary patch
literal 2939
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

literal 0
HcmV?d00001

diff --git a/nandExtract/rc.qrc b/nandExtract/rc.qrc
new file mode 100644
index 0000000..a654d98
--- /dev/null
+++ b/nandExtract/rc.qrc
@@ -0,0 +1,9 @@
+<RCC>
+    <qresource prefix="/">
+        <file>blue.png</file>
+        <file>green.png</file>
+        <file>grey.png</file>
+        <file>pink.png</file>
+        <file>black.png</file>
+    </qresource>
+</RCC>