summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2016-03-20 17:15:40 -0700
committerAlex Yatskov <alex@foosoft.net>2016-03-20 17:15:40 -0700
commitd8a630fa2881a0cf012c6548706dde7c4740fe14 (patch)
tree80a4cc60c491373154d5c39146b3c0dac9eb3840
parent7208872b9fee135318b8a1a8b4483547b3986c89 (diff)
Simple lookup now works.
-rw-r--r--ext/content.js2
-rw-r--r--ext/jp/dictionary.js50
-rw-r--r--ext/jp/translator.js15
-rw-r--r--ext/manifest.json11
-rwxr-xr-xutil/compile.py28
5 files changed, 66 insertions, 40 deletions
diff --git a/ext/content.js b/ext/content.js
index dc7c7cd7..aa51d758 100644
--- a/ext/content.js
+++ b/ext/content.js
@@ -52,4 +52,4 @@ function onMouseDown(e) {
-window.addEventListener('mousedown', onMouseDown, false);
+// window.addEventListener('mousedown', onMouseDown, false);
diff --git a/ext/jp/dictionary.js b/ext/jp/dictionary.js
index 2b11d252..871a9550 100644
--- a/ext/jp/dictionary.js
+++ b/ext/jp/dictionary.js
@@ -18,11 +18,55 @@
class Dictionary {
- constructor(rules) {
- this.rules = rules;
+ constructor() {
+ this.termDicts = [];
+ this.kanjiDicts = [];
}
- deinflect(term, validator) {
+ addTermDict(termDict) {
+ this.termDicts.push(termDict);
+ }
+
+ addKanjiDict(kanjiDict) {
+ this.kanjiDicts.push(kanjiDict);
+ }
+
+
+ findTerm(term) {
+ let results = [];
+ for (let dict of this.termDicts) {
+ results = results.concat(this.findTermInDict(term, dict));
+ }
+
+ return results;
+ }
+
+ findKanji(kanji) {
+ const results = [];
+ for (let dict of this.kanjiDicts) {
+ const result = this.findKanjiInDict(kanji, dict);
+ if (result !== null) {
+ results.push(result);
+ }
+ }
+
+ return results;
+ }
+
+ findTermInDict(term, dict) {
+ return (dict.indices[term] || []).map(index => {
+ const [e, r, g, t] = dict.defs[index];
+ return {expression: e, reading: r, glossary: g, tags: t};
+ });
+ }
+
+ findKanjiInDict(kanji, dict) {
+ const def = dict.defs[kanji];
+ if (def === null) {
+ return null;
+ }
+ const [c, k, o, g] = def;
+ return {character: c, kunyomi: k, onyomi: o, glossary: g};
}
}
diff --git a/ext/jp/translator.js b/ext/jp/translator.js
index be15c397..79f2b369 100644
--- a/ext/jp/translator.js
+++ b/ext/jp/translator.js
@@ -18,10 +18,7 @@
class Translator {
constructor() {
- this.rules = {};
- this.edict = {};
- this.enamdict = {};
- this.kanjidic = {};
+ this.dictionary = new Dictionary();
this.initialized = false;
}
@@ -38,10 +35,9 @@ class Translator {
}
$.when.apply($, loaders).done((rules, edict, enamdict, kanjidic) => {
- this.rules = rules;
- this.edict = edict;
- this.enamdict = enamdict;
- this.kanjidic = kanjidic;
+ this.dictionary.addTermDict(edict[0]);
+ this.dictionary.addTermDict(enamdict[0]);
+ this.dictionary.addKanjiDict(kanjidic[0]);
this.initialized = true;
@@ -60,5 +56,6 @@ trans.initialize({
enamdict: 'jp/data/enamdict.json',
kanjidic: 'jp/data/kanjidic.json',
}, function() {
- alert('Loaded');
+ // alert('Loaded');
+ // alert(trans.dictionary.findTerm('猫'));
});
diff --git a/ext/manifest.json b/ext/manifest.json
index 1cd15a9d..3685d949 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -4,15 +4,12 @@
"description": "Yomichan Extension",
"version": "0.0.1",
- "browser_action": {
- "default_icon": "icon.png"
- },
-
- "background": { "page": "background.html" },
+ "browser_action": {"default_icon": "icon.png"},
+ "background": {"page": "background.html"},
"content_scripts": [{
- "matches": [ "http://*/*", "https://*/*" ],
- "js": [ "content.js" ],
+ "matches": ["http://*/*", "https://*/*"],
+ "js": ["content.js"],
"run_at": "document_end"
}]
}
diff --git a/util/compile.py b/util/compile.py
index 7991f6c1..485537dc 100755
--- a/util/compile.py
+++ b/util/compile.py
@@ -158,27 +158,15 @@ def parse_edict(path):
defs.append((term, reading, glossary, tags))
- term_indices = {}
- reading_indices = {}
-
+ indices = {}
for i, d in enumerate(defs):
- term, reading = d[:2]
-
- if term is not None:
- term_list = term_indices.get(term, [])
- term_list.append(i)
- term_indices[term] = term_list
-
- if reading is not None:
- reading_list = reading_indices.get(reading, [])
- reading_list.append(i)
- reading_indices[reading] = reading_list
-
- return {
- 'defs': defs,
- 't_idx': term_indices,
- 'r_idx': reading_indices
- };
+ for key in d[:2]:
+ if key is not None:
+ values = indices.get(key, [])
+ values.append(i)
+ indices[key] = values
+
+ return {'defs': defs, 'indices': indices}
def build_dict(output_dir, input_file, parser):