appstream-python 0.7__tar.gz → 0.8__tar.gz

{appstream-python-0.7/appstream_python.egg-info → appstream-python-0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: appstream-python
-Version: 0.7
+Version: 0.8
 Summary: A library for dealing with Freedesktop Appstream data
 Author-email: JakobDev <jakobdev@gmx.de>
 License: BSD-2-Clause

{appstream-python-0.7 → appstream-python-0.8}/appstream_python/Component.py

@@ -4,6 +4,7 @@ from .Release import ReleaseList
 from ._helper import assert_func
 from .StandardConstants import *
 from lxml import etree
+import dataclasses
 import io
 import os
 
@@ -190,6 +191,44 @@ class DisplayLength:
             return False
 
 
+@dataclasses.dataclass
+class Developer:
+    "Represents a <developer> tag"
+
+    id: Optional[str] = None
+    name: TranslateableTag = dataclasses.field(default_factory=lambda: TranslateableTag())
+
+    def load_tag(self, tag: etree.Element) -> None:
+        "Loads the data from a XML tag"
+        self.id = tag.get("id")
+
+        self.name.load_tags(tag.findall("name"))
+
+    def get_tag(self) -> etree.Element:
+        """
+        Returns the XML Tag
+
+        :return: The Tag
+        """
+        tag = etree.Element("developer")
+
+        if self.id is not None:
+            tag.set("id", self.id)
+
+        self.name.write_tags(tag, "name")
+
+        return tag
+
+    def clear(self) -> None:
+        """Resets all data"""
+        self.id = None
+        self.name.clear()
+
+    def is_empty(self) -> bool:
+        "Checks if the developer tag is empty"
+        return self.id is None and self.name.get_default_text() == ""
+
+
 class AppstreamComponent:
     "Represents AppStream Component"
 
@@ -203,8 +242,8 @@ class AppstreamComponent:
         self.name: TranslateableTag = TranslateableTag()
         "The component name"
 
-        self.developer_name: TranslateableTag = TranslateableTag()
-        "The developer name"
+        self.developer: Developer = Developer()
+        "The developer"
 
         self.summary: TranslateableTag = TranslateableTag()
         "The component summary"
@@ -284,7 +323,7 @@ class AppstreamComponent:
         self.id = ""
         self.type = "desktop"
         self.name.clear()
-        self.developer_name.clear()
+        self.developer.clear()
         self.summary.clear()
         self.description.items.clear()
         self.metadata_license = ""
@@ -357,7 +396,11 @@ class AppstreamComponent:
 
         self.name.load_tags(tag.findall("name"))
 
-        self.developer_name.load_tags(tag.findall("developer_name"))
+        # For backward compatibility
+        self.developer.name.load_tags(tag.findall("developer_name"))
+
+        if (developer_tag := tag.find("developer")) is not None:
+            self.developer.load_tag(developer_tag)
 
         self.summary.load_tags(tag.findall("summary"))
 
@@ -554,7 +597,8 @@ class AppstreamComponent:
 
         self.name.write_tags(tag, "name")
 
-        self.developer_name.write_tags(tag, "developer_name")
+        if not self.developer.is_empty():
+            tag.append(self.developer.get_tag())
 
         self.summary.write_tags(tag, "summary")
 
@@ -604,6 +648,9 @@ class AppstreamComponent:
         if len(provides_tag.getchildren()) == 0:
             tag.remove(provides_tag)
 
+        if len(self.releases) != 0:
+            tag.append(self.releases.get_tag())
+
         if self.project_group:
             project_group_tag = etree.SubElement(tag, "project_group")
             project_group_tag.text = self.project_group

appstream-python-0.8/appstream_python/version.txt

@@ -0,0 +1 @@
+0.8

{appstream-python-0.7 → appstream-python-0.8/appstream_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: appstream-python
-Version: 0.7
+Version: 0.8
 Summary: A library for dealing with Freedesktop Appstream data
 Author-email: JakobDev <jakobdev@gmx.de>
 License: BSD-2-Clause

{appstream-python-0.7 → appstream-python-0.8}/tests/test_appstream_data.py

@@ -11,6 +11,8 @@ def assert_component_jdtextedit(component: appstream_python.AppstreamComponent)
     assert component.id == "com.gitlab.JakobDev.jdTextEdit"
     assert component.name.get_default_text() == "jdTextEdit"
     assert component.summary.get_default_text() == "An advanced text editor"
+    assert component.developer.name.get_default_text() == "JakobDev"
+    assert component.developer.id is None
     assert component.project_license == "GPL-3.0-only"
     assert component.metadata_license == "CC0-1.0"
     assert component.project_group is None
@@ -53,3 +55,19 @@ def test_from_string() -> None:
     with open(JDTEXTEDIT_METAINFO, "r") as f:
         component = appstream_python.AppstreamComponent.from_string(f.read())
     assert_component_jdtextedit(component)
+
+
+def test_save_jdtextedit_data(tmp_path: pathlib.Path) -> None:
+    old_component = appstream_python.AppstreamComponent.from_file(JDTEXTEDIT_METAINFO)
+    old_component.save_file(tmp_path / "jdTextEdit.metainfo.xml")
+
+    new_component = appstream_python.AppstreamComponent.from_file(tmp_path / "jdTextEdit.metainfo.xml")
+    assert_component_jdtextedit(new_component)
+
+
+def test_data_appstream_cli() -> None:
+    component = appstream_python.AppstreamComponent.from_file(DATA_DIR / "org.freedesktop.appstream.cli.metainfo.xml")
+
+    assert component.project_group == "Freedesktop"
+    assert component.developer.id == "org.freedesktop"
+    assert component.developer.name.get_default_text() == "Matthias Klumpp"

appstream-python-0.7/appstream_python/version.txt

@@ -1 +0,0 @@
-0.7