From c5b0aeaae4ad17489e52401be18656f6ad128519 Mon Sep 17 00:00:00 2001 From: pietrop Date: Mon, 19 Nov 2018 19:39:59 +0000 Subject: [PATCH] increased version number added line segmentation option for plain text with timecode export option --- electron/twitter_keys.js | 96 ++++++++++++++++++ .../transcriber/.DS_Store | Bin 8196 -> 8196 bytes package.json | 2 +- 3 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 electron/twitter_keys.js diff --git a/electron/twitter_keys.js b/electron/twitter_keys.js new file mode 100644 index 0000000..a5052d0 --- /dev/null +++ b/electron/twitter_keys.js @@ -0,0 +1,96 @@ +// twitter keys for tweet-that-clip module behave slightly differnelty, set in process.env +// so for now accomodating for that as a temporary solution while thinking about a refactoring +"use strict"; +const fs = require('fs'); +const path = require('path'); + +var TwitterKeysPath = ""; +if(window.ENV_ELECTRON){ + const electron = require('electron'); + const currentWindow = electron.remote.getCurrentWindow(); + TwitterKeysPath = path.join(currentWindow.dataPath , 'twitterkeys.json'); +} +if(window.ENV_CEP){ + // https://forums.adobe.com/thread/1956086 + // TwitterKeysPath = path.join(Folder.userData.fsName, 'twitterkeys.json'); + window.__adobe_cep__.evalScript(`$._PPP.get_user_data_path()`, function (adobeDataPath){ + TwitterKeysPath = path.join(adobeDataPath, 'twitterkeys.json'); + }) +} + +var TwitterKeys = { + consumerKey: "", + consumerSecret: "", + accessToken: "", + accessTokenSecret: "" +}; + +// load keys on startup +window.document.addEventListener('DOMContentLoaded', function() { + if (areTwitterAPIkeysSet()) { + TwitterKeys = getTwitterAPIkeys(); + } +}); + +//helper funciton to check/validate the keys +function keysAreValid(tempKeys){ + //if hte object has the required attributes + if (tempKeys.consumerKey.length > 0 ) { + return true; + }else{ + return false; + } +} + +// get +function getTwitterAPIkeys(){ + if (fs.existsSync(TwitterKeysPath)) { + TwitterKeys = JSON.parse(fs.readFileSync(TwitterKeysPath).toString()); + // set in process + // TODO: review this + // process.env.TWITTER_CONSUMER_KEY = TwitterKeys.consumerKey; + // process.env.TWITTER_CONSUMER_SECRET = TwitterKeys.consumerSecret; + // process.env.TWITTER_ACCESS_TOKEN = TwitterKeys.accessToken; + // process.env.TWITTER_ACCESS_TOKEN_SECRET = TwitterKeys.accessTokenSecret; + return TwitterKeys; + }else{ + // fs.writeFileSync(speechmaticsKeysPath, JSON.strinfigy(getSpeechmaticsAPIkeys,null,2)); + return TwitterKeys; + } +} + +//set +function setTwitterAPIkeys(keys){ + // console.log('setTwitterAPIkeys', keys); + if(keysAreValid(keys)){ + // console.log('setTwitterAPIkeys', keys); + fs.writeFileSync(TwitterKeysPath, JSON.stringify(keys,null,2)); + // let TwitterKeys = keys; + // process.env.TWITTER_CONSUMER_KEY = TwitterKeys.consumerKey; + // process.env.TWITTER_CONSUMER_SECRET = TwitterKeys.consumerSecret; + // process.env.TWITTER_ACCESS_TOKEN = TwitterKeys.accessToken; + // process.env.TWITTER_ACCESS_TOKEN_SECRET = TwitterKeys.accessTokenSecret; + }else{ + // not setting keys. should add some error handling it, but + // at the moment validation check is handled in view + } +} + +//check if they are set +function areTwitterAPIkeysSet(){ + // fs.writeFileSync(speechmaticsKeysPath, JSON.stringify(tempKeys)); + if (fs.existsSync(TwitterKeysPath)) { + // TODO: add some more validation that values actually make sense + TwitterKeys = JSON.parse(fs.readFileSync(TwitterKeysPath).toString()); + var result = keysAreValid(TwitterKeys); + return result; + } else { + return false; + } +} + +module.exports = { + areTwitterAPIkeysSet: areTwitterAPIkeysSet, + setTwitterAPIkeys: setTwitterAPIkeys, + getTwitterAPIkeys: getTwitterAPIkeys +}; diff --git a/lib/interactive_transcription_generator/transcriber/.DS_Store b/lib/interactive_transcription_generator/transcriber/.DS_Store index 1637e0d5a3be88cea10781eb0c27179f381ee220..33e7fbd2558eaebff65db4fa48a4b7f7e6967918 100644 GIT binary patch delta 105 zcmZp1XmOa}&&atkU^hP_=VTs%AMX4N=?tk1c?=~CIY2s|p%}<20n&L4`3xxxsb#@M oc{%xc=?n}Ej6lr8kjaq5kc+8q^H+gAY@697zOigxF2c?X0DF`god5s; delta 39 vcmZp1XmOa}&&a+pU^hP_`(z%0ADg2D*RoA)2;0mq@r`A3u;>=1i4DO35wQ*< diff --git a/package.json b/package.json index 05ee850..1c43e56 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "autoEdit2", "productName": "autoEdit2", - "version": "1.0.16", + "version": "1.0.17", "description": "Fast text based video editing", "main": "electron/main.js", "scripts": {