From fd82d14d4a5bce2c799f6a0d3b5c4bb611902eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sat, 11 Mar 2017 17:51:39 +0100
Subject: [PATCH] Add package name to the indexes

---
 index.py    | 9 ++++++++-
 metautil.py | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/index.py b/index.py
index 1d6c69b..1d8a65a 100755
--- a/index.py
+++ b/index.py
@@ -30,6 +30,7 @@ for package in os.listdir('multimc'):
     versionList = MultiMCVersionIndex()
     versionList.uid = package
     latest = {}
+    name = None
 
     # walk through all the versions of the package
     for filename in os.listdir("multimc/%s" % (package)):
@@ -49,6 +50,8 @@ for package in os.listdir('multimc'):
         versionEntry.type = versionFile.type
         versionEntry.releaseTime = versionFile.releaseTime
         versionEntry.sha256 = filehash
+        if name == None:
+            name = versionFile.name
 
         # update the latest version of particular type (if needed)
         if versionFile.type:
@@ -62,6 +65,9 @@ for package in os.listdir('multimc'):
     # sort the versions in descending order by time of release
     versionList.versions = sorted(versionList.versions, key=itemgetter('releaseTime'), reverse=True)
 
+    # assign some values derived from the version files
+    versionList.name = name
+
     # if the latest version dict was populated, transform it into output
     if latest:
         versionList.latest = {}
@@ -77,7 +83,8 @@ for package in os.listdir('multimc'):
     packageEntry = MultiMCPackageIndexEntry(
             {
                 "uid" : package,
-                "sha256": HashFile(hashlib.sha256, filepath)
+                "name" : name,
+                "sha256": HashFile(hashlib.sha256, outFilePath)
             }
         )
     packages.packages.append(packageEntry)
diff --git a/metautil.py b/metautil.py
index 6fb01ae..eccf3be 100644
--- a/metautil.py
+++ b/metautil.py
@@ -232,12 +232,14 @@ class MultiMCVersionIndexEntry(JsonObject):
     sha256 = StringProperty()
 
 class MultiMCVersionIndex(VersionedJsonObject):
+    name = StringProperty()
     uid = StringProperty()
     latest = DictProperty(StringProperty, exclude_if_none=True, default=None)
     recommended = DictProperty(StringProperty, exclude_if_none=True, default=None)
     versions = ListProperty(MultiMCVersionIndexEntry)
 
 class MultiMCPackageIndexEntry(JsonObject):
+    name = StringProperty()
     uid = StringProperty()
     sha256 = StringProperty()