Changeset 572

Timestamp:

07/01/08 09:07:04 (2 months ago)

Author:

mahlon

Message:

• Add more informational goodies with album-art extracted from mp3s.
  
• Have the formupload handler be "resource append" aware.
  
• Alter ThingFish::Daemon#purge_related_resources() to allow for selective deleting.
  
• Add some comments to the metastore intersect_each_tuple() method.
  

Files:

• thingfish/trunk/lib/thingfish/daemon.rb (modified) (1 diff)
• thingfish/trunk/lib/thingfish/metastore.rb (modified) (2 diffs)
• thingfish/trunk/plugins/thingfish-filter-mp3/lib/thingfish/filter/mp3.rb (modified) (3 diffs)
• thingfish/trunk/plugins/thingfish-filter-mp3/spec/thingfish/filter/mp3_spec.rb (modified) (4 diffs)
• thingfish/trunk/plugins/thingfish-handler-formupload/lib/thingfish/handler/formupload.rb (modified) (1 diff)
• thingfish/trunk/plugins/thingfish-handler-formupload/spec/thingfish/handler/formupload_spec.rb (modified) (1 diff)
• thingfish/trunk/spec/thingfish/daemon_spec.rb (modified) (4 diffs)

thingfish/trunk/lib/thingfish/daemon.rb

@@ -258 +258 @@
-    
-    
-
-
-
-
+
+
+
+
+
-        uuids.each do |subuuid|
-            self.log.debug "purging appended resource %s for %s" % [ subuuid, uuid ]

thingfish/trunk/lib/thingfish/metastore.rb

@@ -374 +374 @@
-    ### intersected, and any UUIDs common to all matched tuples are returned.
-    def intersect_each_tuple( hash )
+
+        # Trim nil values out of the hash then make a search pair for each key/value combination.
+        #   { 'format' => ['image/png', 'image/jpeg' ], 'extent' => 3400 }
+        # becomes:
+        #   [ ['format', 'image/png'], ['format', 'image/jpeg'], ['extent', 3400] ]
-        tuples = hash.reject {|k,v| v.nil? }.inject([]) do |ary, pair|
-            key,vals = *pair
@@ -382 +387 @@
-            ary
-        end
-
+
+
+
-        uuids = tuples.inject(nil) do |ary, pair|
-            key, value = *pair

thingfish/trunk/plugins/thingfish-filter-mp3/lib/thingfish/filter/mp3.rb

@@ -108 +108 @@
-                # Append any album images as related resources
-                self.extract_images( id3 ).each do |io, metadata|
+                    metadata[:title] = "Album art for %s - %s" % mp3_metadata.values_at( :mp3_artist, :mp3_title )
-                    request.append_related_resource( body, io, metadata )
-                end
@@ -210 +211 @@
-                blob, mime = img.unpack( APIC_FORMAT ).values_at( 4, 1 )
-                data[ StringIO.new(blob) ] = { 
-
-
-title 
+  
+  
+relation
-                }
-            end
@@ -222 +223 @@
-                mime = MIMETYPE_MAP[ ".#{type.downcase}" ] or next
-                data[ StringIO.new(blob) ] = {
-
-
-title 
+  
+  
+relation
-                }
-            end

thingfish/trunk/plugins/thingfish-filter-mp3/spec/thingfish/filter/mp3_spec.rb

@@ -211 +211 @@
-                :format => 'image/jpeg',
-                :extent => 7369,
-
+
+
-            }
-
@@ -229 +230 @@
-                :format => 'image/jpeg',
-                :extent => 7369,
-
+
+
-            }
-            png_art_hash = { 
-                :format => 'image/png',
-                :extent => 18031,
-
+
+
-            }
-
@@ -256 +259 @@
-                :format => 'image/jpeg',
-                :extent => 7369,
-
+
+
-            }
-
@@ -274 +278 @@
-                :format => 'image/jpeg',
-                :extent => 7369,
-
+
+
-            }
-            png_art_hash = { 
-                :format => 'image/png',
-                :extent => 18031,
-
+
+
-            }
-

thingfish/trunk/plugins/thingfish-handler-formupload/lib/thingfish/handler/formupload.rb

@@ -122 +122 @@
-
-        files = []
-
+
+
+
-            uuid = self.daemon.store_resource( body, metadata )
-            metadata[:uuid] = uuid
+
+            # Store any related resources, linked to the primary
+            self.daemon.store_related_resources( body, uuid, request )
+
-            files << [ uuid, metadata ]
-        end

thingfish/trunk/plugins/thingfish-handler-formupload/spec/thingfish/handler/formupload_spec.rb

@@ -177 +177 @@
-            and_return( TEST_UUID )
-
+        mockdaemon.should_receive( :store_related_resources ).
+            with( upload1, TEST_UUID, @request )
+
-        @response.should_receive( :status= ).with( HTTP::OK )
-        @response.should_receive( :body= ).with( [ [TEST_UUID, metadata] ] )

thingfish/trunk/spec/thingfish/daemon_spec.rb

@@ -51 +51 @@
-    include ThingFish::SpecHelpers
-    
-    before(:all) do
-        setup_logging( :fatal )
-    end
-    
-
-    before( :each ) do
-        # Have to set up logging each time, 'cause Daemon alters it in some examples
@@ -720 +715 @@
-
-    
-
+specific 
-                filestore = mock( "filestore", :null_object => true )
-                @daemon.instance_variable_set( :@filestore, filestore )
@@ -728 +723 @@
-                search_criteria = {
-                    :related_to => TEST_UUID,
-appended
+thumbnail
-                }
-                metastore.should_receive( :find_by_exact_properties ).
@@ -739 +734 @@
-                filestore.should_receive( :delete ).with( TEST_UUID3 )
-                
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            it "doesn't propagate errors that occur while storing a related resource" do
-                related_body = mock( "related body IO" )