Revert "Append existing frontmatter from addon docs (#2754)" (#2759)

This reverts commit c67691c.

Author: florian-h05

scripts/lib/addon_processor.rb

@@ -2,7 +2,6 @@
 
 require "rexml/document"
 require "fileutils"
-require "yaml"
 
 # AddonProcessor processes external add-on repositories (openhab-addons and openhab-webui).
 #
@@ -50,7 +49,7 @@ def self.process_addon_type(features, dest_addons_dir, images_dir, src_bundles_d
     end
 
     Dir.foreach(src_bundles_dir) do |addon_name|
-      next if [".", ".."].include?(addon_name)
+      next if addon_name == "." || addon_name == ".."
 
       # Match the type in package name structure (org.openhab.<type>...)
       parts = addon_name.split(".")
@@ -85,7 +84,7 @@ def self.process_addon_type(features, dest_addons_dir, images_dir, src_bundles_d
       FileUtils.mkdir_p(target_dir)
 
       # Copy doc/, cfg/, images/, and icons/ if they exist
-      %w[doc cfg images icons].each do |sub_dir|
+      ["doc", "cfg", "images", "icons"].each do |sub_dir|
         source_sub = File.join(addon_path, sub_dir)
         if id == "zwave" && sub_dir == "doc"
           zwave_things_md = File.join(source_sub, "thing.md")
@@ -96,7 +95,9 @@ def self.process_addon_type(features, dest_addons_dir, images_dir, src_bundles_d
           end
           next
         end
-        FileUtils.cp_r(source_sub, target_dir) if Dir.exist?(source_sub)
+        if Dir.exist?(source_sub)
+          FileUtils.cp_r(source_sub, target_dir)
+        end
       end
 
       # Look for README.md (case-insensitive)
@@ -108,17 +109,16 @@ def self.process_addon_type(features, dest_addons_dir, images_dir, src_bundles_d
 
       # Read and parse readme
       readme_text = File.read(readme_src)
-      existing_front_matter, readme_text = split_front_matter(readme_text)
 
       # Determine label from first level 1 header
       label = nil
       readme_text.each_line do |line|
-        next unless line.start_with?("#")
-
-        label = line.gsub("#", "").strip
-        lblremoves.each { |remove| label = label.gsub(Regexp.new(remove), "") }
-        label = label.strip
-        break
+        if line.start_with?("#")
+          label = line.gsub("#", "").strip
+          lblremoves.each { |remove| label = label.gsub(Regexp.new(remove), "") }
+          label = label.strip
+          break
+        end
       end
 
       if label.nil? || label.empty?
@@ -143,7 +143,7 @@ def self.process_addon_type(features, dest_addons_dir, images_dir, src_bundles_d
       end
 
       # Build frontmatter hash
-      front_matter = {
+      front = {
         "id" => id,
         "label" => label,
         "title" => "#{label}#{suffix}",
@@ -152,9 +152,9 @@ def self.process_addon_type(features, dest_addons_dir, images_dir, src_bundles_d
       }
 
       if logo_svg
-        front_matter["logo"] = "images/addons/#{id}.svg"
+        front["logo"] = "images/addons/#{id}.svg"
       elsif logo_png
-        front_matter["logo"] = "images/addons/#{id}.png"
+        front["logo"] = "images/addons/#{id}.png"
       end
 
       # Find install type from features list
@@ -165,25 +165,20 @@ def self.process_addon_type(features, dest_addons_dir, images_dir, src_bundles_d
       end
 
       install_attrs = feature_entry ? feature_entry[1] : { "install" => "manual" }
-      front_matter.merge!(install_attrs)
-      # Existing front matter from the readme takes precedence if it exists
-      front_matter.merge!(existing_front_matter) if existing_front_matter.is_a?(Hash)
+      front.merge!(install_attrs)
+
+      # Build frontmatter block
+      frontmatter_str = "---\n" + front.map { |k, v| "#{k}: #{v}" }.join("\n") + "\n---\n\n"
 
       # Re-format readme content: remove first heading and replace with custom template
       first_h1_match = readme_text.match(/^# .*/)
       heading = first_h1_match ? first_h1_match[0] : "# #{label}"
       text_without_heading = first_h1_match ? readme_text.sub(heading, "") : readme_text
 
       addon_logo_tag = (logo_svg || logo_png) ? "\n\n<AddonLogo />" : ""
-      # to_yaml adds "---\n" at the start, we want to remove that and add our own "---" at the start and end
-      front_matter_str = front_matter.to_yaml.sub(/\A---\s*\n/, "").strip
 
       final_content = <<~MARKDOWN
-        ---
-        #{front_matter_str}
-        ---
-
-        <!-- Attention authors: Do not edit directly. Please add your changes to the appropriate source repository -->
+        #{frontmatter_str}<!-- Attention authors: Do not edit directly. Please add your changes to the appropriate source repository -->
 
         #{heading}#{addon_logo_tag}#{text_without_heading}
       MARKDOWN
@@ -197,23 +192,6 @@ def self.process_addon_type(features, dest_addons_dir, images_dir, src_bundles_d
     puts "  ✔ Processed add-on type: #{type} -> #{dest_folder_name}"
   end
 
-  def self.split_front_matter(content)
-    match = content.match(/\A---\s*\n(?<front_matter>.*?)^---\s*$\n?(?<content>.*)/m)
-
-    if match
-      front_matter_str = match[:front_matter]
-      begin
-        front_matter = YAML.safe_load(front_matter_str) || {}
-      rescue Psych::Exception => e
-        warn "  ⚠️ Failed to parse front matter YAML: #{e.message}"
-        front_matter = {}
-      end
-      [front_matter, match[:content]]
-    else
-      [nil, content]
-    end
-  end
-
   def self.process_all(distro_features_path, snapshot_features_path, addons_bundles_dir, webui_bundles_dir, dest_addons_dir, images_dir)
     features = collect_features(distro_features_path, snapshot_features_path)