Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2024-09-28 22:40:50 +00:00
Code Issues Projects Releases Wiki Activity

App_update: Add more changes for special page

Browse Source
This commit is contained in:
gnosygnu 2016-11-20 12:57:03 -05:00
parent c9748a6f44
commit 82ade50f5e
5 changed files with 66 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
400_xowa/src/gplx/xowa/addons/apps/updates/dbs/Xoa_app_version_tbl.java
View File

@ -40,7 +40,7 @@ public class Xoa_app_version_tbl implements Db_tbl {
, "ORDER BY version_date"
), date);
Db_rdr rdr = conn.Stmt_sql(sql).Crt_str(fld__version_date, date).Exec_select__rls_auto();
Db_rdr rdr = conn.Stmt_sql(sql).Exec_select__rls_auto();
try {
List_adp list = List_adp_.New();
while (rdr.Move_next()) {

25
400_xowa/src/gplx/xowa/addons/apps/updates/specials/Xoa_update_html.java
View File

@ -22,7 +22,7 @@ class Xoa_update_html extends Xow_special_wtr__base {
@Override protected Io_url Get_addon_dir(Xoa_app app) {return app.Fsys_mgr().Http_root().GenSubDir_nest("bin", "any", "xowa", "addon", "app", "update");}
@Override protected Io_url Get_mustache_fil(Io_url addon_dir) {return addon_dir.GenSubFil_nest("bin", "xoa_update.mustache.html");}
@Override protected Mustache_doc_itm Bld_mustache_root(Xoa_app app) {
Io_url update_db_url = Get_addon_dir(app).GenSubFil("xowa_update_info.sqlite3");
Io_url update_db_url = Get_addon_dir(app).GenSubFil("xoa_update.sqlite3");
Xoa_update_db_mgr db_mgr = new Xoa_update_db_mgr(update_db_url);
return Load(db_mgr);
}
@ -30,18 +30,19 @@ class Xoa_update_html extends Xow_special_wtr__base {
// get from internet
if (gplx.core.ios.IoEngine_system.Web_access_enabled) {
Io_url trg_url = db_mgr.Url();
String src_url = "http://xowa.org/admin/app_update/xowa_update_info.sqlite3";
String src_url = "http://xowa.org/admin/app_update/xoa_update.sqlite3";
Io_mgr.Instance.DownloadFil(src_url, trg_url);
}
// load from db
Xoa_app_version_itm[] db_itms = db_mgr.Tbl__app_version().Select_by_date(Xoa_app_.Build_date);
if (db_itms.length == 0) return new Xoa_update_itm("up-to-date", "", "", "", "", "");
if (db_itms.length == 0) return new Xoa_update_itm__root(Xoa_app_.Version, Xoa_app_.Build_date, "", "up-to-date", "", "", "", "");
// convert to gui itm
Xoa_update_itm head = To_gui_itm(db_itms[0], Find_major(db_itms));
head.Itms_(To_gui_itm(db_itms));
return head;
Xoa_app_version_itm db_itm = db_itms[0];
Xoa_update_itm__root root = new Xoa_update_itm__root(Xoa_app_.Version, Xoa_app_.Build_date, Find_major(db_itms), db_itm.Id(), db_itm.Date(), db_itm.Priority_str(), db_itm.Summary(), db_itm.Details());
root.Itms_(To_gui_itm(db_itms));
return root;
}
private static String Find_major(Xoa_app_version_itm[] db_itms) {
int len = db_itms.length;
@ -51,18 +52,18 @@ class Xoa_update_html extends Xow_special_wtr__base {
if (db_itm.Priority() >= Xoa_app_version_itm.Priority__major)
major = db_itm;
}
return major == null ? "" : String_.Format("({0}) {1}", major.Priority_str(), major.Id());
return major == null ? "" : String_.Format("({0}) {1}: {2}", major.Priority_str(), major.Id(), major.Summary());
}
private static Xoa_update_itm[] To_gui_itm(Xoa_app_version_itm[] db_itms) {
private static Xoa_update_itm__leaf[] To_gui_itm(Xoa_app_version_itm[] db_itms) {
int len = db_itms.length;
Xoa_update_itm[] rv = new Xoa_update_itm[len];
Xoa_update_itm__leaf[] rv = new Xoa_update_itm__leaf[len];
for (int i = 0; i < len; i++) {
rv[i] = To_gui_itm(db_itms[i], "");
rv[i] = To_gui_itm(db_itms[i]);
}
return rv;
}
private static Xoa_update_itm To_gui_itm(Xoa_app_version_itm db_itm, String major) {
return new Xoa_update_itm(db_itm.Id(), db_itm.Date(), db_itm.Priority_str(), db_itm.Summary(), db_itm.Details(), major);
private static Xoa_update_itm__leaf To_gui_itm(Xoa_app_version_itm db_itm) {
return new Xoa_update_itm__leaf(db_itm.Id(), db_itm.Date(), db_itm.Priority_str(), db_itm.Summary(), db_itm.Details());
}
@Override protected void Bld_tags(Xoa_app app, Io_url addon_dir, Xopage_html_data page_data) {

20
400_xowa/src/gplx/xowa/addons/apps/updates/specials/Xoa_update_itm.java → 400_xowa/src/gplx/xowa/addons/apps/updates/specials/Xoa_update_itm__leaf.java
View File

@ -17,34 +17,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.xowa.addons.apps.updates.specials; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.updates.*;
import gplx.langs.mustaches.*;
import gplx.xowa.addons.apps.updates.dbs.*;
class Xoa_update_itm implements Mustache_doc_itm {
private final String version, date, priority, summary, details, major;
private Xoa_update_itm[] itms = Ary__empty;
public Xoa_update_itm(String version, String date, String priority, String summary, String details, String major) {
class Xoa_update_itm__leaf implements Mustache_doc_itm {
private final String version, date, priority, summary, details;
public Xoa_update_itm__leaf(String version, String date, String priority, String summary, String details) {
this.version = version;
this.date = date;
this.priority = priority;
this.summary = summary;
this.details = details;
this.major = major;
}
public void Itms_(Xoa_update_itm[] v) {
this.itms = v;
}
public boolean Mustache__write(String k, Mustache_bfr bfr) {
@gplx.Virtual public boolean Mustache__write(String k, Mustache_bfr bfr) {
if (String_.Eq(k, "version")) bfr.Add_str_u8(version);
else if (String_.Eq(k, "date")) bfr.Add_str_u8(date);
else if (String_.Eq(k, "priority")) bfr.Add_str_u8(priority);
else if (String_.Eq(k, "summary")) bfr.Add_str_u8(summary);
else if (String_.Eq(k, "details")) bfr.Add_str_u8(details);
else if (String_.Eq(k, "major")) bfr.Add_str_u8(major);
return true;
}
public Mustache_doc_itm[] Mustache__subs(String key) {
if (String_.Eq(key, "itms")) return itms;
@gplx.Virtual public Mustache_doc_itm[] Mustache__subs(String key) {
return Mustache_doc_itm_.Ary__empty;
}
private static final Xoa_update_itm[] Ary__empty = new Xoa_update_itm[0];
protected static final Xoa_update_itm__leaf[] Ary__empty = new Xoa_update_itm__leaf[0];
}

43
400_xowa/src/gplx/xowa/addons/apps/updates/specials/Xoa_update_itm__root.java Normal file
View File

@ -0,0 +1,43 @@
/*
XOWA: the XOWA Offline Wiki Application
Copyright (C) 2012 gnosygnu@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.xowa.addons.apps.updates.specials; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.updates.*;
import gplx.langs.mustaches.*;
class Xoa_update_itm__root extends Xoa_update_itm__leaf { private final String current_version, current_date, major;
private Xoa_update_itm__leaf[] itms = Xoa_update_itm__leaf.Ary__empty;
public Xoa_update_itm__root
( String current_version, String current_date, String major
, String version, String date, String priority, String summary, String details
) {super(version, date, priority, summary, details);
this.current_version = current_version;
this.current_date = current_date;
this.major = major;
}
public void Itms_(Xoa_update_itm__leaf[] v) {
this.itms = v;
}
@Override public boolean Mustache__write(String k, Mustache_bfr bfr) {
if (String_.Eq(k, "current_version")) bfr.Add_str_u8(current_version);
else if (String_.Eq(k, "current_date")) bfr.Add_str_u8(current_date);
else if (String_.Eq(k, "major")) bfr.Add_str_u8(major);
return super.Mustache__write (k, bfr);
}
@Override public Mustache_doc_itm[] Mustache__subs(String key) {
if (String_.Eq(key, "itms")) return itms;
return super.Mustache__subs(key);
}
}

3
400_xowa/src/gplx/xowa/guis/views/Xog_win_itm.java
View File

@ -213,6 +213,9 @@ public class Xog_win_itm implements Gfo_invk, Gfo_evt_itm {
}
public void Page__refresh() {
Xog_tab_itm tab = tab_mgr.Active_tab(); Xoae_page page = tab.Page(); Xog_html_itm html_itm = tab.Html_itm();
if (page.Ttl().Ns().Id_is_special()) {
page = page.Wikie().Page_mgr().Load_page(page.Url(), page.Ttl(), tab); // NOTE: must reparse page if (a) Edit -> Read; or (b) "Options" save
}
page.Html_data().Bmk_pos_(html_itm.Html_box().Html_js_eval_proc_as_str(Xog_js_procs.Win__vpos_get));
html_itm.Show(page);
if (page.Url().Anch_str() == null)