Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-18 03:45:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Create config_dir if none exist for caching (#35761)

Browse source 
* Create config_dir if none exist for caching

Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>

* remove specialized behaviour for ohos; copy prefs.json if necessary

Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>

* downgrade the log to trace verbosity

Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>

* update wpt-test

Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>

---------

Signed-off-by: Euclid Ye <yezhizhenjiakang@gmail.com>
This commit is contained in:
Euclid Ye 2025-03-19 02:36:33 +08:00 • committed by GitHub
parent 9f93ccd942
commit 86957be5f0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 40 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ports/servoshell/egl/ohos.rs
View file

@ -49,6 +49,7 @@ pub struct InitOpts {
pub os_full_name: String,
/// Path to application data bundled with the servo app, e.g. web-pages.
pub resource_dir: String,
pub cache_dir: String,
pub display_density: f64,
pub commandline_args: String,
}

18
ports/servoshell/egl/ohos/simpleservo.rs
View file

@ -2,6 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use std::cell::RefCell;
use std::fs;
use std::os::raw::c_void;
use std::path::PathBuf;
use std::ptr::NonNull;
@ -40,6 +41,7 @@ pub fn init(
info!("Entered simpleservo init function");
crate::init_crypto();
let resource_dir = PathBuf::from(&options.resource_dir).join("servo");
debug!("Resources are located at: {:?}", resource_dir);
resources::set(Box::new(ResourceReaderInstance::new(resource_dir.clone())));
// It would be nice if `from_cmdline_args()` could accept str slices, to avoid allocations here.
@ -53,8 +55,10 @@ pub fn init(
);
debug!("Servo commandline args: {:?}", args);
let config_dir = PathBuf::from(&options.cache_dir).join("servo");
debug!("Configs are located at: {:?}", config_dir);
let _ = crate::prefs::DEFAULT_CONFIG_DIR
.set(resource_dir)
.set(config_dir.clone())
.inspect_err(|e| {
warn!(
"Default Prefs Dir already previously filled. Got error {}",
@ -62,6 +66,18 @@ pub fn init(
);
});
// Try copy `prefs.json` from {this.context.resource_prefsDir}/servo/
// to `config_dir` if none exist
let source_prefs = resource_dir.join("prefs.json");
let target_prefs = config_dir.join("prefs.json");
if !target_prefs.exists() && source_prefs.exists() {
debug!("Copy {:?} to {:?}", source_prefs, target_prefs);
fs::copy(&source_prefs, &target_prefs).unwrap_or_else(|e| {
debug!("Copy failed! {:?}", e);
0
});
}
let (opts, preferences, servoshell_preferences) = match parse_command_line_arguments(args) {
ArgumentParsingResult::ContentProcess(..) => {
unreachable!("OHOS does not have support for multiprocess yet.")

14
ports/servoshell/prefs.rs
View file

@ -128,7 +128,6 @@ fn get_preferences(opts_matches: &Matches, config_dir: &Option<PathBuf>) -> Pref
let user_prefs_path = config_dir
.clone()
.or_else(default_config_dir)
.map(|path| path.join("prefs.json"))
.filter(|path| path.exists());
let user_prefs_hash = user_prefs_path.map(read_prefs_file).unwrap_or_default();
@ -382,7 +381,18 @@ pub(crate) fn parse_command_line_arguments(args: Vec<String>) -> ArgumentParsing
process::exit(0);
};
let config_dir = opt_match.opt_str("config-dir").map(Into::into);
let config_dir = opt_match
.opt_str("config-dir")
.map(Into::into)
.or_else(default_config_dir)
.inspect(|path| {
if !path.exists() {
fs::create_dir_all(path).unwrap_or_else(|e| {
error!("Failed to create config directory at {:?}: {:?}", path, e)
})
}
});
let mut preferences = get_preferences(&opt_match, &config_dir);
// If this is the content process, we'll receive the real options over IPC. So just fill in