isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sessionMode: Make loading of external modes asynchronous

Browse Source 
Blocking IO on startup is bad m'kay ...

https://bugzilla.gnome.org/show_bug.cgi?id=689304
This commit is contained in:
Florian Müllner 2012-11-29 18:20:43 +01:00
parent 6b40c3974d
commit 92083eaf76
1 changed files with 44 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
js/ui/sessionMode.js
View File

@ -3,8 +3,10 @@
const Gio = imports.gi.Gio; const Gio = imports.gi.Gio;
const GLib = imports.gi.GLib; const GLib = imports.gi.GLib;
const Lang = imports.lang; const Lang = imports.lang;
const Mainloop = imports.mainloop;
const Signals = imports.signals; const Signals = imports.signals;
const FileUtils = imports.misc.fileUtils;
const Main = imports.ui.main; const Main = imports.ui.main;
const Params = imports.misc.params; const Params = imports.misc.params;
@ -106,68 +108,48 @@ const _modes = {
} }
}; };
function _getModes() { function _getModes(modesLoadedCallback) {
let modes = _modes; FileUtils.collectFromDatadirsAsync('modes',
let dataDirs = GLib.get_system_data_dirs(); { processFile: _loadMode,
for (let i = 0; i < dataDirs.length; i++) { loadedCallback: modesLoadedCallback,
let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', 'modes']); data: _modes });
let dir = Gio.file_new_for_path(path);
try {
dir.query_info('standard:type', Gio.FileQueryInfoFlags.NONE, null);
} catch (e) {
continue;
}
_getModesFromDir(dir, modes);
}
return modes;
} }
function _getModesFromDir(dir, modes) { function _loadMode(file, info, loadedData) {
let fileEnum;
try {
fileEnum = dir.enumerate_children('standard::*',
Gio.FileQueryInfoFlags.NONE, null);
} catch(e) {
return;
}
let info;
while ((info = fileEnum.next_file(null)) != null) {
let name = info.get_name(); let name = info.get_name();
let suffix = name.indexOf('.json'); let suffix = name.indexOf('.json');
let modeName = suffix == -1 ? name : name.slice(name, suffix); let modeName = suffix == -1 ? name : name.slice(name, suffix);
if (modes.hasOwnProperty(modeName)) if (loadedData.hasOwnProperty(modeName))
continue; return;
let file = dir.get_child(name);
let fileContent, success, tag, newMode; let fileContent, success, tag, newMode;
try { try {
[success, fileContent, tag] = file.load_contents(null); [success, fileContent, tag] = file.load_contents(null);
newMode = JSON.parse(fileContent); newMode = JSON.parse(fileContent);
} catch(e) { } catch(e) {
continue; return;
} }
modes[modeName] = {}; loadedData[modeName] = {};
let propBlacklist = ['unlockDialog']; let propBlacklist = ['unlockDialog'];
for (let prop in modes[DEFAULT_MODE]) { for (let prop in loadedData[DEFAULT_MODE]) {
if (newMode[prop] !== undefined && if (newMode[prop] !== undefined &&
propBlacklist.indexOf(prop) == -1) propBlacklist.indexOf(prop) == -1)
modes[modeName][prop]= newMode[prop]; loadedData[modeName][prop]= newMode[prop];
} }
modes[modeName]['isPrimary'] = true; loadedData[modeName]['isPrimary'] = true;
}
fileEnum.close(null);
} }
function listModes() { function listModes() {
let modes = Object.getOwnPropertyNames(_getModes()); _getModes(function(modes) {
for (let i = 0; i < modes.length; i++) let names = Object.getOwnPropertyNames(modes);
if (_modes[modes[i]].isPrimary) for (let i = 0; i < names.length; i++)
print(modes[i]); if (_modes[names[i]].isPrimary)
print(names[i]);
Mainloop.quit('listModes');
});
Mainloop.run('listModes');
} }
const SessionMode = new Lang.Class({ const SessionMode = new Lang.Class({
@ -175,11 +157,18 @@ const SessionMode = new Lang.Class({
_init: function() { _init: function() {
global.connect('notify::session-mode', Lang.bind(this, this._sync)); global.connect('notify::session-mode', Lang.bind(this, this._sync));
this._modes = _getModes(); this._modes = _modes;
let mode = this._modes[global.session_mode].isPrimary ? global.session_mode this._modeStack = [DEFAULT_MODE];
: 'user'; this._sync();
_getModes(Lang.bind(this, function(modes) {
this._modes = modes;
let primary = modes[global.session_mode] &&
modes[global.session_mode].isPrimary;
let mode = primary ? global.session_mode : 'user';
this._modeStack = [mode]; this._modeStack = [mode];
this._sync(); this._sync();
}));
}, },
pushMode: function(mode) { pushMode: function(mode) {