Merge remote-tracking branch 'github/sbuild' into sbuild

debomatic-webui/lib/app.coffee

@@ -7,6 +7,7 @@ io = require("socket.io")(server)
 
 serve_static = require("serve-static")
 serve_index = require("serve-index")
+compression = require("compression")
 errorhandler = require("errorhandler")
 
 routes = require("../routes")
@@ -24,6 +25,9 @@ if env is "development"
 else
     app.use(errorhandler())
 
+# use compression by default
+app.use(compression())
+
 # the views
 app.set("views", __dirname + "/../views")
 app.set("view engine", "ejs")
@@ -66,6 +70,15 @@ if config.routes.debomatic
         res.set('Content-Type', 'text/plain')
         next()
 
+    # always download log files and some source files, like .dsc and .changes ones
+    app.all config.routes.debomatic + '/:distribution/pool/:package/:file', (req, res, next) ->
+        type = utils.file_type(req.params.file)
+        ext = req.params.file.split('.').pop()
+        if type is "log" or ext in ["changes", "dsc"]
+            res.set('Content-Type', 'text/plain')
+            res.set('Content-Disposition', 'attachment; filename=' + req.params.file)
+        next()
+
     app.use(config.routes.debomatic, serve_static(config.debomatic.path))
     app.use(config.routes.debomatic, serve_index(config.debomatic.path,
                                                  {view: "details", icons: true}))
@@ -73,9 +86,6 @@ if config.routes.debomatic
 # serve stylesheet-javascript
 app.use(serve_static(__dirname + "/../public"))
 
-# serve dsc files as octet-stream
-serve_static.mime.define("application/octet-stream": ["dsc"])
-
 # Listening
 server.listen config.port, config.host, null, (err) ->
 

debomatic-webui/lib/client.coffee

@@ -20,9 +20,10 @@ get_files_list_from_package = (data, callback) ->
                                      config.routes.debomatic)
             file.orig_name = f
             file.name = f.split("_")[0]
-            if file.extension in ["deb", "ddeb", "udeb"]
+            type = utils.file_type(f)
+            if type is "deb"
                 data.package.debs.push(file)
-            else if file.extension in ["changes", "dsc"] or f.indexOf('.tar.') > 0 or f.indexOf('.diff.') > 0
+            else if type is "source"
                 file.name = f.replace(data.package.orig_name + ".", "")
                 if file.extension is "changes"
                     file.name = f.split('_').pop()

debomatic-webui/lib/config.coffee

@@ -37,8 +37,8 @@ config.debomatic.jsonfile = "/var/log/debomatic-json.log"
 Web template configuration
 Title and description for the header
 ###
-config.web.debomatic.architecture = "amd64"
-config.web.title = "Deb-o-Matic " + config.web.debomatic.architecture
+config.web.debomatic.architecture = "system"  # or amd64, i386, ...
+config.web.title = "Deb-o-Matic"
 
 ###
 Admin email and name to show in the home page.
@@ -164,6 +164,12 @@ try
                                crypto.createHash("sha256")
                                      .update(config.debomatic.path)
                                      .digest("hex")
+
+    if config.web.debomatic.architecture == "system"
+        check = "dpkg-architecture -qDEB_BUILD_ARCH"
+        require("child_process").exec check, (error, stdout, stderr) ->
+            config.web.debomatic.architecture = stdout.trim()
+
     module.exports = config
 
 catch err

debomatic-webui/lib/utils.coffee

@@ -117,6 +117,14 @@ errors_handler = (from, err, socket) ->
     socket.emit config.events.error, msg if socket
     return
 
+file_type = (filename) ->
+    extension = filename.split(".").pop()
+    if extension in ["deb", "ddeb", "udeb"]
+        return "deb"
+    if extension in ["changes", "dsc"] or filename.indexOf('.tar.') > 0 or filename.indexOf('.diff.') > 0
+        return "source"
+    return "log"
+
 Tail::watchEvent = (e) ->
     _this = this
     if e is "change"
@@ -152,5 +160,6 @@ module.exports.get_file_path = get_file_path
 module.exports.get_files_list = get_files_list
 module.exports.watch_path_onsocket = watch_path_onsocket
 module.exports.errors_handler = errors_handler
+module.exports.file_type = file_type
 module.exports.arrayEqual = arrayEqual
 module.exports.Tail = Tail

debomatic-webui/package.json

@@ -8,6 +8,7 @@
         "serve-index": "*",
         "serve-static": "*",
         "errorhandler ": "*",
+        "compression": "*",
         "ejs": "1.*",
         "socket.io": "1.2.*",
         "tail": "*",

debomatic-webui/public/javascripts/page_distribution.js

@@ -353,7 +353,7 @@ function Page_Distrubion(socket) {
             if ($tags.length > 0)
                 $size.insertBefore($tags);
             else
-                $file.append($size);
+                $file.find("a").append($size);
         }
     };
 

debomatic-webui/public/javascripts/page_generic.js

@@ -127,7 +127,7 @@ function Page_Generic() {
     };
 
     this.preferences = function () {
-        var bootstrap_theme_css = '/external_libs/bootstrap-3.2.0/css/bootstrap-theme.min.css';
+        var bootstrap_theme_css = '/external_libs/bootstrap-3.3.2/css/bootstrap-theme.min.css';
         if (config.preferences.glossy_theme) {
             if ($('head').find('link[href="' + bootstrap_theme_css + '"]').length === 0)
                 $('head').append('<link rel="stylesheet" href="' + bootstrap_theme_css + '">');

debomatic-webui/scripts/install/download_external_libs.sh

@@ -10,21 +10,21 @@ get_github() {
   ARCHIVE=v${VERSION}.zip
   URL="https://github.com/${USER}/${NAME}/archive/${ARCHIVE}"
   LIB_NAME="${NAME}-${VERSION}"
-  if [ -d ${EXT_LIBS_DIR}/${LIB_NAME} ] ; then return ; fi
+  if [ -d "${EXT_LIBS_DIR}/${LIB_NAME}" ] ; then return ; fi
   echo "Downloading ${NAME} ${VERSION} ..."
-  curl -s -O -L ${URL} && \
-  unzip -q ${ARCHIVE} && rm ${ARCHIVE}
-  if [ "$DIST" != "" ] ; then
-    mv ${LIB_NAME} tmp
-    mv tmp/${DIST} ${LIB_NAME}
+  curl -s -O -L "${URL}" && \
+  unzip -q "${ARCHIVE}" && rm "${ARCHIVE}"
+  if [ "${DIST}" != "" ] ; then
+    mv "${LIB_NAME}" tmp
+    mv "tmp/${DIST}" "${LIB_NAME}"
     rm -r tmp
   fi
 }
 
 get_bootstrap() {
-  VERSION="3.2.0"
+  VERSION="3.3.2"
   NAME="bootstrap-${VERSION}-dist"
-  if [ -d ${EXT_LIBS_DIR}/${NAME} ] ; then return ; fi
+  if [ -d "${EXT_LIBS_DIR}/${NAME}" ] ; then return ; fi
   ARCHIVE=${NAME}.zip
   URL="https://github.com/twbs/bootstrap/releases/download/v${VERSION}/${ARCHIVE}"
   echo "Downloading bootstrap ${VERSION} ..."
@@ -35,7 +35,7 @@ get_bootstrap() {
 get_jquery() {
   VERSION="1.11.0"
   DIR_JQUERY="jquery"
-  if [ -d ${EXT_LIBS_DIR}/${DIR_JQUERY} ] ; then return ; fi
+  if [ -d "${EXT_LIBS_DIR}/${DIR_JQUERY}" ] ; then return ; fi
   mkdir ${DIR_JQUERY}
   cd ${DIR_JQUERY}
   URL="http://code.jquery.com/jquery-${VERSION}.min.js"
@@ -45,30 +45,32 @@ get_jquery() {
 }
 
 get_tablesorter() {
+  VERSION="2.17.8"
   DIR_TABLESORTER="tablesorter"
-  if [ -d ${EXT_LIBS_DIR}/${DIR_TABLESORTER} ] ; then return ; fi
+  if [ -d "${EXT_LIBS_DIR}/${DIR_TABLESORTER}" ] ; then return ; fi
   mkdir ${DIR_TABLESORTER}
   cd ${DIR_TABLESORTER}
   echo "Downloading tablesorter ..."
-  curl -s -O -L "http://mottie.github.io/tablesorter/js/jquery.tablesorter.min.js"
-  curl -s -O -L "http://mottie.github.io/tablesorter/js/jquery.tablesorter.widgets.min.js"
-  curl -s -O -L "http://mottie.github.io/tablesorter/css/theme.bootstrap.css"
+  BASE="https://raw.githubusercontent.com/Mottie/tablesorter/v${VERSION}"
+  curl -s -O -L "${BASE}/js/jquery.tablesorter.min.js"
+  curl -s -O -L "${BASE}/js/jquery.tablesorter.widgets.min.js"
+  curl -s -O -L "${BASE}/css/theme.bootstrap.css"
   cd ..
 }
 
-if [ ! -d ${EXT_LIBS_DIR} ] ; then mkdir -p ${EXT_LIBS_DIR} ; fi
+if [ ! -d "${EXT_LIBS_DIR}" ] ; then mkdir -p "${EXT_LIBS_DIR}" ; fi
 
-TMP_DIR="`mktemp -d`"
-cd ${TMP_DIR}
+TMP_DIR="$(mktemp -d)"
+cd "${TMP_DIR}"
 
 get_jquery
 get_tablesorter
 
 # get boostrap
-get_github "twbs" "bootstrap" "3.2.0" "dist"
+get_github "twbs" "bootstrap" "3.3.2" "dist"
 
 # get chartist
 get_github "gionkunz" "chartist-js" "0.7.2" "dist"
 
-if [ "`ls -1`" != "" ] ; then mv * ${EXT_LIBS_DIR} ; fi
-cd && rm -r ${TMP_DIR}
+if [ "$(ls -1)" != "" ] ; then mv ./* "${EXT_LIBS_DIR}" ; fi
+cd && rm -r "${TMP_DIR}"

debomatic-webui/views/footer.ejs

@@ -18,7 +18,7 @@
     <script src="/external_libs/jquery/jquery-1.11.0.min.js"></script>
     <script src="/external_libs/tablesorter/jquery.tablesorter.min.js"></script>
     <script src="/external_libs/tablesorter/jquery.tablesorter.widgets.min.js"></script>
-    <script src="/external_libs/bootstrap-3.2.0/js/bootstrap.min.js"></script>
+    <script src="/external_libs/bootstrap-3.3.2/js/bootstrap.min.js"></script>
     <script src="/external_libs/chartist-js-0.7.2/chartist.min.js"></script>
 
     <script>

debomatic-webui/views/header.ejs

@@ -2,10 +2,10 @@
 <html lang="en">
   <head>
     <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.png" />
-    <title><%= web.title %></title>
+    <title><%= web.title %> <%= web.debomatic.architecture %></title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="/external_libs/bootstrap-3.2.0/css/bootstrap.min.css">
-    <link rel="stylesheet" href="/external_libs/bootstrap-3.2.0/css/bootstrap-theme.min.css">
+    <link rel="stylesheet" href="/external_libs/bootstrap-3.3.2/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/external_libs/bootstrap-3.3.2/css/bootstrap-theme.min.css">
     <link rel="stylesheet" href="/external_libs/chartist-js-0.7.2/chartist.min.css">
     <link rel="stylesheet" href="/external_libs/tablesorter/theme.bootstrap.css">
     <link rel="stylesheet" href="/stylesheets/style.css?<%= version %>">