Changeset 1631 for trunk/website/scripts/downloads.php

Timestamp:

1/22/2010 12:30:40 AM (3 years ago)

Author:

lowjoel

Message:

• Optimized the selection algorithm for picking builds from the builds table
• If we can't find a build by the given branch and revision, then we should throw an exception. The handling of new builds is now done in the Build::Get function
• Define the Build::BuildExists? function to check whether a build exists/has been created
• Build::InsertBuild? now accepts a path to the revision so it can accept files with the revision as its filename

File:

• trunk/website/scripts/downloads.php (modified) (6 diffs)

trunk/website/scripts/downloads.php

@@ -115 +115 @@
     public function Build($branch, $revision)
     {
-        $query = mysql_query(sprintf('SELECT downloads.DownloadID FROM downloads INNER JOIN builds ON
-            downloads.DownloadID=builds.DownloadID WHERE
-                builds.Branch=\'%s\' AND builds.Revision=%d',
+        $query = mysql_query(sprintf('SELECT DownloadID FROM builds WHERE
+                Branch=\'%s\' AND Revision=%d',
             mysql_real_escape_string($branch), intval($revision)));
         
@@ -123 +122 @@
         if (($row = mysql_fetch_row($query)) === false || !$row[0])
         {
-            $this->ID = Build::InsertBuild($branch, $revision);
+            throw new Exception('Build does not exist');
         }
         else
@@ -150 +149 @@
                     continue;
                 
-                try
+                $pathInfo = pathinfo($revision);
+                $revisionID = intval(substr($pathInfo['filename'], 1));
+                if (Build::BuildExists($branchName, $revisionID))
                 {
-                    $result[$buildName][] = new Build($branchName, intval(substr($revision, 1)));
+                    $result[$buildName][] = new Build($branchName, $revisionID);
                 }
-                catch (Exception $e)
+                else
                 {
+                    $result[$buildName][] = Build::GetBuildFromID(
+                        Build::InsertBuild($branchName, $revisionID,
+                            Build::GetPath($branchName, $revision)));
                 }
             }
@@ -161 +165 @@
         
         return $result;
+    }
+    
+    public static function BuildExists($branch, $revision)
+    {
+        $query = mysql_query(sprintf('SELECT DownloadID FROM builds WHERE
+                Branch=\'%s\' AND Revision=%d',
+            mysql_real_escape_string($branch), intval($revision)));
+        return mysql_num_rows($query) == 1;
     }
     
@@ -192 +204 @@
     }
     
-    private static function InsertBuild($branch, $revision)
+    private static function InsertBuild($branch, $revision, $buildPath)
     {
         //Find the binary that users will get to download.
-        $buildPath = Build::GetPath($branch, $revision);
         $installerPath = null;
         
@@ -220 +231 @@
         else if (is_file($buildPath))
         {
-            $installerPath = sprintf('builds/%s/r%s', $branch, $revision);
+            $installerPath = sprintf('builds/%s/r%s', $branch, basename($buildPath));
         }