From 45af5c122263e16dc7c6ef2a08f1584c71222c0a Mon Sep 17 00:00:00 2001
From: polaris <polaris-@users.noreply.github.com>
Date: Wed, 7 May 2014 17:40:25 -0400
Subject: [PATCH] Updated DLC code to use list file

---
 dlc/A5FE/_list.txt                   |   1 +
 dlc/B2KJ/_list.txt                   |   2 ++
 dlc/B2KJ/distribution110609.bin      | Bin 24 -> 24 bytes
 dlc/B2KJ/tweet111209.bin             | Bin 0 -> 2416 bytes
 dlc/BLFS/lt4_wifi_33_33.cb           | Bin 370 -> 0 bytes
 dlc/C3JS/lt3_wifi_eu_33_full_enc.dat | Bin 384 -> 0 bytes
 dlc/YLTS/enc_wifi_order_33_full.dat  |   1 -
 nintendo_nas_server.py               |  12 +++++-------
 8 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 dlc/A5FE/_list.txt
 create mode 100644 dlc/B2KJ/_list.txt
 create mode 100644 dlc/B2KJ/tweet111209.bin
 delete mode 100644 dlc/BLFS/lt4_wifi_33_33.cb
 delete mode 100644 dlc/C3JS/lt3_wifi_eu_33_full_enc.dat
 delete mode 100644 dlc/YLTS/enc_wifi_order_33_full.dat

diff --git a/dlc/A5FE/_list.txt b/dlc/A5FE/_list.txt
new file mode 100644
index 0000000..852f90f
--- /dev/null
+++ b/dlc/A5FE/_list.txt
@@ -0,0 +1 @@
+wifi_encode26.dat	MgA2AE9V7l1XMP9mSDA*				116
diff --git a/dlc/B2KJ/_list.txt b/dlc/B2KJ/_list.txt
new file mode 100644
index 0000000..941e82d
--- /dev/null
+++ b/dlc/B2KJ/_list.txt
@@ -0,0 +1,2 @@
+distribution110609.bin					24
+tweet111209.bin					2416
diff --git a/dlc/B2KJ/distribution110609.bin b/dlc/B2KJ/distribution110609.bin
index 5487e7f6d0c4729a382debb6639292dec802d043..d1473abd9493c53b145878d0ded43d0aa2db0d91 100644
GIT binary patch
literal 24
gcmazqPzV)wy_+Yu$AUFr<Gui;cS%bWmIj>z0C7tS4FCWD

literal 24
gcmazqPzV)wy_+Yu$ATeX<Gui;cS%bWmIj>z0C5Tm2mk;8

diff --git a/dlc/B2KJ/tweet111209.bin b/dlc/B2KJ/tweet111209.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f34fb8526de00fec2ea37f9dfa60716ebedfa74b
GIT binary patch
literal 2416
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

literal 0
HcmV?d00001

diff --git a/dlc/BLFS/lt4_wifi_33_33.cb b/dlc/BLFS/lt4_wifi_33_33.cb
deleted file mode 100644
index a603de5fa62c27c0d34dcd22644d23dbca85bb67..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 370
zcmV-&0ge7=*==H)JfG-M1TG0VC>w%RC|`ekcnYlY4j@DhC`!nbcv+9Mz#(!|=;t(W
z6SFdVW;!3r;g|csJdl;msM33hc&XQ1HKm$SeS;hq&CPj8JkEru<;@7y>z(Dszu%sq
z7BsNcfHf$wq;gF@i^kw>*ztJF64o39O=(nvwUxdx@F<ZsF+1%d($`xEHTXhmtxdex
z7X@E1nyIP%pzQTDHuew-z`*C6YHw%|KoL*a$*u@Tx9GqcxyzAWuq^<;<<nvRd;}Yc
zx1LWLmyx^y(V~1%n_Bn}o9za|OJ8(wP`#=R%_N<WhwC7XI{{&s4qfumay}JZV#m%F
zr#Yh1<kO0*vENE5&sRWhadV(n)v=wIRAV=R<4%T69aNDC;fnzNJ-4CC;bHqMlsx$A
zaxuGGp%D#rM5+L<Oa~`G6h}*)PET+Xiq}~n!WDL)KS5f<Ol&*LygU8-K^quBucmrB
QJH4f(Mo;N&cFRayjwo2NS^xk5

diff --git a/dlc/C3JS/lt3_wifi_eu_33_full_enc.dat b/dlc/C3JS/lt3_wifi_eu_33_full_enc.dat
deleted file mode 100644
index 0b4f2eb45e8857b1ed4b5263624b7c0ea23ee02d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmV-`0e}9HnSzYI&1b=A1Ei6(6BPo4?rzWMoaST}Am7mq$Pi$OWF(N$Z?nG~{MhOD
zPm>oDu&8$<_BdLW#3~lX?4flHKzJd{iGki^0HTXVs&o1Ng<wfYj>;5p&n(PsC5n)_
z?j3mD4~)y)4_tWCw$a;btAkbJK;{R7J4V1wCIX29HGzeHfwc;sSdMJu6&u-u2DxhK
zBd6%WyA3o?HOcv7z)d*ULUY|-yEYm!Bd}N?D4wD+GufX=7&W#hQUu&*lkdH4`q+VR
z2L$9XE`{r31jK0Rn^YTtnX6dlVd))++!>F>qD#}|iop8v+R*jwwD%TXvefgs)4mI{
z(F3LAWn+DIJBm^EHU4C??yub&_9}|RpY`<O;RXfS0aw!edh+I<1t5I(>TeLK@XK|&
z-Hvq&q)jgr5Ns=!#h%g<Wa7DX6b^~0T1>Aon$jf8<vrT#4zFgWMh=oWfqa4hHvXRq
edndQQzp;}&589-^6H0$h&}U-NkK$HY8%ULrsl*Ea

diff --git a/dlc/YLTS/enc_wifi_order_33_full.dat b/dlc/YLTS/enc_wifi_order_33_full.dat
deleted file mode 100644
index 8346126..0000000
--- a/dlc/YLTS/enc_wifi_order_33_full.dat
+++ /dev/null
@@ -1 +0,0 @@
-�΍���'O��~>
�D�s�쭈)�ݟ�4m/�}b����ԱS�	���,��tyd�f2t��y�vVx!֦�� ����-��4i���I��n��o�K��!(����W�0�x��7��]�d$�<FFW�Z��l�k��2�a^!
\ No newline at end of file
diff --git a/nintendo_nas_server.py b/nintendo_nas_server.py
index fa320a8..b8f48b9 100644
--- a/nintendo_nas_server.py
+++ b/nintendo_nas_server.py
@@ -93,7 +93,7 @@ class NintendoNasHTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 
             # TODO: Cache all DLC information in a database instead of querying the folder.
             ret = ""
-            dlcpath = "dlc/" + post["rhgamecd"]
+            dlcpath = "dlc/" + post["gamecd"]
             dlc_contenttype = False
 
             if action == "count":
@@ -109,12 +109,10 @@ class NintendoNasHTTPServerHandler(BaseHTTPServer.BaseHTTPRequestHandler):
                 offset = int(post["offset"])
 
                 if os.path.exists(dlcpath):
-                    filelist = os.listdir(dlcpath)
-
-                    if offset + num <= len(filelist):
-                        for file in filelist[offset:offset+num]:
-                            filesize = os.path.getsize(dlcpath + "/" + file)
-                            ret += "%s\t\t\t\t%d\r\n" % (file, filesize)
+                    # Look for a list file first.
+                    # If the list file exists, send the entire thing back to the client.
+                    if os.path.isfile(dlcpath + "/_list.txt"):
+                        ret = open(dlcpath + "/_list.txt", "rb").read()
 
             if action == "contents":
                 # Get only the base filename just in case there is a path involved somewhere in the filename string.