5f86e29830
Fix the signal handling; you can't use this.connect('ActiveChanged')
to connect to a D-Bus signal after replacing the signal methods with
the lang.signals versions. Just leave it using the D-Bus signal names,
just like it uses the D-Bus method names.
Also, remove the "_" from "_screenSaverActive", to match what
AutomountManager checks for, and remove getActive(), since it's not
needed.
https://bugzilla.gnome.org/show_bug.cgi?id=654550
279 lines
9.3 KiB
JavaScript
279 lines
9.3 KiB
JavaScript
/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
|
|
|
|
const Lang = imports.lang;
|
|
const DBus = imports.dbus;
|
|
const Mainloop = imports.mainloop;
|
|
const Gio = imports.gi.Gio;
|
|
const Params = imports.misc.params;
|
|
|
|
const Main = imports.ui.main;
|
|
const ShellMountOperation = imports.ui.shellMountOperation;
|
|
const ScreenSaver = imports.misc.screenSaver;
|
|
|
|
// GSettings keys
|
|
const SETTINGS_SCHEMA = 'org.gnome.desktop.media-handling';
|
|
const SETTING_ENABLE_AUTOMOUNT = 'automount';
|
|
|
|
const AUTORUN_EXPIRE_TIMEOUT_SECS = 10;
|
|
|
|
const ConsoleKitSessionIface = {
|
|
name: 'org.freedesktop.ConsoleKit.Session',
|
|
methods: [{ name: 'IsActive',
|
|
inSignature: '',
|
|
outSignature: 'b' }],
|
|
signals: [{ name: 'ActiveChanged',
|
|
inSignature: 'b' }]
|
|
};
|
|
|
|
const ConsoleKitSessionProxy = DBus.makeProxyClass(ConsoleKitSessionIface);
|
|
|
|
const ConsoleKitManagerIface = {
|
|
name: 'org.freedesktop.ConsoleKit.Manager',
|
|
methods: [{ name: 'GetCurrentSession',
|
|
inSignature: '',
|
|
outSignature: 'o' }]
|
|
};
|
|
|
|
function ConsoleKitManager() {
|
|
this._init();
|
|
};
|
|
|
|
ConsoleKitManager.prototype = {
|
|
_init: function() {
|
|
this.sessionActive = true;
|
|
|
|
DBus.system.proxifyObject(this,
|
|
'org.freedesktop.ConsoleKit',
|
|
'/org/freedesktop/ConsoleKit/Manager');
|
|
|
|
DBus.system.watch_name('org.freedesktop.ConsoleKit',
|
|
false, // do not launch a name-owner if none exists
|
|
Lang.bind(this, this._onManagerAppeared),
|
|
Lang.bind(this, this._onManagerVanished));
|
|
},
|
|
|
|
_onManagerAppeared: function(owner) {
|
|
this.GetCurrentSessionRemote(Lang.bind(this, this._onCurrentSession));
|
|
},
|
|
|
|
_onManagerVanished: function(oldOwner) {
|
|
this.sessionActive = true;
|
|
},
|
|
|
|
_onCurrentSession: function(session) {
|
|
this._ckSession = new ConsoleKitSessionProxy(DBus.system, 'org.freedesktop.ConsoleKit', session);
|
|
|
|
this._ckSession.connect
|
|
('ActiveChanged', Lang.bind(this, function(object, isActive) {
|
|
this.sessionActive = isActive;
|
|
}));
|
|
this._ckSession.IsActiveRemote(Lang.bind(this, function(isActive) {
|
|
this.sessionActive = isActive;
|
|
}));
|
|
}
|
|
};
|
|
DBus.proxifyPrototype(ConsoleKitManager.prototype, ConsoleKitManagerIface);
|
|
|
|
function AutomountManager() {
|
|
this._init();
|
|
}
|
|
|
|
AutomountManager.prototype = {
|
|
_init: function() {
|
|
this._settings = new Gio.Settings({ schema: SETTINGS_SCHEMA });
|
|
this._volumeQueue = [];
|
|
|
|
this.ckListener = new ConsoleKitManager();
|
|
|
|
this._ssProxy = new ScreenSaver.ScreenSaverProxy();
|
|
this._ssProxy.connect('ActiveChanged',
|
|
Lang.bind(this,
|
|
this._screenSaverActiveChanged));
|
|
|
|
this._volumeMonitor = Gio.VolumeMonitor.get();
|
|
|
|
this._volumeMonitor.connect('volume-added',
|
|
Lang.bind(this,
|
|
this._onVolumeAdded));
|
|
this._volumeMonitor.connect('volume-removed',
|
|
Lang.bind(this,
|
|
this._onVolumeRemoved));
|
|
this._volumeMonitor.connect('drive-connected',
|
|
Lang.bind(this,
|
|
this._onDriveConnected));
|
|
this._volumeMonitor.connect('drive-disconnected',
|
|
Lang.bind(this,
|
|
this._onDriveDisconnected));
|
|
this._volumeMonitor.connect('drive-eject-button',
|
|
Lang.bind(this,
|
|
this._onDriveEjectButton));
|
|
|
|
Mainloop.idle_add(Lang.bind(this, this._startupMountAll));
|
|
},
|
|
|
|
_screenSaverActiveChanged: function(object, isActive) {
|
|
if (!isActive) {
|
|
this._volumeQueue.forEach(Lang.bind(this, function(volume) {
|
|
this._checkAndMountVolume(volume);
|
|
}));
|
|
}
|
|
|
|
// clear the queue anyway
|
|
this._volumeQueue = [];
|
|
},
|
|
|
|
_startupMountAll: function() {
|
|
let volumes = this._volumeMonitor.get_volumes();
|
|
volumes.forEach(Lang.bind(this, function(volume) {
|
|
this._checkAndMountVolume(volume, { checkSession: false,
|
|
useMountOp: false });
|
|
}));
|
|
|
|
return false;
|
|
},
|
|
|
|
_onDriveConnected: function() {
|
|
// if we're not in the current ConsoleKit session,
|
|
// or screensaver is active, don't play sounds
|
|
if (!this.ckListener.sessionActive)
|
|
return;
|
|
|
|
if (this._ssProxy.screenSaverActive)
|
|
return;
|
|
|
|
global.play_theme_sound(0, 'device-added-media');
|
|
},
|
|
|
|
_onDriveDisconnected: function() {
|
|
// if we're not in the current ConsoleKit session,
|
|
// or screensaver is active, don't play sounds
|
|
if (!this.ckListener.sessionActive)
|
|
return;
|
|
|
|
if (this._ssProxy.screenSaverActive)
|
|
return;
|
|
|
|
global.play_theme_sound(0, 'device-removed-media');
|
|
},
|
|
|
|
_onDriveEjectButton: function(monitor, drive) {
|
|
// TODO: this code path is not tested, as the GVfs volume monitor
|
|
// doesn't emit this signal just yet.
|
|
if (!this.ckListener.sessionActive)
|
|
return;
|
|
|
|
// we force stop/eject in this case, so we don't have to pass a
|
|
// mount operation object
|
|
if (drive.can_stop()) {
|
|
drive.stop
|
|
(Gio.MountUnmountFlags.FORCE, null, null,
|
|
Lang.bind(this, function(drive, res) {
|
|
try {
|
|
drive.stop_finish(res);
|
|
} catch (e) {
|
|
log("Unable to stop the drive after drive-eject-button " + e.toString());
|
|
}
|
|
}));
|
|
} else if (drive.can_eject()) {
|
|
drive.eject_with_operation
|
|
(Gio.MountUnmountFlags.FORCE, null, null,
|
|
Lang.bind(this, function(drive, res) {
|
|
try {
|
|
drive.eject_with_operation_finish(res);
|
|
} catch (e) {
|
|
log("Unable to eject the drive after drive-eject-button " + e.toString());
|
|
}
|
|
}));
|
|
}
|
|
},
|
|
|
|
_onVolumeAdded: function(monitor, volume) {
|
|
this._checkAndMountVolume(volume);
|
|
},
|
|
|
|
_checkAndMountVolume: function(volume, params) {
|
|
params = Params.parse(params, { checkSession: true,
|
|
useMountOp: true });
|
|
|
|
if (params.checkSession) {
|
|
// if we're not in the current ConsoleKit session,
|
|
// don't attempt automount
|
|
if (!this.ckListener.sessionActive)
|
|
return;
|
|
|
|
if (this._ssProxy.screenSaverActive) {
|
|
if (this._volumeQueue.indexOf(volume) == -1)
|
|
this._volumeQueue.push(volume);
|
|
|
|
return;
|
|
}
|
|
}
|
|
|
|
if (!this._settings.get_boolean(SETTING_ENABLE_AUTOMOUNT) ||
|
|
!volume.should_automount() ||
|
|
!volume.can_mount()) {
|
|
// allow the autorun to run anyway; this can happen if the
|
|
// mount gets added programmatically later, even if
|
|
// should_automount() or can_mount() are false, like for
|
|
// blank optical media.
|
|
this._allowAutorun(volume);
|
|
this._allowAutorunExpire(volume);
|
|
|
|
return;
|
|
}
|
|
|
|
if (params.useMountOp) {
|
|
let operation = new ShellMountOperation.ShellMountOperation(volume);
|
|
this._mountVolume(volume, operation.mountOp);
|
|
} else {
|
|
this._mountVolume(volume, null);
|
|
}
|
|
},
|
|
|
|
_mountVolume: function(volume, operation) {
|
|
this._allowAutorun(volume);
|
|
volume.mount(0, operation, null,
|
|
Lang.bind(this, this._onVolumeMounted));
|
|
},
|
|
|
|
_onVolumeMounted: function(volume, res) {
|
|
this._allowAutorunExpire(volume);
|
|
|
|
try {
|
|
volume.mount_finish(res);
|
|
} catch (e) {
|
|
let string = e.toString();
|
|
|
|
// FIXME: needs proper error code handling instead of this
|
|
// See https://bugzilla.gnome.org/show_bug.cgi?id=591480
|
|
if (string.indexOf('No key available with this passphrase') != -1)
|
|
this._reaskPassword(volume);
|
|
else
|
|
log('Unable to mount volume ' + volume.get_name() + ': ' + string);
|
|
}
|
|
},
|
|
|
|
_onVolumeRemoved: function(monitor, volume) {
|
|
this._volumeQueue =
|
|
this._volumeQueue.filter(function(element) {
|
|
return (element != volume);
|
|
});
|
|
},
|
|
|
|
_reaskPassword: function(volume) {
|
|
let operation = new ShellMountOperation.ShellMountOperation(volume, { reaskPassword: true });
|
|
this._mountVolume(volume, operation.mountOp);
|
|
},
|
|
|
|
_allowAutorun: function(volume) {
|
|
volume.allowAutorun = true;
|
|
},
|
|
|
|
_allowAutorunExpire: function(volume) {
|
|
Mainloop.timeout_add_seconds(AUTORUN_EXPIRE_TIMEOUT_SECS, function() {
|
|
volume.allowAutorun = false;
|
|
return false;
|
|
});
|
|
}
|
|
}
|