oysteikt/unofficial_jisho_api_dart
oysteikt
/
unofficial_jisho_api_dart
mirror of https://github.com/h7x4/unofficial_jisho_api_dart.git
1
0
Fork 0
Code Issues Releases Activity

Update URIs to https

This commit is contained in:
Oystein Kristoffer Tveit 2020-06-15 11:17:10 +02:00
parent aa29d73477
commit 1e35cde24d
14 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/src/objects.dart
View File

@ -157,8 +157,8 @@ class KanjiResult {
'meaning': meaning, 'meaning': meaning,
'kunyomi': kunyomi, 'kunyomi': kunyomi,
'onyomi': onyomi, 'onyomi': onyomi,
'onyomiExamples': onyomiExamples.map((onyomiExample) => onyomiExample.toJson()).toList(), 'onyomiExamples': onyomiExamples,
'kunyomiExamples': kunyomiExamples.map((kunyomiExample) => kunyomiExample.toJson()).toList(), 'kunyomiExamples': kunyomiExamples,
'radical': radical.toJson(), 'radical': radical.toJson(),
'parts': parts, 'parts': parts,
'strokeOrderDiagramUri': strokeOrderDiagramUri, 'strokeOrderDiagramUri': strokeOrderDiagramUri,

8
lib/src/unofficial_jisho_api_base.dart
View File

@ -9,9 +9,9 @@ final htmlUnescape = html_entities.HtmlUnescape();
// TODO: Put public facing types in this file. // TODO: Put public facing types in this file.
const String JISHO_API = 'http://jisho.org/api/v1/search/words'; const String JISHO_API = 'https://jisho.org/api/v1/search/words';
const String SCRAPE_BASE_URI = 'http://jisho.org/search/'; const String SCRAPE_BASE_URI = 'https://jisho.org/search/';
const String STROKE_ORDER_DIAGRAM_BASE_URI = 'http://classic.jisho.org/static/images/stroke_diagrams/'; const String STROKE_ORDER_DIAGRAM_BASE_URI = 'https://classic.jisho.org/static/images/stroke_diagrams/';
/* KANJI SEARCH FUNCTIONS START */ /* KANJI SEARCH FUNCTIONS START */
@ -185,7 +185,7 @@ List<String> getParts(String pageHtml) {
String getSvgUri(String pageHtml) { String getSvgUri(String pageHtml) {
var svgRegex = RegExp('\/\/.*?.cloudfront.net\/.*?.svg'); var svgRegex = RegExp('\/\/.*?.cloudfront.net\/.*?.svg');
final regexResult = svgRegex.firstMatch(pageHtml).group(0).toString(); final regexResult = svgRegex.firstMatch(pageHtml).group(0).toString();
return regexResult.isNotEmpty ? 'http:${regexResult}' : null; return regexResult.isNotEmpty ? 'https:${regexResult}' : null;
} }
String getGifUri(String kanji) { String getGifUri(String kanji) {

2
test/example_test_cases/0.json
View File

@ -1065,7 +1065,7 @@
] ]
} }
], ],
"uri": "http://jisho.org/search/%E8%BB%8A%23sentences", "uri": "https://jisho.org/search/%E8%BB%8A%23sentences",
"phrase": "車" "phrase": "車"
} }
} }

2
test/example_test_cases/1.json
View File

@ -885,7 +885,7 @@
] ]
} }
], ],
"uri": "http://jisho.org/search/%E6%97%A5%E6%9C%AC%E4%BA%BA%23sentences", "uri": "https://jisho.org/search/%E6%97%A5%E6%9C%AC%E4%BA%BA%23sentences",
"phrase": "日本人" "phrase": "日本人"
} }
} }

2
test/example_test_cases/2.json
View File

@ -4,7 +4,7 @@
"query": "彼＊叩く", "query": "彼＊叩く",
"found": false, "found": false,
"results": [], "results": [],
"uri": "http://jisho.org/search/%E5%BD%BC%EF%BC%8A%E5%8F%A9%E3%81%8F%23sentences", "uri": "https://jisho.org/search/%E5%BD%BC%EF%BC%8A%E5%8F%A9%E3%81%8F%23sentences",
"phrase": "彼＊叩く" "phrase": "彼＊叩く"
} }
} }

6
test/example_test_cases/3.json
View File

@ -719,7 +719,7 @@
{ {
"english": "\"I've heard about it, Koichi\" \"You don't need to say anything more, I know. It's the summer festival incident at the shrine, right?\"", "english": "\"I've heard about it, Koichi\" \"You don't need to say anything more, I know. It's the summer festival incident at the shrine, right?\"",
"kanji": "「聞いたよ、光一」「まあ皆までいうなって。分かってる。神社の夏祭りの一件でしょ？」", "kanji": "「聞いたよ、光一」「まあ皆までいうなって。分かってる。神社の夏祭りの一件でしょ？」",
"kana": "「きいたよ、光一」「まあみなまでいうなって。わかかってる。じんじゃの夏祭りのいっけんでしょ？」", "kana": "「きいたよ、光一」「まあ皆までいうなって。わかかってる。じんじゃの夏祭りのいっけんでしょ？」",
"pieces": [ "pieces": [
{ {
"lifted": "き", "lifted": "き",
@ -734,7 +734,7 @@
"unlifted": "まあ" "unlifted": "まあ"
}, },
{ {
"lifted": "みな", "lifted": "",
"unlifted": "皆までいうな" "unlifted": "皆までいうな"
}, },
{ {
@ -1209,7 +1209,7 @@
] ]
} }
], ],
"uri": "http://jisho.org/search/%E7%9A%86%23sentences", "uri": "https://jisho.org/search/%E7%9A%86%23sentences",
"phrase": "皆" "phrase": "皆"
} }
} }

2
test/example_test_cases/4.json
View File

@ -4,7 +4,7 @@
"query": "ネガティブ", "query": "ネガティブ",
"found": false, "found": false,
"results": [], "results": [],
"uri": "http://jisho.org/search/%E3%83%8D%E3%82%AC%E3%83%86%E3%82%A3%E3%83%96%23sentences", "uri": "https://jisho.org/search/%E3%83%8D%E3%82%AC%E3%83%86%E3%82%A3%E3%83%96%23sentences",
"phrase": "ネガティブ" "phrase": "ネガティブ"
} }
} }

2
test/example_test_cases/5.json
View File

@ -4,7 +4,7 @@
"query": "grlgmregmneriireg", "query": "grlgmregmneriireg",
"found": false, "found": false,
"results": [], "results": [],
"uri": "http://jisho.org/search/grlgmregmneriireg%23sentences", "uri": "https://jisho.org/search/grlgmregmneriireg%23sentences",
"phrase": "grlgmregmneriireg" "phrase": "grlgmregmneriireg"
} }
} }

6
test/kanji_test_cases/0.json
View File

@ -60,9 +60,9 @@
"parts": [ "parts": [
"車" "車"
], ],
"strokeOrderDiagramUri": "http://classic.jisho.org/static/images/stroke_diagrams/36554_frames.png", "strokeOrderDiagramUri": "https://classic.jisho.org/static/images/stroke_diagrams/36554_frames.png",
"strokeOrderSvgUri": "http://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/08eca.svg", "strokeOrderSvgUri": "https://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/08eca.svg",
"strokeOrderGifUri": "https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/8eca.gif", "strokeOrderGifUri": "https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/8eca.gif",
"uri": "http://jisho.org/search/%E8%BB%8A%23kanji" "uri": "https://jisho.org/search/%E8%BB%8A%23kanji"
} }
} }

6
test/kanji_test_cases/1.json
View File

@ -119,9 +119,9 @@
"宀", "宀",
"豕" "豕"
], ],
"strokeOrderDiagramUri": "http://classic.jisho.org/static/images/stroke_diagrams/23478_frames.png", "strokeOrderDiagramUri": "https://classic.jisho.org/static/images/stroke_diagrams/23478_frames.png",
"strokeOrderSvgUri": "http://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/05bb6.svg", "strokeOrderSvgUri": "https://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/05bb6.svg",
"strokeOrderGifUri": "https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/5bb6.gif", "strokeOrderGifUri": "https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/5bb6.gif",
"uri": "http://jisho.org/search/%E5%AE%B6%23kanji" "uri": "https://jisho.org/search/%E5%AE%B6%23kanji"
} }
} }

6
test/kanji_test_cases/2.json
View File

@ -91,9 +91,9 @@
"木", "木",
"白" "白"
], ],
"strokeOrderDiagramUri": "http://classic.jisho.org/static/images/stroke_diagrams/27005_frames.png", "strokeOrderDiagramUri": "https://classic.jisho.org/static/images/stroke_diagrams/27005_frames.png",
"strokeOrderSvgUri": "http://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/0697d.svg", "strokeOrderSvgUri": "https://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/0697d.svg",
"strokeOrderGifUri": "https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/697d.gif", "strokeOrderGifUri": "https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/697d.gif",
"uri": "http://jisho.org/search/%E6%A5%BD%23kanji" "uri": "https://jisho.org/search/%E6%A5%BD%23kanji"
} }
} }

6
test/kanji_test_cases/4.json
View File

@ -44,9 +44,9 @@
"貝", "貝",
"辛" "辛"
], ],
"strokeOrderDiagramUri": "http://classic.jisho.org/static/images/stroke_diagrams/36100_frames.png", "strokeOrderDiagramUri": "https://classic.jisho.org/static/images/stroke_diagrams/36100_frames.png",
"strokeOrderSvgUri": "http://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/08d04.svg", "strokeOrderSvgUri": "https://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/08d04.svg",
"strokeOrderGifUri": "https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/8d04.gif", "strokeOrderGifUri": "https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/8d04.gif",
"uri": "http://jisho.org/search/%E8%B4%84%23kanji" "uri": "https://jisho.org/search/%E8%B4%84%23kanji"
} }
} }

6
test/kanji_test_cases/7.json
View File

@ -70,9 +70,9 @@
"parts": [ "parts": [
"水" "水"
], ],
"strokeOrderDiagramUri": "http://classic.jisho.org/static/images/stroke_diagrams/27700_frames.png", "strokeOrderDiagramUri": "https://classic.jisho.org/static/images/stroke_diagrams/27700_frames.png",
"strokeOrderSvgUri": "http://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/06c34.svg", "strokeOrderSvgUri": "https://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/06c34.svg",
"strokeOrderGifUri": "https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/6c34.gif", "strokeOrderGifUri": "https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/6c34.gif",
"uri": "http://jisho.org/search/%E6%B0%B4%23kanji" "uri": "https://jisho.org/search/%E6%B0%B4%23kanji"
} }
} }

16
test/local_function_test_cases.dart
View File

@ -17,20 +17,20 @@ void test_local_functions() async {
test('uriForKanjiSearch', () { test('uriForKanjiSearch', () {
final result = uriForKanjiSearch('時'); final result = uriForKanjiSearch('時');
expect(result, 'http://jisho.org/search/%E6%99%82%23kanji'); expect(result, 'https://jisho.org/search/%E6%99%82%23kanji');
}); });
test('getUriForStrokeOrderDiagram', () { test('getUriForStrokeOrderDiagram', () {
final result = getUriForStrokeOrderDiagram('時'); final result = getUriForStrokeOrderDiagram('時');
expect(result, 'http://classic.jisho.org/static/images/stroke_diagrams/26178_frames.png'); expect(result, 'https://classic.jisho.org/static/images/stroke_diagrams/26178_frames.png');
}); });
test('uriForPhraseSearch', () { test('uriForPhraseSearch', () {
final result = uriForPhraseSearch('時間'); final result = uriForPhraseSearch('時間');
expect(result, 'http://jisho.org/api/v1/search/words?keyword=%E6%99%82%E9%96%93'); expect(result, 'https://jisho.org/api/v1/search/words?keyword=%E6%99%82%E9%96%93');
}); });
final kanjiPage = (await http.get('http://jisho.org/search/%E6%99%82%23kanji')).body; final kanjiPage = (await http.get('https://jisho.org/search/%E6%99%82%23kanji')).body;
test('containsKanjiGlyph', () { test('containsKanjiGlyph', () {
final result = containsKanjiGlyph(kanjiPage, '時'); final result = containsKanjiGlyph(kanjiPage, '時');
@ -199,7 +199,7 @@ void test_local_functions() async {
test('getSvgUri', () { test('getSvgUri', () {
final result = getSvgUri(kanjiPage); final result = getSvgUri(kanjiPage);
expect(result, 'http://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/06642.svg'); expect(result, 'https://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/06642.svg');
}); });
test('getGifUri', () { test('getGifUri', () {
@ -277,10 +277,10 @@ void test_local_functions() async {
meaning: 'sun, day' meaning: 'sun, day'
); );
expectedResult.parts = ['土', '寸', '日']; expectedResult.parts = ['土', '寸', '日'];
expectedResult.strokeOrderDiagramUri = 'http://classic.jisho.org/static/images/stroke_diagrams/26178_frames.png'; expectedResult.strokeOrderDiagramUri = 'https://classic.jisho.org/static/images/stroke_diagrams/26178_frames.png';
expectedResult.strokeOrderSvgUri = 'http://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/06642.svg'; expectedResult.strokeOrderSvgUri = 'https://d1w6u4xc3l95km.cloudfront.net/kanji-2015-03/06642.svg';
expectedResult.strokeOrderGifUri = 'https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/6642.gif'; expectedResult.strokeOrderGifUri = 'https://raw.githubusercontent.com/mistval/kanji_images/master/gifs/6642.gif';
expectedResult.uri = 'http://jisho.org/search/%E6%99%82%23kanji'; expectedResult.uri = 'https://jisho.org/search/%E6%99%82%23kanji';
expect( expect(
json.encode(result), json.encode(result),