mirror of
https://github.com/gnosygnu/xowa.git
synced 2026-03-02 03:49:30 +00:00
'v3.8.5.1'
This commit is contained in:
@@ -62,7 +62,7 @@ public class Xog_url_wkr {
|
||||
}
|
||||
private Xoa_url Exec_url_file(Xoae_app app, Xowe_wiki cur_wiki, Xoae_page page, Xog_win_itm win, byte[] href_bry) { // EX: file:///xowa/A.png
|
||||
Xowe_wiki wiki = (Xowe_wiki)page.Commons_mgr().Source_wiki_or(cur_wiki);
|
||||
Io_url href_url = Io_url_.http_any_(String_.new_u8(Gfo_url_encoder_.Http_url.Decode(href_bry)), Op_sys.Cur().Tid_is_wnt());
|
||||
Io_url href_url = Io_url_.New__http_or_fail(String_.new_u8(Gfo_url_encoder_.Http_url.Decode(href_bry)));
|
||||
Gfui_html html_box = win.Active_html_box();
|
||||
byte[] href_bry_encoded = fsys_lnx_encoder.Encode(href_bry); // encode to href_bry; note must encode to same href_bry as Xof_url_bldr, which uses Gfo_url_encoder_.Fsys_lnx; PAGE:en.w:File:Volc<6C>n_Chimborazo,_"El_Taita_Chimborazo".jpg DATE:2015-12-06
|
||||
String xowa_ttl = wiki.Gui_mgr().Cfg_browser().Content_editable()
|
||||
|
||||
@@ -49,14 +49,18 @@ public class Xog_async_wkr {
|
||||
}
|
||||
private static void Async_imgs(Gfo_usr_dlg usr_dlg, Xoae_app app, Xowe_wiki wiki, Xoae_page page, Xog_js_wkr js_wkr) {
|
||||
// get images
|
||||
int len = page.File_queue().Count(); if (len == 0) return;
|
||||
usr_dlg.Prog_one("", "", "downloading images: ~{0}", len);
|
||||
try {page.File_queue().Exec(wiki, page);}
|
||||
catch (Exception e) {usr_dlg.Warn_many("", "", "page.thread.image: page=~{0} err=~{1}", page.Ttl().Raw(), Err_.Message_gplx_full(e));}
|
||||
int len = page.File_queue().Count();
|
||||
if (len > 0) {
|
||||
usr_dlg.Prog_one("", "", "downloading images: ~{0}", len);
|
||||
try {page.File_queue().Exec(wiki, page);}
|
||||
catch (Exception e) {usr_dlg.Warn_many("", "", "page.thread.image: page=~{0} err=~{1}", page.Ttl().Raw(), Err_.Message_gplx_full(e));}
|
||||
}
|
||||
|
||||
// handle packed_gallery and imap
|
||||
// if gallery.packed exists, call pack; NOTE:must fire even when there are 0 items in queue b/c hdump will restore images without placing in queue; PAGE:en.w:Mexico DATE:2016-08-14
|
||||
if (page.Html_data().Xtn_gallery_packed_exists()) // packed_gallery exists; fire js once; PAGE:en.w:National_Sculpture_Museum_(Valladolid); DATE:2014-07-21
|
||||
js_wkr.Html_gallery_packed_exec();
|
||||
|
||||
// call imap
|
||||
if ( page.Html_data().Xtn_imap_exists() // imap exists; DATE:2014-08-07
|
||||
&& page.Html_data().Head_mgr().Itm__popups().Enabled()
|
||||
)
|
||||
|
||||
@@ -23,14 +23,14 @@ public class Xog_error_data {
|
||||
this.err_details = err_details;
|
||||
this.err_msg = err_msg;
|
||||
}
|
||||
public String Full_msg() {return full_msg;} private final String full_msg;
|
||||
public String Err_details() {return err_details;} private final String err_details;
|
||||
public String Err_msg() {return err_msg;} private final String err_msg;
|
||||
public String Full_msg() {return full_msg;} private final String full_msg;
|
||||
public String Err_details() {return err_details;} private final String err_details;
|
||||
public String Err_msg() {return err_msg;} private final String err_msg;
|
||||
public static Xog_error_data new_(String err_msg, String err_trace) {
|
||||
String err_details = String_.Concat_lines_nl_skip_last
|
||||
( "OS: " + Op_sys.Cur().Os_name()
|
||||
, "Java: " + Env_.Env_prop__java_version() + " (" + Op_sys.Cur().Bitness_str() + " bit)"
|
||||
, "Java path: " + Env_.Env_prop("java.home")
|
||||
, "Java: " + System_.Prop__java_version() + " (" + Op_sys.Cur().Bitness_str() + " bit)"
|
||||
, "Java path: " + System_.Prop__java_home()
|
||||
, "XOWA: " + Xoa_app_.Version
|
||||
, "XOWA path: " + Env_.AppUrl().Raw()
|
||||
, ""
|
||||
|
||||
Reference in New Issue
Block a user