add more package details, code clean

3 files changed, 51 insertions, 15 deletions

diff --git a/public/js/aports.api.js b/public/js/aports.api.js
index 2da8e08..c0f996c 100644
--- a/public/js/aports.api.js
+++ b/public/js/aports.api.js
@@ -5,12 +5,12 @@ config.api.baseurl = 'http://api.alpinelinux.org/index.php?_url='
 config.api.resources = ['packages', 'contents', 'categories', 
                         'origins', 'flagged', 'depends',
                         'install_if', 'provides', 'maintainer'];
-package = {};
-package.tblHdrs = ['Package', 'Version', 'Project', 'License', 'Branch',
+packages = {};
+packages.tblHdrs = ['Package', 'Version', 'Project', 'License', 'Branch',
                    'Repository', 'Architecture', 'Maintainer', 'Build date'];
-package.fields = ['name', 'version', 'url', 'license', 'branch',
+packages.fields = ['name', 'version', 'url', 'license', 'branch',
                    'repo', 'arch', 'maintainer', 'build_time'];
-package.class = 'packages';
+packages.class = 'packages';
 
 meta = {};
 meta.stats = ['count', 'total-pages', 'per-page', 'total-count',
@@ -56,7 +56,7 @@ temp = {}
           var u_ = []; //['packages']
           var v_ = { 'name':  data[field], 'branch': data['branch'],
                      'arch': data['arch'], 'repo': data['repo'] };
-          var url_ = app.baseurl.replace(/packages/, 'package') + '?' + buildReq(u_, v_, package.fields);
+          var url_ = app.baseurl.replace(/packages/, 'package') + '?' + buildReq(u_, v_, packages.fields);
           return makeElm( 'a', data[field], {'title':data['description'], 'href':url_} );
         }
         if('version' == field) {
@@ -71,7 +71,7 @@ temp = {}
           var u_ = [''];
           var v_ = { 'name':  data[field], 'branch': data['branch'],
                      'arch': data['arch'], 'repo': data['repo'] };
-          var url_ = app.baseurl + '?' + buildReq(u_, v_, package.fields);
+          var url_ = app.baseurl + '?' + buildReq(u_, v_, packages.fields);
           return makeElm( 'a', data[field], {'title':'', 'href':url_} )
         }
       }
diff --git a/public/js/aports.package.js b/public/js/aports.package.js
index f1007e4..79cc8c4 100644
--- a/public/js/aports.package.js
+++ b/public/js/aports.package.js
@@ -1,12 +1,48 @@
 
    getPackage = function(data) {
        //----- data.data -----
-       var d = data.data[0];
-       var items = []; var f = [];
+       var d = data.data[0]; var d_ = d['attributes'];
+       var name = d['attributes']['name'];
+       var version = d['attributes']['version'];
+       var repo = d['attributes']['repo'];
+       var arch = d['attributes']['arch'];
+       var branch = d['attributes']['branch'];
+       var items = [];
+       
+       var gr = (makeElm('a', 'Git repository', {
+         'href': 'http://git.alpinelinux.org/cgit/aports/tree/'+repo+'/'+name+'?h=master'
+       }));
+       d['attributes']['git_repository'] = gr;
+       
+       var bl = (makeElm('a', 'Bluid log', {
+         'href': 'http://build.alpinelinux.org/buildlogs/build-'+branch+'-'+arch+'/'+repo+'/'+name+'/'+name+'-'+version+'.log'
+       }));
+       d['attributes']['build_log'] = bl;
+       
+       var ct = (makeElm('a', 'Contents of package', {
+         'href': 'http://pkgs.alpinelinux.org/contents?branch='+branch+'&name='+name+'&arch='+arch+'&repo='+repo+''
+       }));
+       d['attributes']['contents'] = ct;
+       
        $.each( d['attributes'], function( key, val ) {
+         key_ = key;
+         if ('name' == key_) { key_ = 'Package' };
+         if ('url' == key_) { key_ = 'Project' };
+         if ('repo' == key_) { key_ = 'Repository' };
+         if ('arch' == key_) { key_ = 'Architecture' };
+         if ('checksum' == key_) { key = '' };
+         if ('fid' == key_) { key = '' };
+         if ('commit' == key_) {
+             d['attributes']['commit'] = (makeElm('a', val, {
+               'href':'http://git.alpinelinux.org/cgit/aports/commit/?id='+val
+             }));
+         };
+
          items.push('<tr>');
-         items.push(makeElm('th', titleCase(key).replace(/\_/, ' '), {'class': 'text-nowrap'}) );
-         items.push(makeElm('td', fmtData(d['attributes'], key, 'data'), {}) );
+         if(key !== '') {
+             items.push(makeElm('th', titleCase(key_).replace(/\_/, ' '), {'class': 'text-nowrap'}) );
+             items.push(makeElm('td', fmtData(d['attributes'], key, 'data'), {}) );
+         }
          items.push('</tr>');
        });
        var tbl = "\n" + '' + "\n" + items.join( "\n" );
@@ -16,7 +52,7 @@
           //"class": "table table-striped table-bordered table-condensed",
           html: tbl
        }).appendTo( "body .container" );
-   }
+   };
 
 
    _getPackage = function(url) {
@@ -24,9 +60,9 @@
         var q = p.getQueryarray();
         if( ! q['name'] ) { $('<span>no data</span>').appendTo( "body .container" ); return; }
         asyncReq(url, 'callback', getPackage);
-    }
+    };
 
-    app.query = (app.query) ? '&'+app.query : ''
+    app.query = (app.query) ? '&'+app.query : '';
     url = config.api.baseurl+''+app.resource+'&'+app.query;
     _getPackage(url);
 
diff --git a/public/js/aports.packages.js b/public/js/aports.packages.js
index 23e821d..a703836 100644
--- a/public/js/aports.packages.js
+++ b/public/js/aports.packages.js
@@ -3,9 +3,9 @@
     get_packages = function(data) {
        //----- data.data -----
        var items = [];
-       var h = getTblRow('', package.tblHdrs, 'data', 'th', 'tr');
+       var h = getTblRow('', packages.tblHdrs, 'data', 'th', 'tr');
        $.each( data.data, function( key, val ) {
-         items.push( getTblRow(val['attributes'], package.fields, 'data', 'td', 'tr') );
+         items.push( getTblRow(val['attributes'], packages.fields, 'data', 'td', 'tr') );
        });
        var tbl = "\n" + h + "\n" + items.join( "\n" );
        $( "<table/>", {