Skip to content

Commit

Permalink
fixed #26
Browse files Browse the repository at this point in the history 
fixed some bugs
polish code
  • Loading branch information
@xfslove
xfslove committed Aug 1, 2019
1 parent e5d7ffc commit 5a744bd
Show file tree
Hide file tree
Showing 5 changed files with 220 additions and 145 deletions.
178 changes: 70 additions & 108 deletions index.js
View file
Original file line number Diff line number Diff line change
@@ -1,216 +1,178 @@
"use strict";
var alfy = require('alfy');
var tts = require("./tts");
var translate = require("./translate");
var translator = require("./translate");
var configstore = require('configstore');
var os = require('os');
var fs = require('fs');
var uuidv4 = require('uuid/v4');
var languagePair = new configstore('language-config-pair');
var history = new configstore("translate-history");

var g_data = {
var g_config = {
voice: process.env.voice || 'remote',
save: process.env.save_count || 20,
domain: process.env.domain || 'https://translate.google.com',
input: alfy.input,
from: {
lang: 'auto',
ttsfile: os.tmpdir() + '/' + uuidv4() + ".mp3",
text: []
ttsfile: os.tmpdir() + '/' + uuidv4() + ".mp3"
},
to: {
lang: 'en',
ttsfile: os.tmpdir() + '/' + uuidv4() + ".mp3",
text: []
ttsfile: os.tmpdir() + '/' + uuidv4() + ".mp3"
}
};

var pair = languagePair.get('pair');
if (pair) {
// auto
// language detect
translate(g_data.input, {raw: true, from: 'auto', to: 'en', domain: g_data.domain})
translator
.translate(g_config.input, {from: g_config.from.lang, to: g_config.to.lang, domain: g_config.domain})
.then(function (res) {
var detect = JSON.parse(res.raw)[2];
var detect = res.from.language.iso;
if (pair[0] === detect) {
g_data.from.lang = pair[0];
g_data.to.lang = pair[1];
g_config.from.lang = pair[0];
g_config.to.lang = pair[1];
} else if (pair[1] === detect) {
g_data.from.lang = pair[1];
g_data.to.lang = pair[0];
g_config.from.lang = pair[1];
g_config.to.lang = pair[0];
}

doTranslate(g_data);
doTranslate();
});

return;
} else {
// manual
if (languagePair.get('source') && languagePair.get('target')) {
g_data.from.lang = languagePair.get('source');
g_data.to.lang = languagePair.get('target');
g_config.from.lang = languagePair.get('source');
g_config.to.lang = languagePair.get('target');
}

doTranslate(g_data);
doTranslate();
}

function doTranslate(data) {
function doTranslate() {
//文档上说cmd+L时会找largetype，找不到会找arg，但是实际并不生效。
//同时下一步的发音模块中query变量的值为arg的值。
translate(data.input, {raw: true, from: data.from.lang, to: data.to.lang, domain: data.domain})
translator
.translate(g_config.input, {from: g_config.from.lang, to: g_config.to.lang, domain: g_config.domain})
.then(function (res) {
var items = [];

if (res.from.text.autoCorrected) {
if (res.from.corrected.corrected || res.from.corrected.didYouMean) {

var corrected = res.from.text.value
var corrected = res.from.corrected.value
.replace(/\[/, "")
.replace(/\]/, "");

// Correct
items.push({
title: res.text,
title: res.to.text.value,
subtitle: `Show translation for ${corrected}?`,
autocomplete: corrected
});

} else {

var rawObj = JSON.parse(res.raw);

var translation = rawObj[0];
var indexOfStandard = 0;
translation.forEach(obj => {
if (obj[0]) {
data.from.text.push(obj[1]);
data.to.text.push(obj[0]);
indexOfStandard++;
}
});
var standard = rawObj[0][indexOfStandard] || [];

var fromStandard = standard[3] || '';
var fromText = data.from.text.join(' ');
var fromArg = data.voice === 'remote' ? data.from.ttsfile : data.voice === 'local' ? fromText : '';
var fromPhonetic = res.from.text.phonetic;
var fromText = res.from.text.value;
var fromArg = g_config.voice === 'remote' ? g_config.from.ttsfile : g_config.voice === 'local' ? fromText : '';
// Input
items.push({
title: fromText,
subtitle: fromStandard,
quicklookurl: `${data.domain}/#view=home&op=translate&sl=${data.from.lang}&tl=${data.to.lang}&text=${encodeURIComponent(data.from.text)}`,
subtitle: `Phonetic: ${fromPhonetic || ''}`,
quicklookurl: `${g_config.domain}/#view=home&op=translate&sl=${g_config.from.lang}&tl=${g_config.to.lang}&text=${encodeURIComponent(fromText)}`,
arg: fromArg,
text: {
copy: fromText,
largetype: fromText
},
icon: {
path: data.voice === 'none' ? 'icon.png' : 'tts.png'
path: g_config.voice === 'none' ? 'icon.png' : 'tts.png'
}
});

var toStandard = standard[2] || '';
var toText = data.to.text.join(' ');
var toArg = data.voice === 'remote' ? data.to.ttsfile : data.voice === 'local' ? toText : '';
var toPhonetic = res.to.text.phonetic;
var toText = res.to.text.value;
var toArg = g_config.voice === 'remote' ? g_config.to.ttsfile : g_config.voice === 'local' ? toText : '';
// Translation
items.push({
title: toText,
subtitle: toStandard,
quicklookurl: `${data.domain}/#view=home&op=translate&sl=${data.to.lang}&tl=${data.from.lang}&text=${encodeURIComponent(data.to.text)}`,
subtitle: `Phonetic: ${toPhonetic || ''}`,
quicklookurl: `${g_config.domain}/#view=home&op=translate&sl=${g_config.to.lang}&tl=${g_config.from.lang}&text=${encodeURIComponent(toText)}`,
arg: toArg,
text: {
copy: toText,
largetype: toText
},
icon: {
path: data.voice === 'none' ? 'icon.png' : 'tts.png'
path: g_config.voice === 'none' ? 'icon.png' : 'tts.png'
}
});

// Definitions
if (rawObj[12]) {
rawObj[12].forEach(obj => {
var partsOfSpeech = obj[0];
obj[1].forEach(x => {
var definitions = x[0];
var example = x[2];
items.push({
title: `Definition[${partsOfSpeech}]: ${definitions}`,
subtitle: `Example: "${example || 'none'}"`,
quicklookurl: `${data.domain}/#view=home&op=translate&sl=${data.from.lang}&tl=${data.to.lang}&text=${encodeURIComponent(data.from.text)}`,
text: {
copy: definitions,
largetype: `Definitions: ${definitions}\nExample: "${example || 'none'}"`
}
});
if (res.to.definitions.length > 0) {
res.to.definitions.forEach(definition => {
items.push({
title: `Definition[${definition.partsOfSpeech}]: ${definition.value}`,
subtitle: `Example: ${definition.example || ''}`,
quicklookurl: `${g_config.domain}/#view=home&op=translate&sl=${g_config.from.lang}&tl=${g_config.to.lang}&text=${encodeURIComponent(fromText)}`,
text: {
copy: definition.value,
largetype: `Definitions: ${definition.value}\n\nExample: ${definition.example || ''}`
}
});
});
}

// Translation Of
if (rawObj[1]) {
rawObj[1].forEach(obj => {
var partsOfSpeech = obj[0];
obj[2].forEach(x => {
var text = x[0];
var synonyms = x[1];
var frequency = x[3];
items.push({
title: `Translation[${partsOfSpeech}]: ${text}`,
subtitle: `Frequency: ${frequency ? frequency.toFixed(4) : '0.0000'} Synonyms: ${synonyms ? synonyms.join(', ') : 'none'}`,
text: {
copy: text,
largetype: `${text}\nSynonyms: ${synonyms ? synonyms.join(', ') : 'none'}`
}
});
if (res.to.translations.length > 0) {
res.to.translations.forEach(translation => {
items.push({
title: `Translation[${translation.partsOfSpeech}]: ${translation.value}`,
subtitle: `Frequency: ${translation.frequency ? translation.frequency.toFixed(4) : '0.0000'} Synonyms: ${translation.synonyms ? translation.synonyms.join(', ') : ''}`,
text: {
copy: translation.value,
largetype: `${translation.value}\n\nSynonyms: ${translation.synonyms ? translation.synonyms.join(', ') : ''}`
}
});
});
}
}

alfy.output(items);

return data;
return res;
})
.then(function (data) {
.then(res => {
// history
if (data.save > 0 && data.from.text.length > 0 && data.to.text.length > 0) {
if (g_config.save > 0) {
var value = {
time: Date.now(),
from: data.from.text.join(' '),
to: data.to.text.join(' ')
from: res.from.text.value,
to: res.to.text.value
};
var histories = history.get('history') ? JSON.parse(history.get('history')) : [];
if (histories.length >= data.save) histories.shift();
if (histories.length >= g_config.save) histories.shift();
histories.push(value);
history.set('history', JSON.stringify(histories));
}

return data;
return res;
})
.then(data => {
.then(res => {
// tts
if (data.voice === 'remote') {
createtts(data.domain, data.from.text.reverse(), data.from.lang, data.from.ttsfile, true);
createtts(data.domain, data.to.text.reverse(), data.to.lang, data.to.ttsfile, true);
if (g_config.voice === 'remote') {
var fromArray = [];
res.from.text.array.forEach(o => tts.split(o).forEach(t => fromArray.push(t)));
tts.multi(fromArray, {to: g_config.from.lang, domain: g_config.domain, file: g_config.from.ttsfile});

var toArray = [];
res.to.text.array.forEach(o => tts.split(o).forEach(t => toArray.push(t)));
tts.multi(toArray, {to: g_config.to.lang, domain: g_config.domain, file: g_config.to.ttsfile});
}
});
}

function createtts(domain, data, lang, file, create) {
var text = data.pop();
if (!text) return;
tts(text, {to: lang, domain: domain})
.then(buffer => {
if (create) {
fs.writeFile(file, buffer, function (err) {
if (err) throw err;
createtts(domain, data, lang, file, false);
});
} else {
fs.appendFile(file, buffer, function (err) {
if (err) throw err;
createtts(domain, data, lang, file, false);
});
}
});
})
;
}
2 changes: 1 addition & 1 deletion info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<key>escaping</key>
<integer>0</integer>
<key>script</key>
<string>if [ "$read" = "local" ];then
<string>if [ "$voice" = "local" ];then
say {query} -v Samantha
else
afplay {query}
Expand Down
10 changes: 6 additions & 4 deletions token.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ var window = {
TKK: config.get('TKK') || '0'
};

function updateTKK(domain) {
function updateTKK(url) {
return new Promise(function (resolve, reject) {
var now = Math.floor(Date.now() / 3600000);

if (Number(window.TKK.split('.')[0]) === now) {
resolve();
} else {
got(domain).then(function (res) {
got(url).then(function (res) {
var matches = res.body.match(/tkk:\s?'(.+?)'/i);

if (matches) {
Expand All @@ -104,8 +104,10 @@ function updateTKK(domain) {
});
}

function get(text, domain) {
return updateTKK(domain).then(function () {
function get(text, opts) {
opts = opts || {};

return updateTKK(opts.domain).then(function () {
var tk = sM(text);
tk = tk.replace('&tk=', '');
return {name: 'tk', value: tk};
Expand Down
Loading

0 comments on commit 5a744bd

Please sign in to comment.