Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitd3fa98b

Browse files
fix app first wakeup catch invalid arg (ex. '-psn_0_2958034')
1 parentc545761 commitd3fa98b

File tree

1 file changed

+39
-10
lines changed

1 file changed

+39
-10
lines changed

‎daisy_sequence/js/index.js

Lines changed: 39 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,43 @@ function initialize_drug_events()
134134
};
135135
}
136136

137+
functionopen_filepath(arg,errs_){
138+
if(null===arg.open_filepath){
139+
returntrue;
140+
}
141+
142+
console.log("open_filepath:",arg.open_filepath);
143+
144+
if(typeofarg.open_filepath!=='string'){
145+
DaisyIO.add_errs_(errs_,'bug',"Open","filepath is not string (internal error).");
146+
returnfalse;
147+
}
148+
149+
if(!/\.daisy.*$/.test(arg.open_filepath)){
150+
// 拡張子に".daisy*"を含む("*.daisysequence")
151+
152+
if(/^-psn_0_[0-9]+$/.test(arg.open_filepath)){
153+
// macosxで初回起動時に渡される場合のある""(ex. '-psn_0_2958034')
154+
console.debug("through for macosx:",arg.open_filepath);
155+
returntrue;
156+
}
157+
158+
DaisyIO.add_errs_(errs_,'warning',"Open",'invalid extension (not ".daisy*").');
159+
returnfalse;
160+
}
161+
162+
letdoc_id=daisy.open_doc_from_path(arg.open_filepath,errs_);
163+
if(-1===doc_id){
164+
console.error(arg.open_filepath,errs_);
165+
if(!arg.is_cli_mode){
166+
message_dialog(errs_[0].level,errs_[0].label,errs_[0].message);
167+
}
168+
returnfalse;
169+
}
170+
171+
returntrue;
172+
}
173+
137174
window.onload=function(e){
138175
default_title=document.title;
139176

@@ -148,20 +185,12 @@ window.onload = function(e){
148185
daisy=newDaisy(callback_focus_change,callback_history_change_doc);
149186
daisy.add_event_listener_current_doc_change(callback_current_doc_change);
150187

151-
if(null!==arg.open_filepath){
152-
console.log("open_filepath:",arg.open_filepath);
188+
leterrs_=[];
153189

154-
leterrs_=[];
155-
letdoc_id=daisy.open_doc_from_path(arg.open_filepath,errs_);
190+
if(!open_filepath(arg,errs_)){
156191
for(leti=0;i<errs_.length;i++){
157192
process.stderr.write(sprintf("export[%2d/%2d]%8s:%s\n",i,errs_.length,errs_[i].level,errs_[i].message));
158193
}
159-
if(-1===doc_id){
160-
console.error(arg.open_filepath,errs_);
161-
if(!arg.is_cli_mode){
162-
message_dialog(errs_[0].level,errs_[0].label,errs_[0].message);
163-
}
164-
}
165194
}
166195

167196
if(null!==arg.export_filepath){

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp