Include last_build in all versions

XereoNet · Sep 17, 2014 · d2d1d38 · d2d1d38
1 parent f424781
commit d2d1d38
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 13 deletions.
diff --git a/loader/resources/cauldron_loader.py b/loader/resources/cauldron_loader.py
@@ -23,6 +23,7 @@ def load_pack(self, path, url):
     def parse_rows(self, row):
         version, minecraft, release, downloads = row.find_all('td')
         url = downloads.find_all('a').pop()['href']
+        build = re.sub(r'[^0-9]', '', version.text)
 
         return {
             '$parents': [
@@ -40,15 +41,16 @@ def parse_rows(self, row):
                     '$id': minecraft.text,
                     'resource': 'version',
                     'version': minecraft.text,
-                    'mc_version': minecraft.text
+                    'mc_version': minecraft.text,
+                    'last_build': build
                 }
             ],
             '$id': version.text,
             '$load': lambda path: self.download(url, path),
             '$patched': False,
             'resource': 'build',
             'created': datetime.datetime.strptime(release.text, '%m/%d/%Y %I:%M:%S %p'),
-            'build': re.sub(r'[^0-9]', '', version.text),
+            'build': build,
             'url': url,
         }
 

diff --git a/loader/resources/craftbukkit_loader.py b/loader/resources/craftbukkit_loader.py
@@ -37,7 +37,8 @@ def parse_results(self, result):
                     '$id': result['version'],
                     'resource': 'version',
                     'version': result['version'],
-                    'mc_version': re.search(r'^[0-9\.]+', result['version']).group(0)
+                    'mc_version': re.search(r'^[0-9\.]+', result['version']).group(0),
+                    'last_build': result['build_number']
                 }
             ],
             '$id': str(result['build_number']),

diff --git a/loader/resources/creeperrepo_loader.py b/loader/resources/creeperrepo_loader.py
@@ -43,6 +43,7 @@ def parse_pack(self, elem):
 
         url = (self.base_url + urllib.parse.quote_plus('modpacks^{dir}^{version}'.format(**urlparts))
                + '/' + elem['url'])
+        build = re.sub(r'[^0-9]', '', elem['version'])
 
         return {
             '$parents': [
@@ -60,15 +61,16 @@ def parse_pack(self, elem):
                     '$id': elem['version'],
                     'resource': 'version',
                     'version': elem['version'],
-                    'mc_version': elem['mcVersion']
+                    'mc_version': elem['mcVersion'],
+                    'last_build': build
                 }
             ],
             '$id': elem['version'],
             '$load': lambda path: self.load_pack(elem, url, path),
             '$patched': True,
             'resource': 'build',
             'created': datetime.datetime.now(),
-            'build': re.sub(r'[^0-9]', '', elem['version']),
+            'build': build,
             'url': url,
         }
 

diff --git a/loader/resources/directs/pixelmon.json b/loader/resources/directs/pixelmon.json
@@ -14,9 +14,10 @@
                 "description": ""
             },
             {
-                "$id":      "3.2.4",
-                "resource": "version",
-                "version":  "3.2.4"
+                "$id":        "3.2.4",
+                "resource":   "version",
+                "version":    "3.2.4",
+                "last_build": 324
             }
         ],
         "$id":      "1710",
@@ -40,9 +41,10 @@
                 "description": ""
             },
             {
-                "$id":      "3.1.4",
-                "resource": "version",
-                "version":  "3.1.4"
+                "$id":        "3.1.4",
+                "resource":   "version",
+                "version":    "3.1.4",
+                "last_build": 314
             }
         ],
         "$id":      "17",

diff --git a/loader/resources/mojang_loader.py b/loader/resources/mojang_loader.py
@@ -36,6 +36,8 @@ def parse_version(self, version):
         url = self.download_url_base.format(version['id'])
         released = datetime.datetime.strptime(re.sub(r'\+[0-9]{2}:[0-9]{2}$', '',
                                                      version['releaseTime']), '%Y-%m-%dT%H:%M:%S')
+        build = math.floor(released.timestamp() / 100)
+
         return {
             '$parents': [
                 {
@@ -55,15 +57,16 @@ def parse_version(self, version):
                 }, {
                     '$id': version['id'],
                     'resource': 'version',
-                    'version': version['id']
+                    'version': version['id'],
+                    'last_build': build,
                 }
             ],
             '$id': version['id'],
             '$load': lambda path: self.download(url, path),
             '$patched': False,
             'resource': 'build',
             'created': released,
-            'build': math.floor(released.timestamp() / 100),
+            'build': build,
             'url': url,
         }