No commit message

blawar · Feb 13, 2019 · 002b863 · 002b863
1 parent 1e8073e
commit 002b863
Show file tree

Hide file tree

Showing 32 changed files with 623 additions and 353 deletions.
diff --git a/CDNSP.py b/CDNSP.py
@@ -17,13 +17,13 @@
 from hashlib import sha256
 from struct import pack as pk, unpack as upk
 from io import TextIOWrapper
-import Titles
+from nut import Titles
 import requests
 import unidecode
 import urllib3
-import Print
-import Status
-import Config
+from nut import Print
+from nut import Status
+from nut import Config
 
 #Global Vars
 titlekey_list = []

diff --git a/Fs/BaseFs.py b/Fs/BaseFs.py
@@ -1,5 +1,5 @@
 from Fs.File import File
-import Print
+from nut import Print
 from binascii import hexlify as hx, unhexlify as uhx
 
 class BaseFs(File):

diff --git a/Fs/File.py b/Fs/File.py
@@ -1,8 +1,8 @@
 from enum import IntEnum
 import Fs.Type
-import aes128
-import Print
-import Hex
+from nut import aes128
+from nut import Print
+from nut import Hex
 from binascii import hexlify as hx, unhexlify as uhx
 
 class BaseFile:

diff --git a/Fs/Hfs0.py b/Fs/Hfs0.py
@@ -1,7 +1,7 @@
-import aes128
-import Title
-import Titles
-import Hex
+from nut import aes128
+from nut import Title
+from nut import Titles
+from nut import Hex
 from binascii import hexlify as hx, unhexlify as uhx
 from struct import pack as pk, unpack as upk
 from Fs.File import File
@@ -12,10 +12,10 @@
 import os
 import re
 import pathlib
-import Keys
-import Config
-import Print
-import Nsps
+from nut import Keys
+from nut import Config
+from nut import Print
+from nut import Nsps
 import Fs
 from tqdm import tqdm
 

diff --git a/Fs/Ivfc.py b/Fs/Ivfc.py
@@ -1,7 +1,7 @@
-import aes128
-import Title
-import Titles
-import Hex
+from nut import aes128
+from nut import Title
+from nut import Titles
+from nut import Hex
 from binascii import hexlify as hx, unhexlify as uhx
 from struct import pack as pk, unpack as upk
 from Fs.File import File
@@ -10,10 +10,10 @@
 import os
 import re
 import pathlib
-import Keys
-import Config
-import Print
-import Nsps
+from nut import Keys
+from nut import Config
+from nut import Print
+from nut import Nsps
 from tqdm import tqdm
 
 MEDIA_SIZE = 0x200

diff --git a/Fs/Nacp.py b/Fs/Nacp.py
@@ -2,8 +2,8 @@
 import Fs.Type
 from binascii import hexlify as hx, unhexlify as uhx
 from enum import IntEnum
-import Print
-import Keys
+from nut import Print
+from nut import Keys
 
 class NacpLanguageType(IntEnum):
  AmericanEnglish = 0

diff --git a/Fs/Nca.py b/Fs/Nca.py
@@ -1,18 +1,18 @@
-import aes128
-import Title
-import Titles
-import Hex
+from nut import aes128
+from nut import Title
+from nut import Titles
+from nut import Hex
 from binascii import hexlify as hx, unhexlify as uhx
 from struct import pack as pk, unpack as upk
 from hashlib import sha256
 import Fs.Type
 import os
 import re
 import pathlib
-import Keys
-import Config
-import Print
-import Nsps
+from nut import Keys
+from nut import Config
+from nut import Print
+from nut import Nsps
 from tqdm import tqdm
 import Fs
 from Fs.File import File

diff --git a/Fs/Nsp.py b/Fs/Nsp.py
@@ -1,7 +1,7 @@
-import aes128
-import Title
-import Titles
-import Hex
+from nut import aes128
+from nut import Title
+from nut import Titles
+from nut import Hex
 from binascii import hexlify as hx, unhexlify as uhx
 from struct import pack as pk, unpack as upk
 from Fs.File import File
@@ -10,16 +10,16 @@
 import os
 import re
 import pathlib
-import Keys
-import Config
-import Print
-import Nsps
+from nut import Keys
+from nut import Config
+from nut import Print
+from nut import Nsps
 from tqdm import tqdm
 from Fs.Pfs0 import Pfs0
 from Fs.Ticket import Ticket
 from Fs.Nca import Nca
 import shutil
-import blockchain
+from nut import blockchain
 
 MEDIA_SIZE = 0x200
 

diff --git a/Fs/Pfs0.py b/Fs/Pfs0.py
@@ -1,7 +1,7 @@
-import aes128
-import Title
-import Titles
-import Hex
+from nut import aes128
+from nut import Title
+from nut import Titles
+from nut import Hex
 from binascii import hexlify as hx, unhexlify as uhx
 from struct import pack as pk, unpack as upk
 from Fs.File import File
@@ -10,10 +10,10 @@
 import os
 import re
 import pathlib
-import Keys
-import Config
-import Print
-import Nsps
+from nut import Keys
+from nut import Config
+from nut import Print
+from nut import Nsps
 from tqdm import tqdm
 from Fs.BaseFs import BaseFs
 

diff --git a/Fs/Rom.py b/Fs/Rom.py
@@ -5,10 +5,10 @@
 import os
 import re
 import pathlib
-import Keys
-import Config
-import Print
-import Nsps
+from nut import Keys
+from nut import Config
+from nut import Print
+from nut import Nsps
 from tqdm import tqdm
 from Fs.BaseFs import BaseFs
 from Fs.Ivfc import Ivfc

diff --git a/Fs/Ticket.py b/Fs/Ticket.py
@@ -1,9 +1,9 @@
 from Fs.File import File
 import Fs.Type
 from binascii import hexlify as hx, unhexlify as uhx
-import Print
-import Keys
-import blockchain
+from nut import Print
+from nut import Keys
+from nut import blockchain
 
 
 class Ticket(File):

diff --git a/Fs/Xci.py b/Fs/Xci.py
@@ -2,7 +2,7 @@
 from Fs.File import File
 from Fs.Hfs0 import Hfs0
 import os
-import Print
+from nut import Print
 
 
 MEDIA_SIZE = 0x200

diff --git a/Server/Controller/Api.py b/Server/Controller/Api.py
@@ -1,18 +1,18 @@
-import Titles
+from nut import Titles
 import json
-import Titles
-import Status
-import Nsps
-import Print
+from nut import Titles
+from nut import Status
+from nut import Nsps
+from nut import Print
 import Server
-import Config
-import Hex
+from nut import Config
+from nut import Hex
 import socket
 import struct
 import time
 import nut
 import cdn
-import blockchain
+from nut import blockchain
 import urllib.parse
 import requests
 
@@ -216,6 +216,7 @@ def getDownload(request, response, start = None, end = None):
  start = int(request.bits[-2])
  end = int(request.bits[-1])
 
+ #chunkSize = 0x1000000
  chunkSize = 0x400000
 
  with open(nsp.path, "rb") as f:
@@ -266,16 +267,20 @@ def getDownload(request, response, start = None, end = None):
  size = end - start
 
  i = 0
+ status = Status.create(size, 'Downloading ' + os.path.basename(nsp.path))
 
  while i < size:
  chunk = f.read(min(size-i, chunkSize))
  i += len(chunk)
 
+ status.add(len(chunk))
+
  if chunk:
  pass
  response.write(chunk)
  else:
  break
+ status.close()
  except BaseException as e:
  Print.error('NSP download exception: ' + str(e))
  if response.bytesSent == 0:

diff --git a/Server/__init__.py b/Server/__init__.py
@@ -3,13 +3,13 @@
 import socket
 import socketserver
 import time
-import Config
+from nut import Config
 import sys
 import os
 import re
-import Print
+from nut import Print
 import urllib
-import Users
+from nut import Users
 import base64
 from urllib.parse import urlparse
 from urllib.parse import parse_qs

diff --git a/cdn/Atum.py b/cdn/Atum.py
@@ -17,13 +17,13 @@
 from hashlib import sha256
 from struct import pack as pk, unpack as upk
 from io import TextIOWrapper
-import Titles
+from nut import Titles
 import requests
 import unidecode
 import urllib3
-import Print
-import Status
-import Config
+from nut import Print
+from nut import Status
+from nut import Config
 
 quiet = False
 truncateName = False

diff --git a/cdn/Shogun.py b/cdn/Shogun.py
@@ -17,16 +17,16 @@
 from hashlib import sha256
 from struct import pack as pk, unpack as upk
 from io import TextIOWrapper
-import Titles
+from nut import Titles
 import requests
 import unidecode
 import urllib3
-import Print
-import Status
-import Config
+from nut import Print
+from nut import Status
+from nut import Config
 import os
 import hashlib
-import Title
+from nut import Title
 import cdn.Superfly
 import cdn
 

diff --git a/cdn/Superfly.py b/cdn/Superfly.py
@@ -17,16 +17,16 @@
 from hashlib import sha256
 from struct import pack as pk, unpack as upk
 from io import TextIOWrapper
-import Titles
+from nut import Titles
 import requests
 import unidecode
 import urllib3
-import Print
-import Status
-import Config
+from nut import Print
+from nut import Status
+from nut import Config
 import os
 import hashlib
-import Title
+from nut import Title
 import cdn