Merge lp:~stevanr/linaro-android-frontend/bug-1071153 into lp:linaro-android-frontend

[Stevan Radaković]

Use snapshots API call instead of checking each file individually and using JS textile.

[Georgy Redkozubov (gesha)]

Good to go

review: Approve

=== modified file 'android_build/frontend/api.py'
--- android_build/frontend/api.py	2012-10-19 14:18:11 +0000
+++ android_build/frontend/api.py	2012-10-25 13:59:23 +0000
@@ -313,6 +313,34 @@
     else:
         return HttpResponse(response.read())
 
+def get_textile_files_request(request):
+    """Give Web UI a proxy to fetch remote textile file data from snapshots."""
+
+    path = ""
+    for thing in request.GET.getlist("path"):
+        path = thing
+
+    requested_view = 'get-textile-files'
+    url = settings.SNAPSHOTS_URL + requested_view + '?path=' + path
+
+    try:
+        response = urllib2.urlopen(url)
+    except urllib2.HTTPError, e:
+        message = "Server error: %d" % e.code
+        resp = HttpResponse(message)
+        resp.status_code = e.code
+        return resp
+    except urllib2.URLError, e:
+        message = "We failed to reach a server."
+
+        if isinstance(e.reason, str):
+            message += " Reason %s" % e.reason
+
+        return HttpResponse(message)
+    else:
+        return HttpResponse(response.read())
+
+
 def test_remote_dir_exists(request):
     """Give Web UI the ability to test where a build is stored.
 

=== modified file 'android_build/settings.py'
--- android_build/settings.py	2012-10-19 14:00:38 +0000
+++ android_build/settings.py	2012-10-25 13:59:23 +0000
@@ -106,3 +106,5 @@
 }
 
 USE_OWN_COMBO=False
+
+SNAPSHOTS_URL = "https://snapshots.linaro.org/"

=== modified file 'android_build/urls.py'
--- android_build/urls.py	2012-10-19 14:00:38 +0000
+++ android_build/urls.py	2012-10-25 13:59:23 +0000
@@ -28,6 +28,7 @@
     (r'^api/new$', 'android_build.frontend.api.new'),
     (r'^api/set-daily$', 'android_build.frontend.api.set_daily'),
     (r'^api/proxy-remote-file$', 'android_build.frontend.api.proxy_remote_file'),
+    (r'^api/get-textile-files-request$', 'android_build.frontend.api.get_textile_files_request'),
     (r'^api/test-dir-exists$', 'android_build.frontend.api.test_remote_dir_exists'),
 
     (r'^openid/', include('django_openid_auth.urls')),

=== modified file 'static/buildDetails.js'
--- static/buildDetails.js	2012-10-24 11:59:25 +0000
+++ static/buildDetails.js	2012-10-25 13:59:23 +0000
@@ -22,23 +22,6 @@
     var buildNumber = history.get('build');
     var fetchLatest = (buildNumber === undefined);
 
-    var howto_paths = [
-        "HOWTO_releasenotes.txt",
-        "HOWTO_install.txt",
-        "HOWTO_getsourceandbuild.txt",
-        "HOWTO_flashfirmware.txt",
-        "HOWTO_rtsm.txt"]
-
-    // Mapping for howto_paths tab titles
-    var howto_titles = [
-        "Release Notes",
-        "Binary Image Installation",
-        "Building From Source",
-        "Firmware Update",
-        "RTSM"]
-
-
-
 
     var jobData = 'actions[parameters[name,value]],timestamp,duration,artifacts[displayPath,fileName,relativePath],result,number';
 
@@ -258,7 +241,8 @@
            to where new builds should be.
          */
         var downloadUrl = 'http://snapshots.linaro.org/android/' + rawBuildName + '/' + results.number.toString() + '/';
-          handleRenderedFiles(downloadUrl);
+          handleRenderedFiles('android/' + rawBuildName + '/' +
+                              results.number.toString());
 
 
         Y.one('#all-output a').setAttribute('href', downloadUrl);
@@ -422,25 +406,23 @@
 
     refreshFromScratch();
 
-      function handleRenderedFiles(downloadUrl) {
+      function handleRenderedFiles(pathUrl) {
 
           var rendered_files = new Object();
           var howto_index = 0;
 
-          for (var howto_index in howto_paths) {
-              $.ajax({
-                  url: '/api/proxy-remote-file?url=' + downloadUrl +
-                      howto_paths[howto_index],
-                  success: function(data) {
-                      if (data != 'Invalid argument') {
-                          rendered_files[howto_titles[howto_index]] =
-                              convert_textile(data);
+          $.ajax({
+              url: '/api/get-textile-files-request?path=' + pathUrl,
+              success: function(data) {
+                  if (data != 'null') {
+                      data = $.parseJSON(data);
+                      for (var key in data) {
+                          rendered_files[key] = data[key];
                       }
-                      howto_index++;
-                  },
-                  async: false,
-              });
-          }
+                  }
+              },
+              async: false,
+          });
 
           refresh_tabs(rendered_files);
       }