From 691e167e68fe2b28ebad2746842d1775af98fae6 Mon Sep 17 00:00:00 2001 From: arkenthera Date: Tue, 27 Sep 2016 00:18:01 +0300 Subject: [PATCH] Add anitomy-node as submodule --- .gitmodules | 4 ++++ README.md | 3 ++- gulpfile.coffee | 2 +- package.json | 2 +- scripts/media.coffee | 2 +- scripts/torrents.coffee | 2 +- src/main_process/browser-extension-manager.coffee | 8 +++++++- src/main_process/media-detect-win32-process.coffee | 11 ++++++++--- src/main_process/media-library-process.coffee | 7 +++++-- vendor/anitomy-node | 1 + 10 files changed, 31 insertions(+), 11 deletions(-) create mode 160000 vendor/anitomy-node diff --git a/.gitmodules b/.gitmodules index b7816bd..68072ff 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,7 @@ path = vendor/media-detect url = https://github.com/arkenthera/media-detect branch = master +[submodule "vendor/anitomy-node"] + path = vendor/anitomy-node + url = https://github.com/arkenthera/anitomy-node + branch = master diff --git a/README.md b/README.md index fd80056..38b3884 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,10 @@ #Running -Use NPM to build and run Chiika.You will be greeted with login screen,there you can login with your account.Your user info and lists will be retrieved upon login. Media detection only works on Windows *for now*. +Use NPM to build and run Chiika.You will be greeted with login screen,there you can login with your account.Your user info and lists will be retrieved upon login. ``` +git submodule update --init --recursive npm install -g gulp bower npm install bower install diff --git a/gulpfile.coffee b/gulpfile.coffee index 766dbdc..e76cb46 100644 --- a/gulpfile.coffee +++ b/gulpfile.coffee @@ -277,7 +277,7 @@ do Your_Application_will_ = () -> gulp.task('build', ['html', 'compile:scripts', 'packageJson', 'copy:fonts', 'misc','copy:vendor']) gulp.task('test', ['inject:css', 'compile:scripts:not:watch', 'compile:styles', 'misc','copy:vendor']) - gulp.task 'serve', ['inject:css', 'compile:scripts:watch', 'compile:styles', 'misc','copy:vendor'], () -> + gulp.task 'serve', ['inject:css', 'compile:scripts:watch', 'compile:styles', 'misc'], () -> development = null development = Object.create( process.env ); development.CHIIKA_ENV = 'debug'; diff --git a/package.json b/package.json index 53b970a..11d10c6 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "start": "electron .serve/main_process/chiika.js", "test": "exit 0", "preparetesting": "./node_modules/.bin/gulp test", - "postinstall": "cd vendor/media-detect && npm install && npm run conf && npm run rebuild" + "postinstall": "cd vendor/media-detect && npm install && npm run conf && npm run rebuild && cd ../anitomy-node && git submodule update --recursive --init && npm install && npm run conf && npm run rebuild" }, "keywords": [ "electron", diff --git a/scripts/media.coffee b/scripts/media.coffee index 12de0f9..5e8bec9 100644 --- a/scripts/media.coffee +++ b/scripts/media.coffee @@ -43,7 +43,7 @@ module.exports = class Media @chiika = chiika if process.platform == 'win32' - AnitomyNode = require "#{mainProcessHome}/../vendor/anitomy-node/AnitomyNode" + AnitomyNode = require "#{mainProcessHome}/../vendor/anitomy-node" Recognition = require "#{mainProcessHome}/media-recognition" @recognition = new Recognition() diff --git a/scripts/torrents.coffee b/scripts/torrents.coffee index 4f009de..ad72125 100644 --- a/scripts/torrents.coffee +++ b/scripts/torrents.coffee @@ -26,7 +26,7 @@ moment = scriptRequire 'moment' _when = scriptRequire 'when' string = scriptRequire 'string' Recognition = require "#{mainProcessHome}/media-recognition" -AnitomyNode = require "#{mainProcessHome}/../vendor/anitomy-node/AnitomyNode" +AnitomyNode = require "#{mainProcessHome}/../vendor/anitomy-node" NyaaSource = "http://www.nyaa.se/?page=rss&cats=1_37&filter=2" diff --git a/src/main_process/browser-extension-manager.coffee b/src/main_process/browser-extension-manager.coffee index 48363d4..e652e46 100644 --- a/src/main_process/browser-extension-manager.coffee +++ b/src/main_process/browser-extension-manager.coffee @@ -19,15 +19,21 @@ _assign = require 'lodash.assign' _find = require 'lodash/collection/find' _remove = require 'lodash/array/remove' StreamServices = require './stream-services' -AnitomyNode = require '../vendor/anitomy-node/AnitomyNode' module.exports = class BrowserExtensionManager tabs: [] constructor: -> @streamServices = new StreamServices() + + if chiika.devMode + AnitomyNode = require '../../vendor/anitomy-node' + else + AnitomyNode = require '../vendor/anitomy-node' + @anitomy = new AnitomyNode.Root() + # # # diff --git a/src/main_process/media-detect-win32-process.coffee b/src/main_process/media-detect-win32-process.coffee index 90315fa..8f5560e 100644 --- a/src/main_process/media-detect-win32-process.coffee +++ b/src/main_process/media-detect-win32-process.coffee @@ -24,7 +24,6 @@ moment = require 'moment' string = require 'string' mdPath = __dirname + '/../vendor/media-detect' -anitomyPath = '../vendor/anitomy-node/AnitomyNode' class Win32MediaDetect @@ -42,7 +41,12 @@ class Win32MediaDetect try @md = require(mdPath) - @anitomy = require(anitomyPath) + if process.env.DEV_MODE + AnitomyNode = require '../../vendor/anitomy-node' + @anitomy = AnitomyNode + else + AnitomyNode = require '../vendor/anitomy-node' + @anitomy = AnitomyNode catch error obj = {} Error.captureStackTrace(obj) @@ -50,7 +54,8 @@ class Win32MediaDetect throw "Media Detect Win32 child process has crashed." @md = @md.MediaDetect() - @anitomy = new @anitomy.Root() + + @anitomy = new AnitomyNode.Root() try crazyLoop = => diff --git a/src/main_process/media-library-process.coffee b/src/main_process/media-library-process.coffee index ea82c59..4e91dd8 100644 --- a/src/main_process/media-library-process.coffee +++ b/src/main_process/media-library-process.coffee @@ -26,8 +26,6 @@ path = require 'path' fs = require 'fs' MediaRecognition = require './media-recognition' -AnitomyNode = require '../vendor/anitomy-node/AnitomyNode' - process.on 'exit', -> process.send "Exit" @@ -45,6 +43,11 @@ class LibraryScanner @libraryPaths = JSON.parse(process.argv[2]) @fileTypes = ['.mkv','.mp4'] @videoFiles = [] + + if process.env.DEV_MODE + AnitomyNode = require '../../vendor/anitomy-node' + else + AnitomyNode = require '../vendor/anitomy-node' @anitomy = new AnitomyNode.Root() @recognition = new MediaRecognition() diff --git a/vendor/anitomy-node b/vendor/anitomy-node new file mode 160000 index 0000000..abaab32 --- /dev/null +++ b/vendor/anitomy-node @@ -0,0 +1 @@ +Subproject commit abaab32a4bd0c2aaf5de38b609418554e14a2407