[myexperiment-hackers] [2292] trunk: fix for setting workflow content and metadata extraction

[noreply]

Revision

2292

Author

dgc

Date

2009-10-30 08:34:49 -0400 (Fri, 30 Oct 2009)

Log Message

fix for setting workflow content and metadata extraction

Modified Paths

• trunk/app/controllers/api_controller.rb
• trunk/app/models/workflow.rb
• trunk/lib/rest.rb

Diff

Modified: trunk/app/controllers/api_controller.rb (2291 => 2292)

--- trunk/app/controllers/api_controller.rb	2009-10-30 12:26:42 UTC (rev 2291)
+++ trunk/app/controllers/api_controller.rb	2009-10-30 12:34:49 UTC (rev 2292)
@@ -45,16 +45,16 @@
 
     case rules['Allow id']
       when 'required'
-        return rest_response(400, :reason => "Must specify an id") if query['id'].nil?
+        return rest_response(400, :reason => "Must specify an id") if request.query_parameters['id'].nil?
       when 'no'
-        return rest_response(400, :reason => "Cannot specify an id") if query['id']
+        return rest_response(400, :reason => "Cannot specify an id") if request.query_parameters['id']
     end
 
     case rules['Allow version']
       when 'required'
-        return rest_response(400, :reason => "Must specify a version") if query['version'].nil?
+        return rest_response(400, :reason => "Must specify a version") if request.query_parameters['version'].nil?
       when 'no'
-        return rest_response(400, :reason => "Cannot specify a version") if query['version']
+        return rest_response(400, :reason => "Cannot specify a version") if request.query_parameters['version']
     end
 
     # key check - if an oauth access token is in use, this means that we must

Modified: trunk/app/models/workflow.rb (2291 => 2292)

--- trunk/app/models/workflow.rb	2009-10-30 12:26:42 UTC (rev 2291)
+++ trunk/app/models/workflow.rb	2009-10-30 12:34:49 UTC (rev 2292)
@@ -32,7 +32,7 @@
                       end }
 
   before_validation :check_unique_name
-  before_validation :extract_metadata
+  before_validation :apply_extracted_metadata
 
   acts_as_site_entity :owner_text => 'Original Uploader'
 
@@ -137,29 +137,54 @@
     end
   end
   
-  # This method is called before save and attempts to pull out metadata if it
-  # hasn't been set
-  def extract_metadata
+  def self.extract_metadata(opts = {})
 
-    if !content_blob.nil? && processor_class
+    if opts[:type]
+      content_type = ContentType.find_by_title(opts[:type])
+    elsif opts[:mime_type]
+      content_type = ContentType.find_by_mime_type(opts[:mime_type])
+    end
 
-      do_image = true if image.nil? && processor_class.can_generate_preview_image?
-      do_svg   = true if svg.nil?   && processor_class.can_generate_preview_svg?
-      do_title = true if title.nil?
-      do_desc  = true if body.nil?
-      
-      if do_image || do_svg || do_title || do_desc
+    if content_type
+      proc_class = WorkflowTypesHandler.processor_class_for_type_display_name(content_type.title)
+    end
 
-        processor = processor_class.new(content_blob.data)
+    metadata = {}
 
-        self.image = processor.get_preview_image if do_image
-        self.svg   = processor.get_preview_svg   if do_svg
-        self.title = processor.get_title         if do_title
-        self.body  = processor.get_description   if do_desc
+    if proc_class
+
+      processor = proc_class.new(opts[:data])
+
+      metadata["title"]       = processor.get_title
+      metadata["description"] = processor.get_description
+
+      if proc_class.can_generate_preview_image?
+        metadata["image"] = processor.get_preview_image
       end
+
+      if proc_class.can_generate_preview_svg?
+        metadata["svg"] = processor.get_preview_svg
+      end
     end
+
+    metadata
   end
 
+  # This method is called before save and attempts to pull out metadata if it
+  # hasn't been set
+
+  def apply_extracted_metadata
+
+    return if content_blob.nil? or content_type.nil?
+
+    metadata = Workflow.extract_metadata(:type => content_type.title, :data ="" content_blob.data)
+
+    self.title = metadata["title"]       if metadata["title"]       and title.nil?
+    self.body  = metadata["description"] if metadata["description"] and body.nil?
+    self.image = metadata["image"]       if metadata["image"]       and image.nil?
+    self.svg   = metadata["svg"]         if metadata["svg"]         and svg.nil?
+  end
+
   def processor_class
     if self.content_type
         @processor_class ||= WorkflowTypesHandler.processor_class_for_type_display_name(self.content_type.title)

Modified: trunk/lib/rest.rb (2291 => 2292)

--- trunk/lib/rest.rb	2009-10-30 12:26:42 UTC (rev 2291)
+++ trunk/lib/rest.rb	2009-10-30 12:34:49 UTC (rev 2292)
@@ -911,11 +911,16 @@
       end
     end
 
-    ob.content_blob = ContentBlob.new(:data ="" content) if content
+    ob.content_blob_id = ContentBlob.create(:data ="" content).id if content
 
     # Handle the preview and svg images.  If there's a preview supplied, use
     # it.  Otherwise auto-generate one if we can.
 
+    if preview.nil? and content
+      metadata = Workflow.extract_metadata(:type => ob.content_type.title, :data ="" content)
+      preview = metadata["image"].read if metadata["image"]
+    end
+
     if preview
 
       image = Tempfile.new('image')