Reimplement the download function

Pokechu22 · Pokechu22 · commit 0f205c7e5da9 · 2019-01-10T12:14:08.000-08:00
Now one or more versions can be listed to be downloaded, and also the downloaded jars will be saved and reused (that probably wasn't possible before because it was always just a single minecraft.jar back then and keeping track of distinct versions would be hard). Additionally the username and password options have been removed, since they don't serve a purpose nowadays (I think they might have back then, though?). Finally, a -D (capital) option has been added to download the latest snapshot, similar to what the original download option would have been like. Also fixes #10.
diff --git a/README.md b/README.md
@@ -11,17 +11,24 @@ a few specifically. Each topping is then aggregated by
 
 ## Usage
 The simplest way to use Burger is to pass the `-d` or `--download`
-flag, which will download the minecraft client for you.
+flag, which will download the specified minecraft client for you.
+This option can be specified multiple times.  The downloaded jar will be saved
+in the working directory, and if it already exists the existing verison will be used.
 
-    $ python munch.py --download
+    $ python munch.py --download 1.13.2
+
+To download the latest snapshot, `-D` or `--download-latest` can be used.
+
+    $ python munch.py -D
 
 Alternatively, you can specify the client JAR by passing it as an argument.
 
     $ python munch.py 1.8.jar
 
 You can redirect the output from the default `stdout` by passing
-`-o <path>` or `--output <path>`.
-    
+`-o <path>` or `--output <path>`.  This is useful when combined with
+verbose output (`-v` or `--verbose`) so that the output doesn't go into the file.
+
     $ python munch.py -d --output output.json
 
 You can see what toppings are available by passing `-l` or `--list`.
diff --git a/burger/toppings/sounds.py b/burger/toppings/sounds.py
@@ -32,7 +32,7 @@
 import six
 import six.moves.urllib.request
 
-from burger.website import Website
+from burger import website
 from .topping import Topping
 
 from jawa.constants import *
@@ -71,14 +71,14 @@ class SoundTopping(Topping):
     def act(aggregate, classloader, verbose=False):
         sounds = aggregate.setdefault('sounds', {})
         try:
-            version_meta = Website.get_version_meta(aggregate["version"]["name"], verbose)
+            version_meta = website.get_version_meta(aggregate["version"]["name"], verbose)
         except Exception as e:
             if verbose:
                 print("Error: Failed to download version meta for sounds: %s" % e)
                 traceback.print_exc()
             return
         try:
-            assets = Website.get_asset_index(version_meta, verbose)
+            assets = website.get_asset_index(version_meta, verbose)
         except Exception as e:
             if verbose:
                 print("Error: Failed to download asset index for sounds: %s" % e)
diff --git a/burger/website.py b/burger/website.py
@@ -21,6 +21,7 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 """
+import os
 import six.moves.urllib.request
 
 try:
@@ -31,53 +32,70 @@
 VERSION_MANIFEST = "https://launchermeta.mojang.com/mc/game/version_manifest.json"
 LEGACY_VERSION_META = "https://s3.amazonaws.com/Minecraft.Download/versions/%(version)s/%(version)s.json" # DEPRECATED
 
+_cached_version_manifest = None
+_cached_version_metas = {}
+
 def _load_json(url):
     stream = six.moves.urllib.request.urlopen(url)
     try:
         return json.load(stream)
     finally:
         stream.close()
 
-class Website(object):
-    def __init__(self, username, password, version=999999):
-        self.username = username
-        self.password = password
-        self.version = version
-
-    @staticmethod
-    def get_version_meta(version, verbose):
-        """
-        Gets a version JSON file, first attempting the to use the version manifest
-        and then falling back to the legacy site if that fails.
-        Note that the main manifest should include all versions as of august 2018.
-        """
-        version_manifest = _load_json(VERSION_MANIFEST)
-        for version_info in version_manifest["versions"]:
-            if version_info["id"] == version:
-                address = version_info["url"]
-                break
-        else:
-            if verbose:
-                print("Failed to find %s in the main version manifest; using legacy site" % version)
-                address = LEGACY_VERSION_META % {'version': version}
-        if verbose:
-            print("Loading version manifest for %s from %s" % (version, address))
-        return _load_json(address)
-
-    @staticmethod
-    def get_asset_index(version_meta, verbose):
-        """Downloads the Minecraft asset index"""
-        if "assetIndex" not in version_meta:
-            raise Exception("No asset index defined in the version meta")
-        asset_index = version_meta["assetIndex"]
+def get_version_manifest():
+    global _cached_version_manifest
+    if _cached_version_manifest:
+        return _cached_version_manifest
+
+    _cached_version_manifest = _load_json(VERSION_MANIFEST)
+    return _cached_version_manifest
+
+def get_version_meta(version, verbose):
+    """
+    Gets a version JSON file, first attempting the to use the version manifest
+    and then falling back to the legacy site if that fails.
+    Note that the main manifest should include all versions as of august 2018.
+    """
+    if version in _cached_version_metas:
+        return _cached_version_metas[version]
+
+    version_manifest = get_version_manifest()
+    for version_info in version_manifest["versions"]:
+        if version_info["id"] == version:
+            address = version_info["url"]
+            break
+    else:
         if verbose:
-            print("Assets: id %(id)s, url %(url)s" % asset_index)
-        return _load_json(asset_index["url"])
+            print("Failed to find %s in the main version manifest; using legacy site" % version)
+        address = LEGACY_VERSION_META % {'version': version}
+    if verbose:
+        print("Loading version manifest for %s from %s" % (version, address))
+    meta = _load_json(address)
 
+    _cached_version_metas[version] = meta
+    return meta
+
+def get_asset_index(version_meta, verbose):
+    """Downloads the Minecraft asset index"""
+    if "assetIndex" not in version_meta:
+        raise Exception("No asset index defined in the version meta")
+    asset_index = version_meta["assetIndex"]
+    if verbose:
+        print("Assets: id %(id)s, url %(url)s" % asset_index)
+    return _load_json(asset_index["url"])
+
+
+def client_jar(version, verbose):
+    """Downloads a specific version, by name"""
+    filename = version + ".jar"
+    if not os.path.exists(filename):
+        meta = get_version_meta(version, verbose)
+        url = meta["downloads"]["client"]["url"]
+        if verbose:
+            print("Downloading %s from %s" % (version, url))
+        six.moves.urllib.request.urlretrieve(url, filename=filename)
+    return filename
 
-    @staticmethod
-    def client_jar(path=None, reporthook=None, version="1.9"):
-        url = "http://s3.amazonaws.com/Minecraft.Download/versions/%s/%s.jar" % (version, version)
-        #url = "http://s3.amazonaws.com/MinecraftDownload/minecraft.jar" # 1.5.2
-        r = six.moves.urllib.request.urlretrieve(url, filename=path, reporthook=reporthook)
-        return r[0]
+def latest_client_jar(verbose):
+    manifest = get_version_manifest()
+    return client_jar(manifest["latest"]["snapshot"], verbose)
diff --git a/munch.py b/munch.py
@@ -37,7 +37,7 @@
 from jawa.classloader import ClassLoader
 from jawa.transforms import simple_swap, expand_constants
 
-from burger.website import Website
+from burger import website
 from burger.roundedfloats import transform_floats
 
 
@@ -84,18 +84,16 @@ def import_toppings():
     try:
         opts, args = getopt.gnu_getopt(
             sys.argv[1:],
-            "t:o:vu:p:dlcs:",
+            "t:o:vd:Dlc",
             [
                 "toppings=",
                 "output=",
                 "verbose",
-                "username=",
-                "password=",
-                "download",
+                "download=",
+                "download-latest",
                 "list",
                 "compact",
-                "url=",
-                "source="
+                "url="
             ]
         )
     except getopt.GetoptError as err:
@@ -106,9 +104,8 @@ def import_toppings():
     toppings = None
     output = sys.stdout
     verbose = False
-    username = None
-    password = None
-    download_fresh_jar = False
+    download_jars = []
+    download_latest = False
     list_toppings = False
     compact = False
     url = None
@@ -117,20 +114,18 @@ def import_toppings():
         if o in ("-t", "--toppings"):
             toppings = a.split(",")
         elif o in ("-o", "--output"):
-            output = open(a, "a")
+            output = open(a, "w")
         elif o in ("-v", "--verbose"):
             verbose = True
         elif o in ("-c", "--compact"):
             compact = True
-        elif o in ("-u", "--username"):
-            username = a
-        elif o in ("-p", "--password"):
-            password = a
         elif o in ("-d", "--download"):
-            download_fresh_jar = True
+            download_jars.append(a)
+        elif o in ("-D", "--download-latest"):
+            download_latest = True
         elif o in ("-l", "--list"):
             list_toppings = True
-        elif o in ("-s", "--url", "--source"):
+        elif o in ("-s", "--url"):
             url = a
 
     # Load all toppings
@@ -213,10 +208,14 @@ def __repr__(self):
 
     jarlist = args
 
-    # Should we download a new copy of the JAR directly
-    # from minecraft.net?
-    if download_fresh_jar:
-        client_path = Website.client_jar()
+    # Download any jars that have already been specified
+    for version in download_jars:
+        client_path = website.client_jar(version, verbose)
+        jarlist.append(client_path)
+
+    # Download a copy of the latest snapshot jar
+    if download_latest:
+        client_path = website.latest_client_jar(verbose)
         jarlist.append(client_path)
 
     # Download a JAR from the given URL
@@ -265,9 +264,7 @@ def __repr__(self):
     else:
         json.dump(transform_floats(summary), output)
 
-    # Cleanup temporary downloads
-    if download_fresh_jar:
-        os.remove(client_path)
+    # Cleanup temporary downloads (the URL download is temporary)
     if url:
         os.remove(url_path)
     # Cleanup file output (if used)
