Merge branch 'pr/52'

Author: pxdl

.gitignore

@@ -1,2 +1,6 @@
 .vscode
-key.txt
+key.txt
+__pycache__
+Album
+venv
+virtualenv

README.md

@@ -2,21 +2,28 @@
 Automatically organize and timestamp your Nintendo Switch captures
 ![image](https://user-images.githubusercontent.com/17756301/33006063-0c36d2ce-cdb0-11e7-8875-1044eab6527a.png)
 
+# !!! This Project has been deprecated in favor of [Switcheroo](https://github.com/Tyler-A/Switcheroo) / [Switcheroo Lite](https://github.com/dmynerd78/switcheroo-lite) !!!
+
 ## Requirements
+This package requires pycryptodome and BeautifulSoup4.
+You can install them by running
+``pip install -r requirements.txt``
 
-* ``pip install pycryptodome``
+(Optional) Key at offset 0x71000704D0 from the capsrv NSO loaded up in IDA as ``key.txt`` on the same folder as nxshot for automatic updating. Hash: ``24e0dc62a15c11d38b622162ea2b4383``
 
-* ``pip install BeautifulSoup4``
+## Usage
 
-* (Optional) Key at offset 0x71000704D0 from the capsrv NSO loaded up in IDA as ``key.txt`` on the same folder as nxshot for automatic updating. Hash: ``24e0dc62a15c11d38b622162ea2b4383``
+``nxshot.py [-h] [-d] FILEPATH``
 
-## Usage
+positional arguments:
 
-``nxshot.py FILEPATH``
+    FILEPATH                         "Nintendo/Album" folder from your SD card.
 
-Positional arguments:
+optional arguments:
 
->FILEPATH:    "Nintendo/Album" folder from your SD card.
+    -h, --help                       show this help message and exit
+    -d, --download-nswdb             Download IDs from nswdb.com instead of switchbrew.org
+                                     NOTE: Regions may not match SwitchBrew
 
 ![image](https://user-images.githubusercontent.com/17756301/33006113-3f204800-cdb0-11e7-99f4-94790c01916d.png)
 
@@ -28,8 +35,8 @@ If some of your screenshots end up being copied to ``../Nintendo/Album/Organized
 
 To see what games are currently automatically recognized, take a look at the [gameids.json](gameids.json) file.
 
-The list is automatically updated from [SwitchBrew](http://switchbrew.org/index.php?title=Title_list/Games)
-          
+The list is automatically updated from [SwitchBrew](http://switchbrew.org/index.php?title=Title_list/Games) by default. [nswdb](http://nswdb.com/) can be used with the ``-d`` flag.
+
 ## Help
 
 If you have any questions, feel free to send me a tweet [**@s1cp_**](https://twitter.com/s1cp_).

gameids.json

@@ -275,6 +275,7 @@
     "1E416003E8D82D42DB8ED6ABCE2CD05C": "Iro Hero (EUR JPN USA)",
     "1E777F45D84E62687A707A2E6BFA981B": "Crystal Crisis (EUR USA)",
     "1E9175739094EA812C0BB94786A49E66": "SUPERBEAT XONiC EX (EUR)",
+    "1E95E5926F1CB99A87326D927F27B47E": "System",
     "1E986BB24FF2BF4E79161F51B4808BAC": "Cities - Skylines - Nintendo Switch™ Edition (EUR JPN USA)",
     "1EB82633F9C7BDC1B178DCD09352DD9B": "Super Mario Odyssey™ Demo for KIOSK (USA)",
     "1EF4E2B5E9683EAAB935AE64491CD5FC": "EVE burst error R （イヴ バーストエラー アール） (JPN)",

nxshot.py

@@ -8,9 +8,10 @@
 from Crypto.Cipher import AES
 from Crypto.Util import Padding
 import hashlib
-from urllib.request import urlopen
+from urllib.request import urlopen, urlretrieve
 from urllib.error import URLError
 from bs4 import BeautifulSoup
+import xml.etree.ElementTree as ET
 
 keyhash = "24e0dc62a15c11d38b622162ea2b4383"
 updated = 0
@@ -27,6 +28,12 @@
     type=Path,
     help='"Nintendo/Album" folder from your SD card.')
 
+parser.add_argument('-d',
+    '--download-nswdb',
+    action='store_true',
+    help='Download IDs from nswdb.com instead of switchbrew.org\n \
+          NOTE: Regions may not match')
+
 # If there are arguments, parse them. If not, exit
 args = parser.parse_args()
 
@@ -45,12 +52,36 @@ def loadKey(filename, keyhash):
     except ValueError:
         print("Decryption key (key.txt) doesn't match!")
 
+def decryptTitleID(key, titleid):
+    cipher = AES.new(key, AES.MODE_ECB)
+
+    titleidb = bytes.fromhex(titleid)
+    titleidb = titleidb[7::-1]
+    conversion = titleidb.hex()
+    conversion = conversion.ljust(32, '0')
+    titleidb = bytes.fromhex(conversion)
+    encrypted = cipher.encrypt(titleidb)
+    screenshotid = encrypted.hex().upper()
+
+    return screenshotid
 
 def updateGameIDs():
     key = loadKey('key.txt', keyhash)
     if not key:
         return -1
 
+    if args.download_nswdb:
+        updateNSWDB(key)
+    else:
+        updateSwitchBrew(key)
+
+    with open('gameids.json', 'w', encoding='utf-8') as idfile:
+            json.dump(idname, idfile, ensure_ascii=False, indent=4, sort_keys=True)
+            print("Successfully updated Game IDs")
+
+    return 1
+
+def updateSwitchBrew(key):
     wiki = 'http://switchbrew.org/index.php?title=Title_list/Games'
     try:
         wikipage = urlopen(wiki)
@@ -62,8 +93,6 @@ def updateGameIDs():
     gametable = wikisoup.find('table', {"class": "wikitable sortable"})
     gametabler = gametable.find_all('tr')
 
-    cipher = AES.new(key, AES.MODE_ECB)
-
     for row in gametabler[1:]:
         try:
             titleid = str(row.contents[1].string)
@@ -80,22 +109,33 @@ def updateGameIDs():
 
         #print('TitleID = {}'.format(titleid))
 
-        titleidb = bytes.fromhex(titleid)
-        titleidb = titleidb[7::-1]
-        conversion = titleidb.hex()
-        conversion = conversion.ljust(32, '0')
-        titleidb = bytes.fromhex(conversion)
-        encrypted = cipher.encrypt(titleidb)
-        screenshotid = encrypted.hex().upper()
+        screenshotid = decryptTitleID(key, titleid)
 
         #print("ScreenshotID = {}".format(encrypted.hex()))
         idname[screenshotid] = gamename + ' (' + region + ')'
 
-    with open('gameids.json', 'w', encoding='utf-8') as idfile:
-        json.dump(idname, idfile, ensure_ascii=False, indent=4, sort_keys=True)
-        print("Successfully updated Game IDs")
 
-    return 1
+def updateNSWDB(key):
+    urlretrieve('http://nswdb.com/xml.php', 'db.xml')
+    tree = ET.parse('db.xml')
+    root = tree.getroot()
+
+    for release in root.findall('release'):
+        try:
+            screenshotid = decryptTitleID(key, release.find('titleid').text)
+
+            region = release.find('region').text
+            if region == "WLD":
+                region = "EUR USA"
+
+            name = release.find('name').text
+            name = name.replace(":", " -")
+        except ValueError:
+            continue
+
+        idname[screenshotid] = name + ' (' + region + ')'
+
+    os.remove("db.xml")
 
 
 def checkID(gameid, idname):
@@ -149,7 +189,8 @@ def checkFolders(filelist):
 
         current += 1
 
-        print('Organized {} of {} files.'.format(current, length))
+        print('Organized {} of {} files.\r'.format(current, length), end='')
+    print("")
 
 
 # Load game ids and their names from external file
@@ -196,4 +237,4 @@ def checkFolders(filelist):
 else:
     print('\nNo videos found!')
 
-print('Done!')
+print('Done!')

requirements.txt

@@ -0,0 +1,3 @@
+beautifulsoup4==4.7.0
+pycryptodome==3.7.2
+soupsieve==1.6