Merge pull request #4833 from manyfold3d/flexible-conversion

Author: Floppy

app/jobs/analysis/file_conversion_job.rb

@@ -14,43 +14,43 @@ class Analysis::FileConversionJob < ApplicationJob
   def perform(file_id, output_format)
     # Get model
     file = ModelFile.find(file_id)
-    # Can we output this format?
-    raise UnsupportedFormatError unless SupportedMimeTypes.can_export?(output_format) || !file.loadable?
-    extension = nil
+
+    # Can we convert this format?
+    raise UnsupportedFormatError if !SupportedMimeTypes.can_export?(output_format) || !file.loadable?
+    extension = Mime::EXTENSION_LOOKUP.select { |k, v| v.symbol == output_format }.keys.last
+
     status[:step] = "jobs.analysis.file_conversion.loading_mesh" # i18n-tasks-use t('jobs.analysis.file_conversion.loading_mesh')
-    case output_format
-    when :threemf
-      # raise NonManifoldError.new if !file.manifold?
-      extension = "3mf"
+    scene = file.scene
+
+    # Manifold check for 3MF files
+    # raise NonManifoldError.new if output_format == :threemf && !file.manifold?
+
+    status[:step] = "jobs.analysis.file_conversion.exporting" # i18n-tasks-use t('jobs.analysis.file_conversion.exporting')
+    new_file = ModelFile.new(
+      model: file.model,
+      filename: file.filename.gsub(".#{file.extension}", ".#{extension}")
+    )
+    dedup = 0
+    while new_file.exists_on_storage?
+      dedup += 1
+      new_file.filename = file.filename.gsub(".#{file.extension}", "-#{dedup}.#{extension}")
     end
-    if extension
-      status[:step] = "jobs.analysis.file_conversion.exporting" # i18n-tasks-use t('jobs.analysis.file_conversion.exporting')
-      new_file = ModelFile.new(
-        model: file.model,
-        filename: file.filename.gsub(".#{file.extension}", ".#{extension}")
+    # Save the new file into the Shrine cache, and attach
+    Tempfile.create("", ModelFileUploader.find_storage(:cache).directory) do |outfile|
+      scene.export(extension, outfile.path)
+      new_file.attachment = ModelFileUploader.uploaded_file(
+        storage: :cache,
+        id: File.basename(outfile.path),
+        metadata: {
+          filename: new_file.filename,
+          size: File.size(outfile.path)
+        }
       )
-      dedup = 0
-      while new_file.exists_on_storage?
-        dedup += 1
-        new_file.filename = file.filename.gsub(".#{file.extension}", "-#{dedup}.#{extension}")
-      end
-      # Save the new file into the Shrine cache, and attach
-      Tempfile.create("", ModelFileUploader.find_storage(:cache).directory) do |outfile|
-        file.scene.export(extension, outfile.path)
-        new_file.attachment = ModelFileUploader.uploaded_file(
-          storage: :cache,
-          id: File.basename(outfile.path),
-          metadata: {
-            filename: new_file.filename,
-            size: File.size(outfile.path)
-          }
-        )
-      end
-      # Store record in database
-      new_file.save
-      # Queue up file scan
-      new_file.analyse_later
     end
+    # Store record in database
+    new_file.save
+    # Queue up file scan
+    new_file.analyse_later
   rescue NonManifoldError
     # Log non-manifold error as a problem, and absorb error so we don't retry
     Problem.create_or_clear(

app/lib/supported_mime_types.rb

@@ -39,8 +39,24 @@ def self.model_extensions
     Mime::EXTENSION_LOOKUP.filter { |k, v| is_model_mime_type?(v) }.keys
   end
 
+  def self.loadable
+    Mime::EXTENSION_LOOKUP.slice(
+      *Assimp.extension_list.to_s.delete("*.").split(";")
+    ).values.map(&:to_sym)
+  end
+
+  def self.can_load?(type)
+    loadable.include? type
+  end
+
+  def self.exportable
+    Mime::EXTENSION_LOOKUP.slice(
+      *(0...Assimp.aiGetExportFormatCount).map { |it| Assimp.aiGetExportFormatDescription it }.map(&:file_extension)
+    ).values.map(&:to_sym)
+  end
+
   def self.can_export?(type)
-    [:threemf].include? type
+    exportable.include? type
   end
 
   def self.indexable_types

app/models/model_file.rb

@@ -195,7 +195,7 @@ def convert_later(format, delay: 0.seconds)
   end
 
   def loadable?
-    true
+    SupportedMimeTypes.can_load? mime_type.symbol
   end
 
   delegate :manifold?, to: :mesh

spec/jobs/analysis/file_conversion_job_spec.rb

@@ -61,6 +61,6 @@
   end
 
   it "does nothing with an invalid output format" do
-    expect { described_class.perform_now(file.id, :ply) }.to raise_error(UnsupportedFormatError)
+    expect { described_class.perform_now(file.id, :blend) }.to raise_error(UnsupportedFormatError)
   end
 end