added upload media-files

manyfold/root/hook.d/experience_updated/300-package_janusxr.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'json'
+require 'erb'
 require_relative './../../xrforge.rb'
 
 # Check if a filename is provided
@@ -11,6 +12,15 @@ end
 
 filename     = ARGV[0]
 JMLHeuristic = /<fireboxroom>.*?<\/fireboxroom>/im
+metadataRegex= /(^<!--|<fireboxroom).*/im
+templateDir  = File.dirname(__FILE__)+"/../../templates/"
+$links        = []
+
+def addLink(url)
+  $links.push(url)
+  return url
+end 
+
 
 begin
 
@@ -37,134 +47,145 @@ begin
   # Check if a model file was found after the loop
   if ! model_file
     XRForge.log("❌ No suitable 3D file found for JanusXR-compatible experience", logfile)
-    exit 
   end
 
   # Get the value of the environment variable FEDERATE_DRIVE_HOST
   federate_drive_host = ENV['FEDERATE_DRIVE_HOST']
 
   autogenerate = true
+  janusweb_src = ENV['DEV'] ? "/janusweb/janusweb.js" : "/janusweb/janusweb.min.js"
 
   if data['description'] && data['description'].match(JMLHeuristic)
-    if data['description'].match(/autogenerate=["']false["']/i)
+    if ! data['description'].match(/<room.* autogenerate.*>/i)
-      XRForge.log("✅ autogenerate='false' found in JML..keeping this JML",logfile)
+      XRForge.log("✅ autogenerate attribute found in JML..keeping this JML",logfile)
       autogenerate = false
       jmlMatch = data['description'].match(JMLHeuristic)
       jml = jmlMatch[0] 
     end
   end
+
   if autogenerate
-    assets  = "<assetobject id=\"experience\" src=\"#{federate_drive_host}/#{dirPublic}/#{model_file.gsub("#","%23")}\"/>\n"
+    assets      = ""
     objects     = ""
+    startpos    = ""
+    audiovisual = false
+    showavatar  = "showavatar=\"false\""
+    data['keywords']    = data['keywords']    || []
+    data['description'] = data['description'] || ""
+    if data['description'].strip().length == 0
+      data['description'] = "Click the edit-button to change this description, or add the 'nodescription' tag to hide this."
+    end
+
+    # tags to JML rooms
+    use_local_asset = ""
+    use_local_asset = data['keywords'].include?('room1') ? "room1" : use_local_asset
+    use_local_asset = data['keywords'].include?('room2') ? "room2" : use_local_asset
+    use_local_asset = data['keywords'].include?('room3') ? "room3" : use_local_asset
+    use_local_asset = data['keywords'].include?('room4') ? "room4" : use_local_asset
+    use_local_asset = data['keywords'].include?('room5') ? "room5" : use_local_asset
+    use_local_asset = data['keywords'].include?('room6') ? "room5" : use_local_asset
+    use_local_asset = data['keywords'].include?('room1_pedestal') ? "room1_pedestal" : use_local_asset
+    use_local_asset = data['keywords'].include?('room2_pedestal') ? "room2_pedestal" : use_local_asset
+    use_local_asset = data['keywords'].include?('room2_narrow') ? "room3_narrow" : use_local_asset
+
+    # private room or not
+    if data['keywords'].include?('singleuser') 
+      private    = "private=\"true\""
+    data['keywords']    = data['keywords']    || []
+      showavatar = "showavatar=\"false\""
+    end 
+    
+    if data['keywords'].include?('showavatar') 
+      showavatar = "showavatar=\"false\""
+    end
 
     # detect audio track sidecarfile as per XR Fragment spec: https://xrfragment.org/#%F0%9F%93%9C%20level0%3A%20File
-    xrf_ext = File.extname(model_file)
+    xrf_ext =  model_file ? File.extname(model_file) : ""
-    xrf_base = File.basename(model_file, xrf_ext)
+    xrf_base = model_file ? File.basename(model_file, xrf_ext) : ""
+
+    # remove the metadata from the description
+    description     = data['description'].gsub(metadataRegex,"").strip()
+
     data['resources'].each do |resource|
       ext = File.extname(resource['path'])
+
       if ext.match(/mp3/i)
+        audiovisual   = model_file ? false : true
         base          = File.basename(resource['path'], ext)
-        if base == xrf_base 
+        soundtrackUrl = addLink("#{federate_drive_host}/#{dirPublic}/#{resource["path"]}")
-          XRForge.log("✅ XR Fragments side-car file found: #{resource['path']}",logfile)
+        assets  += "    <assetsound id=\"soundtrack\" src=\"#{soundtrack_url}\"/>\n"
-          assets  = assets  + "    <assetsound id=\"soundtrack\" src=\"#{federate_drive_host}/#{dirPublic}/#{resource["path"]}\"/>\n"
+        objects += "<sound id=\"soundtrack\" loop=\"true\"/>\n"
-          objects = objects + "<sound id=\"soundtrack\" loop=\"true\"/>\n"
-        end
-      end
       end
 
-    if ! data['keywords']
+      if ext.match(/(png|jpg|jpeg|gif)/i)
-      data['keywords'] = []
+        imgbase = File.basename(resource['path'])
+        if File.basename( data['image'] || "") != imgbase && # ignore thumbnail
+           xrf_base != imgbase                               # ignore XR Fragments thumbnail
+
+          audiovisual   = model_file ? false : true
+          base = File.basename(resource['path'], ext)
+          videoSrc = addLink("#{federate_drive_host}/#{dirPublic}/#{resource["path"]}")
+          assets  += "<assetimage id=\"image\" src=\"#{videoSrc}\" loop=\"true\" auto_play=\"true\"/>\n"
+          objects += "  <Object cull_face=\"none\" id=\"rplane\" js_id=\"image\" lighting=\"false\" pos=\"0 6.5 5.5\" scale=\"4 4 1\" image_id=\"image\"/>\n"
+        end
       end
 
-    private = data['keywords'].include?('singleuser') ? "private='true'" : ""
+      if ext.match(/mp4/i) || ext.match(/webm/i)
-    # tags to JML rooms *REFACTOR PLEASE*
+        audiovisual   = model_file ? false : true
-    use_local_asset = ""
+        base = File.basename(resource['path'], ext)
-    use_local_asset = data['keywords'].include?('room1') ? "use_local_asset=\"room1\"" : use_local_asset
+        videoSrc = addLink("#{federate_drive_host}/#{dirPublic}/#{resource["path"]}")
-    use_local_asset = data['keywords'].include?('room2') ? "use_local_asset=\"room2\"" : use_local_asset
+        assets  += "<assetvideo id=\"video\" src=\"#{videoSrc}\" loop=\"true\" auto_play=\"true\"/>\n"
-    use_local_asset = data['keywords'].include?('room3') ? "use_local_asset=\"room3\"" : use_local_asset
+        objects += "  <Object cull_face=\"none\" id=\"rplane\" js_id=\"video\" lighting=\"false\" pos=\"0 6.5 5.5\" scale=\"4 4 1\" video_id=\"video\"/>\n"
-    use_local_asset = data['keywords'].include?('room4') ? "use_local_asset=\"room4\"" : use_local_asset
+      end
-    use_local_asset = data['keywords'].include?('room5') ? "use_local_asset=\"room5\"" : use_local_asset
-    use_local_asset = data['keywords'].include?('room6') ? "use_local_asset=\"room5\"" : use_local_asset
-    use_local_asset = data['keywords'].include?('room1_pedestal') ? "use_local_asset=\"room1_pedestal\"" : use_local_asset
-    use_local_asset = data['keywords'].include?('room2_pedestal') ? "use_local_asset=\"room2_pedestal\"" : use_local_asset
-    use_local_asset = data['keywords'].include?('room2_narrow') ? "use_local_asset=\"room3_narrow\"" : use_local_asset
-
-    objects  = objects + "    <object pos=\"0 0 5\" rotation=\"-180 0 180\" lighting=\"false\" collision_id=\"experience\" id=\"experience\" />"
-                                         
-    #janusweb_src = "https://web.janusvr.com/janusweb.js"
-    janusweb_src = ! ENV['DEV'].empty? ? "/janusweb/janusweb.js" : "/janusweb/janusweb.min.js"
-
-    server       = ""
-    if ENV['JANUSXR'] && ! ENV['JANUSXR'].empty?
-      serverUrl    = federate_drive_host.gsub("://","://presence.")
-                                        .gsub(/:[0-9].*/,"")
-                                        .gsub(/\/$/,"")
-      server       = "server=#{serverUrl}:5566/"
     end
 
-    jml = <<~JML
+    if audiovisual
-<FireBoxRoom>
+      # TODO: copy files from a heuristic-based folder instead hardcoding it here
-  <Assets>
+      startpos        = "pos=\"0 0 -10\""
-    #{assets}
+      use_local_asset = "room5"
-  </Assets>
+      rplaneSrc       = addLink("#{federate_drive_host}/#{dirPublic}/roundedplane.glb")
-  <Room autogenerate="true" #{use_local_asset} #{private} #{server} showavatar="false" voip="none">
+      system("cp /root/templates/audiovisual/roundedplane.glb #{dir}/.")
-    #{objects}
+      assets  += "    <assetobject id=\"rplane\" src=\"#{rplaneSrc}\"/>\n"
-  </Room>
+      objects += "    <Object cull_face=\"none\" id=\"rplane\" js_id=\"text_rplane\" lighting=\"false\" pos=\"2.69 1.84 -3.37\" rotation=\"0 45 0\" scale=\"1.6 1 1\"/>\n"
-</FireBoxRoom>
+      if ! data['keywords'].include?( use_local_asset )
-<!-- archive.org hints -->
+        data['keywords'].push( use_local_asset )
-<a href="#{federate_drive_host}/#{dirPublic}/#{model_file.gsub("#","%23")}"></a> 
+      end
-    JML
+    end
       
-    data['description'] = data['description'] ? data['description'] : "your description here\n"
+    # generate thumbnail if no thumbnail 
-    data['description'] = <<~DESCRIPTION#{data['description']}
+    if data['resources'].length == 1 
-<!-- Hi there! Below is autogenerated JanusXR Markup (JML).             -->
+      thumbfile = "thumbnail.jpg"
-<!-- If you want to tweak it, then first disable autogeneration         -->
+      if model_file
-<!-- How? make sure to set autogenerate to "false" (see room-tag below) -->
+        thumbfile = "#{xrf_base}.jpg"
-<!--                                                                    -->
+      end
-<!-- JML info:                                                          -->
+      system("/root/bin/random_thumbnail.sh","/root/templates/thumbnailseed.jpg","#{dir}/#{thumbfile}","6","2>&1 | sed 's|/root/template||g'")
-<!-- https://coderofsalvation.github.io/janus-guide/#/examples/markup   -->
+      data['image'] = thumbfile
-<!-- https://janusxr.org/docs/build/introtojml/index.html               -->
+      XRForge.log("✅ generated thumbnail", logfile)
+    end
 
-#{jml}
+    if description && !data['keywords'].include?('nodescription')
-    DESCRIPTION
+      objects += "    <Paragraph pos=\"2.8 1 -3.21\" fwd=\"0 0 1\" lighting=\"false\" rotation=\"180 -45 180\" col=\"0.5 0.8 0.5\" scale=\"2 2 2\" font_size=\"50\" locked=\"false\">#{description}</Paragraph>\n"
+    end
+
+    if model_file 
+      objectSrc = "#{federate_drive_host}/#{dirPublic}/#{model_file.gsub("#","%23")}"
+      if ! $links.include?(objectSrc)
+        objectSrc = addLink(objectSrc)
+        assets  += "    <assetobject id=\"experience\" src=\"#{objectSrc}\"/>\n"
+        objects += "    <object pos=\"0 0 5\" rotation=\"-180 0 180\" lighting=\"false\" collision_id=\"experience\" id=\"experience\" />"
+      end
+    end 
+
+    use_local_asset = use_local_asset ? "use_local_asset=\"#{use_local_asset}\"" : ""
+
+    jml = ERB.new( File.read( templateDir+"JML/room.erb" ) ).result(binding)
+    data['description'] = data['description'] ? data['description'].gsub(metadataRegex,"") : ""
+    data['description'] += "\n\n" + ERB.new( File.read( templateDir+"JML/header.erb" ) ).result(binding)
+    data['description'] += jml
     File.write("datapackage.json", JSON.pretty_generate(data) )
   end
 
-  html = <<~HTML
+  html = ERB.new( File.read( templateDir+"JML/client.html") ).result(binding)
-    <!DOCTYPE html>
-    <html>
-    <head>
-      <title>#{data['title']} - JanusXR</title>
-    </head>
-    <body>
-      <janus-viewer homepage="/" autostart="false">
-      #{jml}
-      </janus-viewer>
-
-      <!-- map URL query args to room-attributes -->
-      <script>
-      args = new URLSearchParams(document.location.search)
-      for( const [k,v] of args.entries()) document.querySelector("Room").setAttribute(k,v)
-      </script>
-      <script src="#{janusweb_src}"></script>
-      <script>
-        elation.config.set("engine.assets.corsproxy", "#{federate_drive_host.gsub(/:[0-9].*/,"")}:5577")
-        elation.config.set("janusweb.network.host", "#{federate_drive_host.gsub(/:[0-9].*/,"")}:5566")
-        elation.config.set("dependencies.host", "#{federate_drive_host.gsub(/:[0-9].*/,"")}");
-        let opts = {
-          uiconfig: `/janusweb/media/assets/webui/${ args.get("networking") == "false" ? "preview" : "default"}.json`,
-          // for more opts see getClientArgs() in 
-          // https://github.com/jbaicoianu/janusweb/blob/master/scripts/client.js
-        }
-        // start!
-        elation.janusweb.init(opts)
-      </script>
-
-      <!-- archive.org hints -->
-      <a href="#{federate_drive_host}/#{dirPublic}/#{model_file.gsub("#","%23")}"></a> 
-    </body>
-    </html>
-  HTML
 
   File.write('.xrforge/janusxr.html', html)
   File.write('.xrforge/scene.jml', jml)