third_codes/wechat-web-devtools-linux
1
0
Fork 0
mirror of https://github.com/msojocs/wechat-web-devtools-linux.git synced 2025-07-22 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: gsettings孤儿进程 #39

Browse Source
This commit is contained in:
msojocs 2022-04-21 13:00:35 +08:00
parent 8e10e3ddab
commit 5ff4cdc89b
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/core-test
View File

@ -6,6 +6,7 @@ a=$1
if [ "$a" == '1' ];then if [ "$a" == '1' ];then
rm -rf "$root_dir/package.nw/core.wxvpkg.ext" rm -rf "$root_dir/package.nw/core.wxvpkg.ext"
node tools/wxvpkg_unpack.js "$root_dir/package.nw/core.wxvpkg" "$root_dir/package.nw/core.wxvpkg.ext" node tools/wxvpkg_unpack.js "$root_dir/package.nw/core.wxvpkg" "$root_dir/package.nw/core.wxvpkg.ext"
mv "$root_dir/package.nw/core.wxvpkg" "$root_dir/package.nw/core.wxvpkg.orgi"
else else
node tools/wxvpkg_pack.js package.nw/core.wxvpkg.ext package.nw/core.wxvpkg node tools/wxvpkg_pack.js package.nw/core.wxvpkg.ext package.nw/core.wxvpkg
rm -rf ~/.config/wechat-devtools/WeappCache rm -rf ~/.config/wechat-devtools/WeappCache

6
test/theme-check.js
View File

@ -43,6 +43,9 @@ class CheckDark {
// (this._theme = t ? i.Dark : i.Light), // (this._theme = t ? i.Dark : i.Light),
// this._onDidThemeChange.fire(this._theme); // this._onDidThemeChange.fire(this._theme);
}); });
process.on("SIGTERM", (signal) => {
monitor.kill(signal);
});
} catch (err) { } catch (err) {
console.error("尝试监听主题失败！", err); console.error("尝试监听主题失败！", err);
} }
@ -282,6 +285,9 @@ function original() {
this._onDidThemeChange.fire(this._theme); this._onDidThemeChange.fire(this._theme);
}, 400) }, 400)
); );
process.on("SIGTERM", (signal) => {
monitor.kill(signal);
});
} catch (err) { } catch (err) {
console.error("尝试监听主题失败！", err); console.error("尝试监听主题失败！", err);
} }

2
tools/fix-core.sh
View File

@ -79,7 +79,7 @@ sed -i 's/this.registerListeners()/this.monitorTheme()/' $find_result
# replace check func # replace check func
sed -i 's/mediaQuery.matches/isDark/' $find_result sed -i 's/mediaQuery.matches/isDark/' $find_result
# add functions # add functions
sed -i 's#}getDefaultTheme#}get isDark(){try{const{DESKTOP_SESSION}=process.env;console.log(DESKTOP_SESSION);let theme="";switch(DESKTOP_SESSION){case"deepin":theme=execSync(`gsettings get com.deepin.dde.appearance gtk-theme`);break;case"gnome":case"gnome-classic":theme=execSync(`gsettings get org.gnome.desktop.interface ${this.gnomeScheme}`);break;default:break}return theme.includes("dark");}catch(err){console.error("尝试获取主题信息失败，使用默认暗色",err);return true;}}get gnomeScheme(){try{const gnomeVersion=execSync(`gnome-shell --version`).toString().replace(/[\\r\\n]/g,"").split(" ");const gnomeVersionNum=gnomeVersion.length==3?Number(gnomeVersion[2]):0;return gnomeVersionNum>=42?"color-scheme":"gtk-theme";}catch(err){console.error("检查gnome版本失败, 使用gtk-theme", err);return "gtk-theme";}}monitorTheme(){try{let monitor=null;const{DESKTOP_SESSION}=process.env;switch(DESKTOP_SESSION){case"deepin":monitor=spawn("gsettings",["monitor","com.deepin.dde.appearance","gtk-theme",]);break;case"gnome":case"gnome-classic":monitor=spawn("gsettings",["monitor","org.gnome.desktop.interface",this.gnomeScheme,]);break;default:console.warn(`NOT SUPPORTED!!!DESKTOP_SESSION:${DESKTOP_SESSION}`);break}monitor\&\&monitor.on("error",(err)=>{console.error("monitorTheme",err)});monitor\&\&monitor.stdout.on("data",e.debounce((chunk)=>{const data=chunk.toString();const t=data.toLowerCase().includes("dark");(this._theme=t?i.Dark:i.Light),this._onDidThemeChange.fire(this._theme)},400));}catch(err){console.error("尝试监听主题失败！", err);}}getDefaultTheme#' $find_result sed -i 's#}getDefaultTheme#}get isDark(){try{const{DESKTOP_SESSION}=process.env;console.log(DESKTOP_SESSION);let theme="";switch(DESKTOP_SESSION){case"deepin":theme=execSync(`gsettings get com.deepin.dde.appearance gtk-theme`);break;case"gnome":case"gnome-classic":theme=execSync(`gsettings get org.gnome.desktop.interface ${this.gnomeScheme}`);break;default:break}return theme.includes("dark");}catch(err){console.error("尝试获取主题信息失败，使用默认暗色",err);return true;}}get gnomeScheme(){try{const gnomeVersion=execSync(`gnome-shell --version`).toString().replace(/[\\r\\n]/g,"").split(" ");const gnomeVersionNum=gnomeVersion.length==3?Number(gnomeVersion[2]):0;return gnomeVersionNum>=42?"color-scheme":"gtk-theme";}catch(err){console.error("检查gnome版本失败, 使用gtk-theme", err);return "gtk-theme";}}monitorTheme(){try{let monitor=null;const{DESKTOP_SESSION}=process.env;switch(DESKTOP_SESSION){case"deepin":monitor=spawn("gsettings",["monitor","com.deepin.dde.appearance","gtk-theme",]);break;case"gnome":case"gnome-classic":monitor=spawn("gsettings",["monitor","org.gnome.desktop.interface",this.gnomeScheme,]);break;default:console.warn(`NOT SUPPORTED!!!DESKTOP_SESSION:${DESKTOP_SESSION}`);break}monitor\&\&monitor.on("error",(err)=>{console.error("monitorTheme",err)});monitor\&\&monitor.stdout.on("data",e.debounce((chunk)=>{const data=chunk.toString();const t=data.toLowerCase().includes("dark");(this._theme=t?i.Dark:i.Light),this._onDidThemeChange.fire(this._theme)},400));process.on("SIGTERM",(signal)=>{monitor.kill(signal);});}catch(err){console.error("尝试监听主题失败！", err);}}getDefaultTheme#' $find_result
# fix update check # fix update check
find_result=$( grep -lr "whatsnew.html" "$tmp_dir/core.wxvpkg" ) find_result=$( grep -lr "whatsnew.html" "$tmp_dir/core.wxvpkg" )