Merge branch 'master' of github.com:nko/chaosscript

html.js

@@ -91,8 +91,6 @@ module.exports = {
         return fList;
     },
     filemenuFor: function( fileData ) {
-        if (fileData['kind'] == 'unknown')
-            return '';
         var M = module.exports;
         var method = 'show'+fileData['kind'];
         var r = '';
@@ -105,9 +103,10 @@ module.exports = {
             else
                 mime = ", 'video/divx'";
         }
-        r += M.tag('a',{href:'#',
-                        onclick:'return '+method+"(this, '/"+escape(fileData['path'])+"'"+mime+");",
-                        'class':'viewmovie'},'View');
+	if (fileData.kind !== 'unknown')
+            r += M.tag('a',{href:'#',
+                            onclick:'return '+method+"(this, '/"+escape(fileData['path'])+"'"+mime+");",
+                            'class':'viewmovie'},'View');
         r += M.tag('a',{href:'/'+fileData['path']},'Download');
         return M.tag('div', {'class':'filemenu'}, r);
     }

mime.js

@@ -15,8 +15,12 @@ var types = {
     mp2: 'video/mpeg',
     avi: 'video/x-msvideo',
     wmv: 'video/x-ms-wmv',
+    wma: 'audio/x-ms-wma',
+    aac: 'audio/aac',
+    '3gp': 'audio/3gpp',
     mov: 'video/quicktime',
     mp4: 'video/mp4',
+    m4v: 'video/mp4',
     mkv: 'video/x-matroska',
     mks: 'video/x-matroska',
     mka: 'audio/x-matroska',
@@ -27,7 +31,7 @@ var types = {
 
 module.exports = {
     fileType: function(path) {
-	var ext = path.split('/').pop().split('.').pop();
-	return types[ext] || 'binary/octet-stream';
+        var ext = path.split('/').pop().split('.').pop();
+        return types[ext] || 'binary/octet-stream';
     }
 };

model.js

@@ -15,14 +15,25 @@ var FiletypeMapping = { mkv:'Video',
                         mov:'Video',
                         mks:'Video',
                         asf:'Video',
+                        svg:'Text',  // iframe ;-)
                         nfo:'Text',
                         js:'Text',
                         css:'Text',
                         txt:'Text',
                         jpg:'Image',
                         jpeg:'Image',
                         bmp:'Image',
-                        png:'Image'};
+                        png:'Image',
+                        ogg:'Audio',
+                        mp3:'Audio',
+                        wav:'Audio',
+                        flac:'Audio',
+                        wma:'Audio',
+                        '3gp':'Audio',
+                        aac:'Audio',
+                        wma:'Audio',
+                        flac:'Audio',
+                        mka:'Audio'};
 redis.select(1);
 
 module.exports = {

public/js/application.js

@@ -91,6 +91,17 @@ function showImage( ele, path ) {
 }
 
 
+function showAudio( ele, path ) {
+    path = unescape(path);
+    return showPreview( ele, '<div class="preview"><audio controls><source src="'+path+'"></audio></div>' );
+}
+
+/*function showunknown( ele, path ) {
+    path = unescape(path);
+    return showPreview( ele, '<div class="preview"><input value="'+path+'" size="40" readonly></div>' );    
+}
+*/
+
 function showPreview( ele, content ) {
     $('.preview').remove();
     if ($(ele).hasClass('active'))

public/main.css

@@ -52,6 +52,7 @@ a img {
   width:410px;
   padding: 25px;
   padding-top:20px;
+  margin-bottom: 2em;
   border:17px solid #9BB0C9;
   font-size:15pt;
   border-radius: 18pt 18pt;
@@ -229,13 +230,13 @@ pre {
 }
 
 ul.torrents {
-    list-style-type: none;
+    list-style-type: square;
+    list-style-image: url('/img/bitsuckr.png');
     padding: 0;
     padding-left: -16px;
     margin: 1em;
+    margin-left: 2em;
 }
-ul.torrents li:before {
-    content: url('/img/bitsuckr.png');
-    padding: 2px 1px;
-    margin-left: -16px;
+ul.torrents li a {
+    padding: 0;
 }

web.js

@@ -213,7 +213,6 @@ function app(app) {
                 webStats.root++;
                 var torrentItemString = '';
                 recommendations.forEach(function(r) {
-                                            console.log(r);
                                             torrentItemString += Html.tag('li',[], Html.tag('a', {href:'/'+r.infoHex + '.html'},r.name));
                                         });
                 res.writeHead(200, {});
@@ -227,7 +226,6 @@ function app(app) {
                                           res.end('Not found');
                                       } else if (fileinfo) {
                                           var files = Model.parseTreeByFiles(fileinfo.files, req.params.infoHex);
-                                          console.log(files);
                                           res.writeHead(200, {});
                                           res.write(Html.show(files));
                                           res.end();