Cfg: Remove more of old cfg system

400_xowa/src/gplx/xowa/apps/cfgs/Xoa_cfg_mgr.java

@@ -21,11 +21,7 @@ public class Xoa_cfg_mgr implements Gfo_invk {
 	private final    Ordered_hash hash = Ordered_hash_.New_bry();
 	public Xoa_cfg_mgr(Xoa_app app) {this.app = app;}
 	public Xoa_app App() {return app;} private final    Xoa_app app;
-	public Xoa_cfg_itm Get_itm_or_null(byte[] grp_key, byte[] itm_key) {
+	Xoa_cfg_itm Get_itm_or_make(byte[] grp_key, byte[] itm_key) {
-		Xoa_cfg_grp grp = (Xoa_cfg_grp)hash.Get_by(grp_key); 
-		return grp == null ? null : grp.Get_by_or_null(itm_key);
-	}
-	public Xoa_cfg_itm Get_itm_or_make(byte[] grp_key, byte[] itm_key) {
 		Xoa_cfg_grp grp = null;
 		Object grp_obj = hash.Get_by(grp_key);
 		if (grp_obj == null) {
@@ -39,7 +35,6 @@ public class Xoa_cfg_mgr implements Gfo_invk {
 	}
 	public void Set_by_app(String grp_key, String val)				{Set(Bry_.new_u8(grp_key), Xoa_cfg_grp_tid.Key_app_bry, val);}
 	public void Set_by_all(String grp_key, String val)				{Set(Bry_.new_u8(grp_key), Xoa_cfg_grp_tid.Key_all_bry, val);}
-	public void Set_by_type(String grp_key, byte tid, String val)	{Set(Bry_.new_u8(grp_key), Xow_domain_tid_.Get_type_as_bry(tid), val);}
 	private void Set(byte[] grp_key, byte[] tid_key, String val)	{Get_itm_or_make(grp_key, tid_key).Val_(val);}
 	public void Init(Xow_wiki wiki) {
 		int len = hash.Count();
@@ -79,24 +74,8 @@ public class Xoa_cfg_mgr implements Gfo_invk {
 				throw Err_.new_unhandled(tid_byte);
 		}
 	}
-	public void Reset_all() {
-		hash.Clear();
-		db_txt.Cfg_reset_all(this);
-	}
-	public void Db_load_txt() {Db_load(db_txt);}
-	public void Db_load(Xoa_cfg_db db) {
-		db.Cfg_load_run(this);
-		this.Db_load_end();
-	}
-	private void Db_load_end() {
-		int len = hash.Count();
-		for (int i = 0; i < len; i++) {
-			Xoa_cfg_grp grp = (Xoa_cfg_grp)hash.Get_at(i);
-			grp.Db_load_end();
-		}
-	}
 	public void Db_save_txt() {Db_save(db_txt);} private final    Xoa_cfg_db_txt db_txt = new Xoa_cfg_db_txt();
-	public void Db_save(Xoa_cfg_db db) {
+	private void Db_save(Xoa_cfg_db db) {
 		int len = hash.Count();
 		db.Cfg_save_bgn(this);
 		for (int i = 0; i < len; i++) {
@@ -110,14 +89,8 @@ public class Xoa_cfg_mgr implements Gfo_invk {
 		Object rslt = app.Gfs_mgr().Run_str_for(invk, msg_str);
 		return rslt != Gfo_invk_.Rv_error;
 	}
-	public Object Eval_get(Gfo_invk invk, String key) {
-		String msg_str = key + ";";
-		return app.Gfs_mgr().Run_str_for(invk, msg_str);
-	}
 	public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
 		if		(ctx.Match(k, Invk_get)) 		return Get_itm_or_make(m.ReadBry("itm_key"), m.ReadBry("grp_key"));
-		else if	(ctx.Match(k, Invk_reset_all)) 	Reset_all();
 		else	return Gfo_invk_.Rv_unhandled;
-		return this;
+	}	private static final String Invk_get = "get";
-	}	private static final String Invk_get = "get", Invk_reset_all = "reset_all";
 }

400_xowa/src/gplx/xowa/apps/fsys/Xoa_fsys_mgr.java

@@ -46,7 +46,6 @@ public class Xoa_fsys_mgr implements Gfo_invk {
 	public Io_url Cfg_lang_core_dir()			{return cfg_lang_core_dir;} private final    Io_url cfg_lang_core_dir;
 	public Io_url Cfg_wiki_core_dir()			{return cfg_wiki_core_dir;} private final    Io_url cfg_wiki_core_dir;
 	public Io_url Cfg_site_meta_fil()			{return cfg_site_meta_fil;} private final    Io_url cfg_site_meta_fil;
-	public Io_url Bin_data_os_cfg_fil()			{return bin_plat_dir.GenSubFil_nest("xowa", "cfg", Xoa_gfs_mgr.Cfg_os);}
 	public Io_url Wiki_css_dir(String wiki)		{return css_dir.GenSubDir_nest(wiki, "html");}							// EX: /xowa/temp/simple.wikipedia.org/html/xowa_common.css
 	public Io_url Wiki_file_dir(String wiki)	{return file_dir.GenSubDir_nest(wiki);}									// EX: /xowa/temp/simple.wikipedia.org/orig/
 	public Io_url Home_wiki_dir()				{return home_wiki_dir;} private final    Io_url home_wiki_dir;

400_xowa/src/gplx/xowa/apps/gfs/Xoa_gfs_mgr.java

@@ -56,9 +56,7 @@ public class Xoa_gfs_mgr implements Gfo_invk, Gfo_invk_root_wkr {
 		Io_url app_data_dir = usr_fsys_mgr.App_data_dir();
 		Io_url url = null;
 		if		(String_.Eq(type, "user_system_cfg"))	url = app_data_dir.GenSubFil_nest("cfg", "user_system_cfg.gfs");
-		else if	(String_.Eq(type, "xowa_cfg_custom"))	url = usr_fsys_mgr.App_data_cfg_custom_fil();
+		else if	(String_.Eq(type, "xowa_cfg_os"))		{url = app_fsys_mgr.Bin_plat_dir().GenSubFil_nest("xowa", "cfg", Cfg_os); Xoa_gfs_mgr_.Cfg_os_assert(url);}
-		else if	(String_.Eq(type, "xowa_cfg_user"))		url = usr_fsys_mgr.App_data_cfg_user_fil();
-		else if	(String_.Eq(type, "xowa_cfg_os"))		{url = app_fsys_mgr.Bin_data_os_cfg_fil(); Xoa_gfs_mgr_.Cfg_os_assert(url);}
 		else if	(String_.Eq(type, "xowa_cfg_app"))		url = app_fsys_mgr.Cfg_app_fil();
 		else											throw Err_.new_wo_type("invalid gfs type", "type", type);
 		try {Run_url(url);}
@@ -76,6 +74,6 @@ public class Xoa_gfs_mgr implements Gfo_invk, Gfo_invk_root_wkr {
 		return this;
 	}	private static final String Invk_run_file_by_type = "run_file_by_type", Invk_fail_if_unhandled_ = "fail_if_unhandled_", Invk_txns = "txns";
 	public static void Msg_parser_init() {GfsCore.Instance.MsgParser_(gplx.langs.gfs.Gfs_msg_bldr.Instance);}
-	public static final String Cfg_user_file = "xowa_user_cfg.gfs", Cfg_user_custom_file = "user_custom_cfg.gfs", Cfg_os = "xowa_cfg_os.gfs";
+	private static final String Cfg_os = "xowa_cfg_os.gfs";
 	public static boolean Fail_if_unhandled = false;
 }

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_mgr.java

@@ -125,7 +125,6 @@ public class Xoi_cmd_mgr implements Gfo_invk {
 		if		(String_.Eq(cmd_key, Gfo_thread_cmd_download.KEY))						return new Gfo_thread_cmd_download().Init("downloading", m.ReadStr("src"), Bry_fmtr_eval_mgr_.Eval_url(app.Url_cmd_eval(), m.ReadBry("trg"))).Url_eval_mgr_(app.Url_cmd_eval()).Owner_(this).Ctor(app.Usr_dlg(), app.Gui_mgr().Kit());
 		else if	(String_.Eq(cmd_key, Gfo_thread_cmd_unzip.KEY))							return new Gfo_thread_cmd_unzip().Url_eval_mgr_(app.Url_cmd_eval()).Owner_(this).Init(app.Usr_dlg(), app.Gui_mgr().Kit(), app.Prog_mgr().App_decompress_bz2(), app.Prog_mgr().App_decompress_zip(), app.Prog_mgr().App_decompress_gz(), Bry_fmtr_eval_mgr_.Eval_url(app.Url_cmd_eval(), m.ReadBry("src")), Bry_fmtr_eval_mgr_.Eval_url(app.Url_cmd_eval(), m.ReadBry("trg")));
 		else if	(String_.Eq(cmd_key, Gfo_thread_cmd_replace.KEY))						return new Gfo_thread_cmd_replace().Url_eval_mgr_(app.Url_cmd_eval()).Owner_(this).Init(app.Usr_dlg(), app.Gui_mgr().Kit(), Bry_fmtr_eval_mgr_.Eval_url(app.Url_cmd_eval(), m.ReadBry("fil")));
-		else if	(String_.Eq(cmd_key, Xoi_cmd_wiki_image_cfg.KEY_dump))					return new Xoi_cmd_wiki_image_cfg(app, Bry_fmtr_eval_mgr_.Eval_url(app.Url_cmd_eval(), m.ReadBry("fil"))).Owner_(this);
 		else if	(String_.Eq(cmd_key, Xoi_cmd_wiki_goto_page.KEY))						return new Xoi_cmd_wiki_goto_page(app, m.ReadStr("v")).Owner_(this);
 		else if	(String_.Eq(cmd_key, Xoi_cmd_msg_ok.KEY))								return new Xoi_cmd_msg_ok(app.Usr_dlg(), app.Gui_mgr().Kit(), m.ReadStr("v")).Owner_(this);
 		else if	(String_.Eq(cmd_key, Xoi_cmd_imageMagick_download.KEY_imageMagick))		return new Xoi_cmd_imageMagick_download(app.Usr_dlg(), app.Gui_mgr().Kit(), Bry_fmtr_eval_mgr_.Eval_url(app.Url_cmd_eval(), m.ReadBry("trg"))).Owner_(this);

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_image_cfg.java

@@ -1,28 +0,0 @@
-/*
-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.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
-import gplx.core.threads.*;
-class Xoi_cmd_wiki_image_cfg extends Gfo_thread_cmd_replace implements Gfo_thread_cmd {	public Xoi_cmd_wiki_image_cfg(Xoae_app app, Io_url url) {this.app = app; super.Init(app.Usr_dlg(), app.Gui_mgr().Kit(), url);} private Xoae_app app;
-	@Override public void Async_run() {
-		super.Async_run();
-		app.Cfg_mgr().Set_by_app("app.files.download.enabled", "y");
-		app.Cfg_mgr().Db_save_txt();
-	}
-	static final String GRP_KEY = "xowa.thread.dump.image_cfg";
-	public static final String KEY_dump = "wiki.image_cfg";
-}

400_xowa/src/gplx/xowa/specials/xowa/system_data/System_data_page.java

@@ -49,21 +49,16 @@ public class System_data_page implements Xow_special_page {
 			case Type_log_session:			return app.Log_wtr().Session_fil();
 			case Type_cfg_app:				return app.Fsys_mgr().Cfg_app_fil();
 			case Type_cfg_lang:				return Xol_lang_itm_.xo_lang_fil_(app.Fsys_mgr(), wiki.Lang().Key_str());
-			case Type_cfg_user:				return app.Usere().Fsys_mgr().App_data_cfg_user_fil();
-			case Type_cfg_custom:			return app.Usere().Fsys_mgr().App_data_cfg_custom_fil();
 			case Type_usr_history:			return app.Usere().Fsys_mgr().App_data_history_fil();
 			default:						return null;
 		}
 	}
-
 	private static final    byte[] Arg_type = Bry_.new_a7("type");
-	private static final byte Type_log_session = 1, Type_cfg_app = 2, Type_cfg_lang = 3, Type_cfg_user = 4, Type_cfg_custom = 5, Type_usr_history = 6;
+	private static final byte Type_log_session = 1, Type_cfg_app = 2, Type_cfg_lang = 3, Type_usr_history = 6;
 	private static final    Hash_adp_bry type_hash = Hash_adp_bry.cs()
 	.Add_str_byte("log_session"		, Type_log_session)
 	.Add_str_byte("cfg_app"			, Type_cfg_app)
 	.Add_str_byte("cfg_lang"		, Type_cfg_lang)
-	.Add_str_byte("cfg_user"		, Type_cfg_user)
-	.Add_str_byte("cfg_custom"		, Type_cfg_custom)
 	.Add_str_byte("usr_history"		, Type_usr_history)
 	;
 	private Bry_fmtr fmtr_all = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last

400_xowa/src/gplx/xowa/users/Xou_fsys_mgr.java

@@ -35,8 +35,6 @@ public class Xou_fsys_mgr implements Gfo_invk {
 	public Io_url App_temp_html_dir()			{return app_temp_html_dir;} private Io_url app_temp_html_dir;
 	public Io_url App_data_dir()				{return app_root_dir.GenSubDir_nest("data");}
 	public Io_url App_data_cfg_dir()			{return app_root_dir.GenSubDir_nest("data", "cfg");}
-	public Io_url App_data_cfg_user_fil()		{return app_root_dir.GenSubFil_nest("data", "cfg", Xoa_gfs_mgr.Cfg_user_file);}
-	public Io_url App_data_cfg_custom_fil()		{return app_root_dir.GenSubFil_nest("data", "cfg", Xoa_gfs_mgr.Cfg_user_custom_file);}
 	public static final String Name_user_system_cfg = "user_system_cfg.gfs";
 	public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
 		if		(ctx.Match(k, Invk_root_dir))		return cur_root;