Fix #523: metadata:url was not allowed for base sets

Author: rubidium42

bananas_api/new_upload/readers/base_graphics.py

@@ -1,5 +1,6 @@
 from ...helpers.enums import PackageType
 from .helpers.base_sets import BaseSet
+from typing import Optional
 
 
 class BaseGraphics(BaseSet):
@@ -13,6 +14,7 @@ class BaseGraphics(BaseSet):
             "description": str,
             "palette": str,
             "blitter": str,
+            "url": Optional[str],
         },
         "files": {
             "base": str,

bananas_api/new_upload/readers/base_music.py

@@ -1,5 +1,6 @@
 from ...helpers.enums import PackageType
 from .helpers.base_sets import BaseSet
+from typing import Optional
 
 
 class BaseMusic(BaseSet):
@@ -11,6 +12,7 @@ class BaseMusic(BaseSet):
             "shortname": str,
             "version": str,
             "description": str,
+            "url": Optional[str],
         },
         "files": {
             "theme": str,

bananas_api/new_upload/readers/base_sounds.py

@@ -1,5 +1,6 @@
 from ...helpers.enums import PackageType
 from .helpers.base_sets import BaseSet
+from typing import Optional
 
 
 class BaseSounds(BaseSet):
@@ -11,6 +12,7 @@ class BaseSounds(BaseSet):
             "shortname": str,
             "version": str,
             "description": str,
+            "url": Optional[str],
         },
         "files": {
             "samples": str,

bananas_api/new_upload/readers/helpers/base_sets.py

@@ -1,4 +1,5 @@
 from configparser import ConfigParser
+from typing import Optional
 
 from ...exceptions import ValidationException
 
@@ -19,6 +20,9 @@ class BaseSet:
     @ivar description: Description of Base Set
     @type description: C{str}
 
+    @ivar url: URL of Base Set
+    @type url: C{str}
+
     @ivar files: Files included in Base Set, with their md5sum
     @type files: C{dict}
     """
@@ -30,6 +34,7 @@ def __init__(self):
         self.unique_id = None
         self.version = None
         self.description = None
+        self.url = None
         self.files = None
 
     def read(self, fp):
@@ -62,7 +67,9 @@ def read(self, fp):
 
             # Check entries we expected but are not there
             for key, key_type in keys.items():
-                if not ini_parser.has_option(section, key):
+                if key_type == Optional[str]:
+                    key_type = str
+                elif not ini_parser.has_option(section, key):
                     raise ValidationException(f"Option {section}:{key} is missing.")
                 value = ini_parser.get(section, key)
                 if not isinstance(value, key_type):
@@ -95,5 +102,6 @@ def read(self, fp):
         self.unique_id = ini_parser.get("metadata", "shortname").encode()
         self.version = ini_parser.get("metadata", "version")
         self.description = ini_parser.get("metadata", "description")
+        self.url = ini_parser.get("metadata", "url")
         self.files = files
         self.md5sum = md5sum

regression/nosound.obs

@@ -3,6 +3,7 @@ name         = NoSound
 shortname    = NULL
 version      = 0
 description  = A sound pack without any sounds
+url          = http://localhost
 
 [files]
 samples      = nosound.cat