Skip to content

Commit

Permalink
Merge branch 'MajsoulPaipuCrawler' into doc
Browse files Browse the repository at this point in the history
  • Loading branch information
zyr17 committed Dec 5, 2021
2 parents 5268298 + 4ff31d7 commit 56d4cb6
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/debugci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: doc debug CI

on:
push:
branches: [ doc, feat/export_tenhou_paipu ]
branches: [ doc ]
workflow_dispatch:

jobs:
Expand Down
1 change: 1 addition & 0 deletions SimpleMahjong/paipu.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ class majsoulpaipuanalyze{
request.open('GET', filelink, true);
request.responseType = 'blob';
request.onload = loadfunc.bind(this);
request.onerror = () => { loadfunc.bind(this)(null, new Uint8Array()); } // if download error, skip it
request.send();
}
else{
Expand Down
8 changes: 7 additions & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@ const ready = () => {
+ '\n3人牌谱: ' + paipu3
+ '\n未识别(无法分析,活动规则)牌谱: ' + errordata
+ '\n已下载: ' + downloaded
+ '\n已转换: ' + converted;
+ '\n已转换: ' + converted
+ '\n\n提示:工具会尝试下载所有牌谱,但是只会转换规则和四人段位场相同的牌谱。\n规则不同(例如宝牌数、番缚、古役等)的牌谱无法转换。';
dialog.showMessageBox({
type: 'info',
noLink: true,
Expand Down Expand Up @@ -308,6 +309,10 @@ const ready = () => {
}

function fetchpaipudatacallback(res){
if (!res) {
// network error? res is null or undefined.
res = { error: 'response null/undefined error' };
}
let error = res.error, bytearr = res.data, url = res.data_url;
if (error){
if (error) console.log('read browseinject.js error: ' + JSON.stringify(error));
Expand Down Expand Up @@ -387,6 +392,7 @@ const ready = () => {
title: '下载转换完成',
message: '完成 ' + downloadcount + '/' + downloadnumber + ' 个下载任务,完成 '
+ convertcount + '/' + convertnumber + ' 个转换任务。\n下载成功牌谱的最晚时间是' + timestr
+ '\n\n提示:工具会尝试下载所有牌谱,但是只会转换规则和四人段位场相同的牌谱。\n规则不同(例如宝牌数、番缚、古役等)的牌谱为未识别,无法转换。'
});
downloadconvertresult = undefined;
downloadconvertlist = undefined;
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 56d4cb6

Please sign in to comment.