Merge pull request #4 from acidhax/feature/poop

Feature/refactor
matbee-eth · Dec 11, 2015 · f1ba232 · f1ba232
2 parents 6dd6bd0 + db7b788
commit f1ba232
Show file tree

Hide file tree

Showing 19 changed files with 630 additions and 161 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,5 @@
-node_modules/
+node_modules/
+build
+dist/
+.DS_Store
+bin/ffmpeg
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -0,0 +1,161 @@
+var electron = require('electron-prebuilt');
+var packagejson = require('./package.json');
+var tail = process.platform;
+if (process.platform == 'darwin') {
+    tail += "-x64";
+} else {
+    tail += "-ia32"
+}
+module.exports = function(grunt) {
+    require('load-grunt-tasks')(grunt);
+
+    var APP_NAME = "audio-cast";
+    var APP_VERSION = packagejson.version;
+
+    grunt.initConfig({
+        copy: {
+            dev: {
+                files: [{
+                    expand: true,
+                    cwd: '.',
+                    src: ['package.json'],
+                    dest: 'build/'
+                }, {
+                    cwd: 'src/',
+                    expand: true,
+                    src: ['**/*.png'],
+                    dest: 'build'
+                }, {
+                    expand: true,
+                    cwd: 'bin/',
+                    src: ['**/*'],
+                    dest: 'build/resources/bin/'
+                }]
+            },
+            depsWindows: {
+                files: [{
+                    expand: true,
+                    cwd: 'bin/',
+                    src: ['**/*'],
+                    dest: 'dist/' + APP_NAME + '-'+tail+'/resources/bin/'
+                }]
+            },
+            node_modules: {
+                files: [{
+                    cwd: 'node_modules/',
+                    src: Object.keys(packagejson.dependencies).map(function(dep) {
+                        return dep + '/**/*';
+                    }),
+                    dest: 'build/node_modules/',
+                    expand: true
+                }]
+            },
+            release: {
+                files: [{
+                    cwd: 'node_modules/',
+                    src: Object.keys(packagejson.dependencies).map(function(dep) {
+                        return dep + '/**/*';
+                    }),
+                    dest: 'dist/' + APP_NAME + '-'+tail+'/node_modules/',
+                    expand: true
+                }, {
+                    expand: true,
+                    cwd: '.',
+                    src: ['package.json'],
+                    dest: 'dist/' + APP_NAME + '-'+tail+'/',
+                }, {
+                    cwd: 'src/',
+                    expand: true,
+                    src: ['*.png'],
+                    dest: 'dist/' + APP_NAME + '-'+tail+'/',
+                }]
+            }
+        },
+        babel: {
+            options: {
+                plugins: ['transform-minify-booleans', 'transform-property-literals', 'transform-simplify-comparison-operators', 'transform-merge-sibling-variables'],
+                presets: ['es2015'],
+                compact: false,
+                comments: false
+            },
+            build: {
+                files: [{
+                    expand: true,
+                    cwd: 'src/',
+                    src: ['**/*.js'],
+                    dest: 'build'
+                }]
+            },
+            dist: {
+                files: [{
+                    expand: true,
+                    cwd: 'src/',
+                    src: ['**/*.js'],
+                    dest: 'dist/' + APP_NAME + '-'+tail
+                }]
+            }
+        },
+        shell: {
+            electron: {
+                command: electron + ' . ' + (grunt.option('dev') ? '--dev' : ''),
+                options: {
+                    async: false,
+                    execOptions: {
+                        cwd: 'build'
+                    }
+                }
+            }
+        },
+        clean: {
+            build: ['build/'],
+            release: ['dist/']
+        },
+        ffmpeg_libs: {
+            options: {
+                dir: 'bin/ffmpeg/' + process.platform,
+                force: true,
+                arch: (process.platform === 'win32') ? 'ia32' : 'x64',
+                platform: (process.platform === 'win32') ? 'win' : 'osx'
+            }
+        },
+        electron: {
+            windows: {
+                options: {
+                    name: APP_NAME,
+                    dir: 'build/',
+                    out: 'dist',
+                    version: packagejson['optionalDependencies']['electron-prebuilt'],
+                    platform: process.platform,
+                    arch: process.platform == 'darwin' ? 'x64' : 'ia32',
+                    prune: true,
+                    asar: true
+                }
+            }
+        },
+        compress: {
+            windows: {
+                options: {
+                    archive: './dist/' + APP_NAME + '-' + APP_VERSION + '-'+tail+'.zip',
+                    mode: 'zip'
+                },
+                files: [{
+                    expand: true,
+                    dot: true,
+                    cwd: './dist/' + APP_NAME + '-'+tail,
+                    src: '**/*'
+                }]
+            }
+        }
+    });
+
+    grunt.registerTask('default', ['babel', 'copy:dev', 'shell:electron']);
+
+    grunt.registerTask('run', ['babel', 'shell:electron']);
+
+    grunt.registerTask('deps', ['copy:node_modules']);
+
+    // if (process.platform === 'win32') {
+        grunt.registerTask('release', ['clean:release', 'electron:windows', 'babel:dist', 'copy:release', 'copy:depsWindows', 'compress:windows']);
+    // }
+
+};
diff --git a/app.exe b/app.exe
diff --git a/audio_sniffer-x64.dll b/audio_sniffer-x64.dll
diff --git a/audio_sniffer.dll → bin/driver/audio_sniffer.dll b/audio_sniffer.dll → bin/driver/audio_sniffer.dll
diff --git a/bin/driver/darwin/Soundflower-2.0b2.dmg b/bin/driver/darwin/Soundflower-2.0b2.dmg
diff --git a/bin/driver/darwin/audiodevice b/bin/driver/darwin/audiodevice
diff --git a/register_run_as_admin.bat → bin/driver/register_run_as_admin.bat b/register_run_as_admin.bat → bin/driver/register_run_as_admin.bat
diff --git a/bin/driver/win32/RegInDll.dll b/bin/driver/win32/RegInDll.dll
diff --git a/bin/driver/win32/RegSvrEx.exe b/bin/driver/win32/RegSvrEx.exe
diff --git a/bin/driver/win32/audio_sniffer.dll b/bin/driver/win32/audio_sniffer.dll
diff --git a/ffmpeg.exe b/ffmpeg.exe
diff --git a/index.js b/index.js
diff --git a/node.exe b/node.exe
diff --git a/package.json b/package.json
@@ -2,18 +2,45 @@
   "name": "audio-cast",
   "version": "1.0.0",
   "description": "",
-  "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "postinstall": "grunt ffmpeg_libs"
   },
   "author": "",
   "license": "ISC",
+  "electron-version": "0.35.1",
+  "main": "main.js",
   "dependencies": {
+    "async": "^1.5.0",
+    "bluebird": "^3.0.6",
     "castv2": "^0.1.4",
     "castv2-client": "^1.1.0",
     "express": "^4.13.3",
     "fluent-ffmpeg": "^2.0.1",
+    "get-port": "^2.1.0",
     "mdns-js": "^0.4.0",
     "node-windows": "^0.1.10"
+  },
+  "devDependencies": {
+    "babel": "^6.1.18",
+    "babel-plugin-transform-merge-sibling-variables": "^6.1.18",
+    "babel-plugin-transform-minify-booleans": "^6.1.18",
+    "babel-plugin-transform-property-literals": "^6.1.18",
+    "babel-plugin-transform-simplify-comparison-operators": "^6.1.18",
+    "babel-preset-es2015": "^6.1.18",
+    "grunt": "^0.4.5",
+    "grunt-babel": "^6.0.0",
+    "grunt-contrib-clean": "^0.7.0",
+    "grunt-contrib-compress": "^0.14.0",
+    "grunt-contrib-copy": "^0.8.2",
+    "grunt-electron": "^2.0.1",
+    "grunt-ffmpeg-libs": "0.0.1",
+    "grunt-shell": "^1.1.2",
+    "grunt-shell-spawn": "^0.3.10",
+    "grunt-newer": "^1.1.1",
+    "load-grunt-tasks": "^3.3.0"
+  },
+  "optionalDependencies": {
+    "electron-prebuilt": "0.35.1"
   }
 }
diff --git a/src/cast-connected.png b/src/cast-connected.png
diff --git a/src/cast.png b/src/cast.png