frontpage/packages: fix output now that we have kkuleomi package feed example

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

1 files changed, 17 insertions, 6 deletions

diff --git a/_plugins/packages.rb b/_plugins/packages.rb
index 5d02178..e8e2f77 100644
--- a/_plugins/packages.rb
+++ b/_plugins/packages.rb
@@ -5,6 +5,7 @@ module Gentoo
     def generate(site)
       generate_soko(site)
     end
+
     def generate_soko(site)
       xml = nil
       begin
@@ -16,8 +17,7 @@ module Gentoo
         return []
       end
 
-      #site.data['packages'] ||= { 'updates' => [] }
-      items = []
+      site.data['packages'] ||= { 'updates' => [] }
 
       xml.xpath('/feed/entry').each do |item|
         item_data = {}
@@ -27,9 +27,11 @@ module Gentoo
           entry_by_tagname[tag.name] = tag
         end
 
+        # Have to split out CAT/PN from CPV, the easiest place is the id
+        # element.
         if entry_by_tagname['id'].text =~ /^tag:packages.gentoo.org,(\d{4}-\d{2}-\d{2}):\/package\/(.*)/ then
           item_data['date'] = $1
-          item_data['atom'] = $2
+          item_data['atom'] = item_data['atom_cpv'] = $2
           item_data['atom_c'], item_data['atom_pn'] = item_data['atom'].split('/', 2)
           item_data['atom_pv'] = nil
           if entry_by_tagname['title'].text.start_with?(item_data['atom']) then
@@ -43,11 +45,12 @@ module Gentoo
                                             item_data['atom_pn'],
                                             item_data['atom_pv'])
           end
-          items << item_data
+
+          site.data['packages']['updates'] << item_data
         end
       end
-      return items
     end
+
     def generate_kkuleomi(site)
       xml = Nokogiri::XML(File.open(XML))
       # atom is mainly one namespace
@@ -78,7 +81,15 @@ module Gentoo
 end
 
 # Example from kkuleomi
-# TODO
+#  <entry>
+#    <id>tag:packages.gentoo.org,2015-10-03:added:dev-java/ant-apache-regexp</id>
+#    <published>2020-06-23T16:21:26Z</published>
+#    <link rel="alternate" type="text/html" href="https://packages.gentoo.org/packages/dev-java/ant-apache-regexp"/>
+#    <updated>2020-06-23T16:21:26+00:00</updated>
+#    <title>dev-java/ant-apache-regexp (Apache Ant's optional tasks depending on jakarta-regexp-1.4)</title>
+#    <content>dev-java/ant-apache-regexp is now available in Gentoo on these architectures: amd64, ppc64, x86, ~amd64-linux, ~x86-linux, ~ppc-macos, ~x64-macos, ~x86-macos, ~sparc-solaris, ~sparc64-solaris, ~x64-solaris, ~x86-solaris</content>
+#  </entry>
+#
 # Example from Soko:
 #  <entry>
 #    <title>dev-python/requests-unixsocket-0.2.0</title>