Merge lp:~tristan-rivoallan/vanilla-miner/vm-599699 into lp:vanilla-miner

[Tristan Rivoallan]

[Tristan Rivoallan (tristan-rivoallan)]

review: Approve

=== modified file 'lib/task/minerExpandLinksTask.class.php'
--- lib/task/minerExpandLinksTask.class.php	2010-06-29 17:22:22 +0000
+++ lib/task/minerExpandLinksTask.class.php	2010-06-30 17:17:27 +0000
@@ -103,16 +103,37 @@
                             $this->logSection('expand', sprintf('[%d] %s - Updating metadata, marking as available', $response->getStatus(), $link->url));
                         }
 
-                        // Extract meaningful informations from server response
-                        $header = $response->getHeader();
-                        $header = $this->normalizeHeader($header);
-                        $link->mime_type = $this->getMimeType($header);
-
-                        // Mark link as available
-                        $link->availability = 'available';
-
-                        // Save link to database
-                        $link->replace();
+                        // Update link data according to response
+                        $link = $this->updateLink($link, $response);
+                    }
+                    // Try GET when server answers "405 Method Not Allowed"
+                    elseif (405 == $response->getStatus())
+                    {
+                        if ($options['progress'])
+                        {
+                            $this->log(sprintf('[%d] %s', $response->getStatus(), $link->url));
+                        }
+                        else
+                        {
+                            $this->logSection('expand', sprintf('[%d] %s - Received "Method Not Allowed" error code. Trying GET.', $response->getStatus(), $link->url));
+                        }
+
+                        $request->setMethod(HTTP_Request2::METHOD_GET);
+                        $response = $request->send();
+                        if (200 == $response->getStatus())
+                        {
+                            if ($options['progress'])
+                            {
+                                $this->log(sprintf('[%d] %s', $response->getStatus(), $link->url));
+                            }
+                            else
+                            {
+                                $this->logSection('expand', sprintf('[%d] %s - Updating metadata, marking as available', $response->getStatus(), $link->url));
+                            }
+
+                            // Update link data according to response
+                            $link = $this->updateLink($link, $response);
+                        }
                     }
                     else
                     {
@@ -134,7 +155,6 @@
                             );
                         }
                         $link->availability = 'unavailable';
-                        $link->replace();
                     }
                 }
                 catch (HTTP_Request2_Exception $e)
@@ -148,9 +168,11 @@
                         $this->logSection('expand', sprintf('[ERR] Received exception with message "%s" for link "%s" - Marking as unavailable.', $e->getMessage(), $link->url), null, 'ERROR');
                     }
                     $link->availability = 'unavailable';
-                    $link->replace();
                 }
 
+                // Save link to database
+                $link->replace();
+
                 // Update progress bar
                 if ($options['progress'])
                 {
@@ -210,4 +232,25 @@
 
         return $mime_type;
     }
-}
 \ No newline at end of file
+
+    /**
+     * Updates link according to supplied (successful) response
+     *
+     * @param Link                   $link
+     * @param HTTP_Request2_Response $response
+     *
+     * @return Link $link
+     */
+    private function updateLink(Link $link, HTTP_Request2_Response $response)
+    {
+        // Extract meaningful informations from server response
+        $header = $response->getHeader();
+        $header = $this->normalizeHeader($header);
+        $link->mime_type = $this->getMimeType($header);
+
+        // Mark link as available
+        $link->availability = 'available';
+
+        return $link;
+    }
+}