morgan/dash-to-panel
1
0
Fork 0
mirror of https://github.com/morgan9e/dash-to-panel synced 2026-04-14 00:04:17 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove new version checker

Browse Source
This commit is contained in:
Jason DeRose
2021-05-03 09:46:24 -04:00
parent 2cc0551666
commit 58fa6edd92
6 changed files with 2 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -2,10 +2,10 @@
UUID = dash-to-panel@jderose9.github.com
BASE_MODULES = extension.js stylesheet.css metadata.json COPYING README.md
EXTRA_MODULES = appIcons.js convenience.js panel.js panelManager.js proximity.js intellihide.js progress.js panelPositions.js panelSettings.js panelStyle.js overview.js taskbar.js transparency.js windowPreview.js prefs.js update.js utils.js Settings.ui
EXTRA_MODULES = appIcons.js convenience.js panel.js panelManager.js proximity.js intellihide.js progress.js panelPositions.js panelSettings.js panelStyle.js overview.js taskbar.js transparency.js windowPreview.js prefs.js utils.js Settings.ui
EXTRA_IMAGES = highlight_stacked_bg.svg highlight_stacked_bg_2.svg highlight_stacked_bg_3.svg
TOLOCALIZE = prefs.js appIcons.js update.js
TOLOCALIZE = prefs.js appIcons.js
MSGSRC = $(wildcard po/*.po)
ifeq ($(strip $(DESTDIR)),)
INSTALLBASE = $(HOME)/.local/share/gnome-shell/extensions
@@ -77,10 +77,6 @@ _build: all
mkdir -p _build
cp $(BASE_MODULES) $(EXTRA_MODULES) _build
ifeq ($(TARGET),ego)
find _build -name '*.js' -exec sed -i '/\/\/!start-update/,/\/\/!end-update/d' {} +
endif
mkdir -p _build/img
cd img ; cp $(EXTRA_IMAGES) ../_build/img/
mkdir -p _build/schemas

141
Settings.ui
View File

@@ -8129,147 +8129,6 @@
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="updates_frame">
<property name="can_focus">False</property>
<property name="margin_top">20</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkListBox" id="updates_listbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<child>
<object class="GtkListBoxRow" id="updates_listboxrow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkGrid" id="updates_grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="margin_right">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">32</property>
<child>
<object class="GtkLabel" id="updates_description">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">This allows you to update the extension directly from the GitHub repository.</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="updates_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Updates</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="updates_check_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Periodically check for updates</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="spacing">6</property>
<child>
<object class="GtkSwitch" id="updates_check_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="updates_check_now_button">
<property name="label" translatable="yes">Check now</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="updates_warning_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_bottom">12</property>
<property name="label" translatable="yes">&lt;span weight="bold" color="#B42B30"&gt;Be aware, these official Dash to Panel releases might not be reviewed yet on extensions.gnome.org!&lt;/span&gt; &lt;a href="https://extensions.gnome.org/about/"&gt;Read more&lt;/a&gt;</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">2</property>
</packing>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>

1
extension.js
View File

@@ -91,7 +91,6 @@ function _enable() {
Me.settings = Convenience.getSettings('org.gnome.shell.extensions.dash-to-panel');
Me.desktopSettings = Convenience.getSettings('org.gnome.desktop.interface');
Me.imports.update.init();
panelManager = new PanelManager.dtpPanelManager();
panelManager.enable();

16
prefs.js
View File

@@ -34,7 +34,6 @@ const Convenience = Me.imports.convenience;
const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']);
const _ = Gettext.gettext;
const N_ = function(e) { return e };
const Update = Me.imports.update;
const PanelSettings = Me.imports.panelSettings;
const Pos = Me.imports.panelPositions;
@@ -2165,21 +2164,6 @@ const Settings = new Lang.Class({
);
});
let updateCheckSwitch = this._builder.get_object('updates_check_switch');
updateCheckSwitch.set_sensitive(false);
this._builder.get_object('updates_check_now_button').connect('clicked', widget => {
this._settings.set_boolean('force-check-update', true);
});
//!start-update
updateCheckSwitch.set_sensitive(true);
this._settings.bind('check-update',
updateCheckSwitch,
'active',
Gio.SettingsBindFlags.DEFAULT);
//!end-update
},
_setPreviewTitlePosition: function() {

9
schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
View File

@@ -64,15 +64,6 @@
<value value='2' nick='PLANK'/>
</enum>
<schema path="/org/gnome/shell/extensions/dash-to-panel/" id="org.gnome.shell.extensions.dash-to-panel">
<key type="b" name="check-update">
<default>false</default>
</key>
<key type="b" name="force-check-update">
<default>false</default>
</key>
<key type="s" name="version-to-install">
<default>''</default>
</key>
<key name="panel-position" enum="org.gnome.shell.extensions.dash-to-panel.position">
<default>'BOTTOM'</default>
<summary>Panel position (Deprecated)</summary>

235
update.js
View File

@@ -1,235 +0,0 @@
/*
* This file is part of the Dash-To-Panel extension for Gnome 3
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
const GLib = imports.gi.GLib;
const Gio = imports.gi.Gio;
const Soup = imports.gi.Soup;
const FileUtils = imports.misc.fileUtils;
const Me = imports.misc.extensionUtils.getCurrentExtension();
const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']);
const _ = Gettext.gettext;
let apiUrl = '';
function init() {
Me.settings.connect('changed::force-check-update', () => {
if (Me.settings.get_boolean('force-check-update')) {
checkForUpdate(true);
Me.settings.set_boolean('force-check-update', false);
}
});
//!start-update
//check for update now, then every 4 hours
checkForUpdate();
imports.mainloop.timeout_add(14400000, () => checkForUpdate());
Me.settings.connect('changed::version-to-install', () => installRelease(Me.settings.get_string('version-to-install'), true));
//!end-update
}
function checkForUpdate(fromSettings) {
if (!apiUrl) {
return notifyError(_('Unavailable when installed from extensions.gnome.org'));
}
//!start-update
if (fromSettings || Me.settings.get_boolean('check-update')) {
getLatestReleaseInfo((err, latestRelease) => {
if (err) {
return notifyError(err);
}
let latestVersion = latestRelease.tag.substring(1);
if (Me.metadata.version < latestVersion && latestRelease.zipUrl) {
notify(
_('Version %s (%s) is available').format(latestVersion, latestRelease.name),
[{ text: _('Details'), func: () => imports.misc.util.spawn(['xdg-open', latestRelease.url]) },
{ text: _('Update'), func: () => installRelease(latestRelease.zipUrl, fromSettings) }]
);
} else if (fromSettings) {
notify(_('Already up to date'));
}
});
}
//!end-update
}
function notifyError(err) {
Me.imports.utils.notify(_('Error: ') + err, 'dialog-error', null, true);
}
function notify(msg, action) {
Me.imports.utils.notify(msg, 'dialog-information', action, true);
}
//!start-update
apiUrl = 'https://api.github.com/repos/home-sweet-gnome/dash-to-panel/';
const tagsApiUrl = apiUrl + 'tags';
const releasesApiUrl = apiUrl + 'releases';
let httpSession;
function getLatestReleaseInfo(cb) {
getReleaseInfo('/latest', cb);
}
function getTaggedReleaseInfo(releaseTag, cb) {
getReleaseInfo('/tags/' + releaseTag, cb);
}
function getReleaseInfo(suffix, cb) {
getHttpMessageResponseBody(createGet(releasesApiUrl + suffix), (err, body) => {
if (err) {
return cb(err);
}
try {
let release = JSON.parse(body.data);
let releaseInfo = {
name: release.name,
tag: release.tag_name,
url: release.html_url,
zipUrl: (release.assets.length ? release.assets[0].browser_download_url : 0),
};
cb(null, releaseInfo);
} catch (e) {
cb(e.message);
}
});
}
function installRelease(releaseAssetUrl, fromSettings) {
getHttpMessageResponseBody(createGet(releaseAssetUrl), (err, body) => {
if (err) {
return notifyInstallResult(err);
}
let name = 'dtp_install';
let zipFile = createTmp(name + '.zip');
let stream = zipFile.replace(null, false, Gio.FileCreateFlags.NONE, null);
let extDir = Gio.file_new_for_path(Me.path);
let tmpDir = createTmp(name, true);
let bckDir = createTmp(Me.uuid, true);
stream.write_bytes(body.flatten().get_as_bytes(), null);
stream.close(null);
unzipFile(zipFile, tmpDir, err => {
if (err) {
return notifyInstallResult(err);
}
try {
FileUtils.recursivelyMoveDir(extDir, bckDir);
FileUtils.recursivelyMoveDir(tmpDir, extDir);
if (fromSettings) {
let [success, out, err, exitCode] = GLib.spawn_command_line_sync('pidof "gnome-shell-extension-prefs"');
if (success && !exitCode) {
GLib.spawn_command_line_sync('kill -9 ' + imports.byteArray.toString(out));
}
}
} catch (e) {
FileUtils.recursivelyDeleteDir(extDir, false);
FileUtils.recursivelyMoveDir(bckDir, extDir);
return notifyInstallResult(e.message);
}
notifyInstallResult(null);
});
});
}
function notifyInstallResult(err) {
if (err) {
notifyError(err);
} else if (imports.gi.Meta.is_wayland_compositor()) {
notify(
_('Update successful, please log out/in'),
{ text: _('Log out'), func: () => new imports.misc.systemActions.getDefault().activateLogout() }
);
} else {
notify(
_('Update successful, please restart GNOME Shell'),
{ text: _('Restart GNOME Shell'), func: () => imports.gi.Meta.restart(_("Restarting GNOME Shell...")) }
);
}
}
function createTmp(name, isDir) {
let tmp = Gio.file_new_for_path('/tmp/' + name);
if (isDir && tmp.query_exists(null)) {
FileUtils.recursivelyDeleteDir(tmp, false);
}
return tmp;
}
function unzipFile(zipFile, destDir, cb) {
let [success, pid] = GLib.spawn_async(
null,
['unzip', '-uod', destDir.get_path(), '--', zipFile.get_path()],
null,
GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD | GLib.SpawnFlags.STDOUT_TO_DEV_NULL,
null
);
if (!success) {
return cb('unzip spawn error');
}
GLib.child_watch_add(GLib.PRIORITY_DEFAULT, pid, (pid, status) => {
GLib.spawn_close_pid(pid);
if (status != 0) {
return cb('extraction error')
}
return cb(null);
});
}
function createGet(url, params) {
return Soup.form_request_new_from_hash('GET', url, params || {});
}
function getHttpMessageResponseBody(message, cb) {
if (!httpSession) {
httpSession = new Soup.Session();
httpSession.user_agent = Me.metadata.uuid;
}
httpSession.queue_message(message, (httpSession, message) => {
try {
if (!message.response_body || !message.response_body.data) {
return cb('No data received');
}
return cb(null, message.response_body);
} catch (e) {
return cb(e.message);
}
});
}
//!end-update