zoriya/ags
1
0
Fork 0
mirror of https://github.com/zoriya/ags.git synced 2026-06-07 12:15:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

quality of life changes

Browse Source 
* connections prop can take any GObject
* mark Service.register as deprecated
* stop using @ts-ignore
* renamed apps.js to applications.js
* every Service can be imported from service.js
This commit is contained in:
Aylur
2023-09-03 03:04:04 +02:00
parent da979716e1
commit 4761a23bd9
21 changed files with 105 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ags.src.gresource.xml
+2 -1
View File
@@ -6,6 +6,7 @@
<file>client.js</file>
<file>utils.js</file>
<file>widget.js</file>
<file>service.js</file>
<file>widgets/overrides.js</file>
<file>widgets/box.js</file>
@@ -26,7 +27,7 @@
<file>widgets/window.js</file>
<file>service/service.js</file>
<file>service/apps.js</file>
<file>service/applications.js</file>
<file>service/audio.js</file>
<file>service/battery.js</file>
<file>service/bluetooth.js</file>
src/main.ts
+4 -21
View File
@@ -3,16 +3,8 @@ import GLib from 'gi://GLib';
import * as Utils from './utils.js';
import App from './app.js';
import client from './client.js';
import Service from './service/service.js';
import Service from './service.js';
import Widget from './widget.js';
import './service/apps.js';
import './service/audio.js';
import './service/battery.js';
import './service/bluetooth.js';
import './service/hyprland.js';
import './service/mpris.js';
import './service/network.js';
import './service/notifications.js';
const APP_BUS = (name: string) => 'com.github.Aylur.ags.' + name;
const APP_PATH = (name: string) => '/com/github/Aylur/ags/' + name;
@@ -23,23 +15,14 @@ const help = (bin: string) => `USAGE:
OPTIONS:
-h, --help Print this help and exit
-v, --version Print version and exit
-q, --quit Kill AGS
-c, --config Path to the config file. Default: ${DEFAULT_CONF}
-b, --bus-name Bus name of the process
-i, --inspector Open up the Gtk debug tool
-t, --toggle-window Show or hide a window
-r, --run-js Evaluate given string as a function and execute it
-p, --run-promise Evaluate and execute function as Promise
--clear-cache Remove ${Utils.CACHE_DIR}
EXAMPLES
@@ -56,7 +39,7 @@ function isRunning(dbusName: string) {
'/org/freedesktop/DBus',
'org.freedesktop.DBus',
'NameHasOwner',
// @ts-ignore
// @ts-expect-error
GLib.Variant.new_tuple([new GLib.Variant('s', dbusName)]),
new GLib.VariantType('(b)'),
Gio.DBusCallFlags.NONE,
@@ -141,7 +124,7 @@ export function main(args: string[]) {
}
}
// @ts-ignore
// @ts-expect-error
globalThis.ags = {
App,
Utils,
@@ -168,7 +151,7 @@ export function main(args: string[]) {
app.Inspector();
});
// @ts-ignore
// @ts-expect-error
return app.runAsync(null);
}
else {
src/service.ts
+34
View File
@@ -0,0 +1,34 @@
// @ts-nocheck
import Service from './service/service.js';
import Applications from './service/applications.js';
import Audio from './service/audio.js';
import Battery from './service/battery.js';
import Bluetooth from './service/bluetooth.js';
import Hyprland from './service/hyprland.js';
import Mpris from './service/mpris.js';
import Network from './service/network.js';
import Notifications from './service/notifications.js';
export {
Applications,
Audio,
Battery,
Bluetooth,
Hyprland,
Mpris,
Network,
Notifications,
Service,
};
Service.Applications = Applications;
Service.Audio = Audio;
Service.Battery = Battery;
Service.Bluetooth = Bluetooth;
Service.Hyprland = Hyprland;
Service.Mpris = Mpris;
Service.Network = Network;
Service.Notifications = Notifications;
Service.Service = Service;
export default Service;
src/service/apps.ts → src/service/applications.ts
+2 -3
View File
@@ -37,11 +37,11 @@ class Application extends Service {
if (!app.get_icon())
return '';
// @ts-ignore
// @ts-expect-error
if (typeof app.get_icon()?.get_names !== 'function')
return '';
// @ts-ignore
// @ts-expect-error
const name = app.get_icon()?.get_names()[0];
return name || '';
}
@@ -130,7 +130,6 @@ class ApplicationsService extends Service {
}
export default class Applications {
static { Service.export(this, 'Applications'); }
static _instance: ApplicationsService;
static get instance() {
src/service/audio.ts
+4 -5
View File
@@ -3,11 +3,11 @@ import GObject from 'gi://GObject';
import Gvc from 'gi://Gvc';
import { bulkConnect, bulkDisconnect } from '../utils.js';
class Stream extends GObject.Object {
class Stream extends Service {
static {
GObject.registerClass({
Signals: { 'changed': {}, 'closed': {} },
}, this);
Service.register(this, {
'closed': [],
});
}
private _stream: Gvc.MixerStream;
@@ -156,7 +156,6 @@ class AudioService extends Service {
}
export default class Audio {
static { Service.export(this, 'Audio'); }
static _instance: AudioService;
static get instance() {
src/service/battery.ts
-1
View File
@@ -64,7 +64,6 @@ class BatteryService extends Service {
}
export default class Battery {
static { Service.export(this, 'Battery'); }
static _instance: BatteryService;
static get instance() {
src/service/bluetooth.ts
+1 -2
View File
@@ -62,7 +62,7 @@ class Device extends GObject.Object {
class BluetoothService extends Service {
static { Service.register(this); }
// @ts-ignore
// @ts-expect-error
private _client: GnomeBluetooth.Client;
private _devices: Map<string, Device>;
@@ -163,7 +163,6 @@ class BluetoothService extends Service {
}
export default class Bluetooth {
static { Service.export(this, 'Bluetooth'); }
static _instance: BluetoothService;
static get instance() {
src/service/hyprland.ts
+1 -2
View File
@@ -202,7 +202,7 @@ class HyprlandService extends Service {
case 'changefloating': {
const client = this._clients.get(argv[0]);
if (client)
// @ts-ignore
// @ts-expect-error
client.floating = argv[1] === '1';
break;
}
@@ -222,7 +222,6 @@ class HyprlandService extends Service {
}
export default class Hyprland {
static { Service.export(this, 'Hyprland'); }
static _instance: HyprlandService;
static get instance() {
src/service/mpris.ts
+2 -7
View File
@@ -168,11 +168,8 @@ class MprisPlayer extends GObject.Object {
Gio.File.new_for_path(coverPath),
Gio.FileCopyFlags.OVERWRITE,
GLib.PRIORITY_DEFAULT,
null,
// @ts-ignore
null,
// @ts-ignore
(source, result) => {
// @ts-expect-error
null, null, (source, result) => {
try {
source.copy_finish(result);
this.emit('changed');
@@ -314,7 +311,6 @@ class MprisService extends Service {
getPlayer(name: string | ((players: Players) => MprisPlayer) = '') {
if (typeof name === 'function')
// @ts-ignore
return name(new Map(this._players)) || null;
for (const [busName, player] of this._players) {
@@ -326,7 +322,6 @@ class MprisService extends Service {
}
export default class Mpris {
static { Service.export(this, 'Mpris'); }
static _instance: MprisService;
static get instance() {
src/service/network.ts
-1
View File
@@ -237,7 +237,6 @@ class NetworkService extends Service {
}
export default class Network {
static { Service.export(this, 'Network'); }
static _instance: NetworkService;
static get instance() {
src/service/notifications.ts
-1
View File
@@ -260,7 +260,6 @@ class NotificationsService extends Service {
}
export default class Notifications {
static { Service.export(this, 'Notifications'); }
static _instance: NotificationsService;
static get instance() {
src/service/service.ts
+7 -2
View File
@@ -6,6 +6,7 @@ import { type Ctor } from 'gi-types/gobject2.js';
export default class Service extends GObject.Object {
static {
GObject.registerClass({
GTypeName: 'AgsService',
Signals: { 'changed': {} },
}, this);
}
@@ -24,7 +25,7 @@ export default class Service extends GObject.Object {
Object.keys(signals).forEach(signal =>
Signals[signal] = {
param_types: signals[signal].map(t =>
// @ts-ignore
// @ts-expect-error
GObject[`TYPE_${t.toUpperCase()}`]),
},
);
@@ -34,8 +35,11 @@ export default class Service extends GObject.Object {
}
static export(api: { instance: object }, name: string) {
// @ts-ignore
// @ts-expect-error
Service[name] = api;
console.error('Service.register is DEPRECATED.\n' +
"Simply do Service['YourService'] = YourService\n" +
'or just export and import your YourService');
}
connectWidget(
@@ -46,3 +50,4 @@ export default class Service extends GObject.Object {
connect(this, widget, callback, event);
}
}
src/utils.ts
+12 -2
View File
@@ -97,8 +97,18 @@ export function connect(
const bind = service.connect(
event, (_s, ...args: unknown[]) => callback(widget, ...args));
widget.connect('destroy', () => service.disconnect(bind));
timeout(10, () => callback(widget));
widget.connect('destroy', () => {
// @ts-expect-error
widget._destroyed = true;
service.disconnect(bind);
});
GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE, () => {
// @ts-expect-error
if (!widget._destroyed)
callback(widget);
return GLib.SOURCE_REMOVE;
});
}
export function interval(
src/widget.ts
+1 -1
View File
@@ -21,7 +21,7 @@ export default function Widget({ type, ...params }: { type: ctor }) {
return constructor(type, params);
}
// @ts-ignore
// @ts-expect-error
export const Window = (args: object) => constructor(AgsWindow, args);
export const Box = (args: object) => constructor(AgsBox, args);
export const Button = (args: object) => constructor(AgsButton, args);
src/widgets/label.ts
+2 -2
View File
@@ -38,7 +38,7 @@ export default class AgsLabel extends Gtk.Label {
return;
}
// @ts-ignore
// @ts-expect-error
this.ellipsize = Pango.EllipsizeMode[truncate.toUpperCase()];
}
@@ -52,7 +52,7 @@ export default class AgsLabel extends Gtk.Label {
return;
}
// @ts-ignore
// @ts-expect-error
this.justify = Gtk.Justification[justify.toUpperCase()];
}
}
src/widgets/overrides.ts
+2 -2
View File
@@ -66,12 +66,12 @@ Object.defineProperty(Gtk.Widget.prototype, 'style', {
},
});
// @ts-ignore
// @ts-expect-error
Gtk.Widget.prototype.setStyle = function(css: string) {
setStyle(this, css);
};
// @ts-ignore
// @ts-expect-error
Gtk.Widget.prototype.toggleClassName = function(cn: string, condition = true) {
toggleClassName(this, cn, condition);
};
src/widgets/revealer.ts
+2 -3
View File
@@ -31,8 +31,7 @@ export default class AgsRevealer extends Gtk.Revealer {
return;
}
this.transitionType =
// @ts-ignore
Gtk.RevealerTransitionType[transition.toUpperCase()];
// @ts-expect-error
this.transitionType = Gtk.RevealerTransitionType[transition.toUpperCase()];
}
}
src/widgets/scrollable.ts
+2 -2
View File
@@ -62,9 +62,9 @@ export default class AgsScrollable extends Gtk.ScrolledWindow {
policy() {
this.set_policy(
// @ts-ignore
// @ts-expect-error
Gtk.PolicyType[this._hscroll?.toUpperCase() || 'AUTOMATIC'],
// @ts-ignore
// @ts-expect-error
Gtk.PolicyType[this._vscroll?.toUpperCase() || 'AUTOMATIC'],
);
}
src/widgets/shared.ts
+24 -16
View File
@@ -1,16 +1,18 @@
import Gtk from 'gi://Gtk?version=3.0';
import { interval } from '../utils.js';
import GObject from 'gi://GObject';
import { connect, interval } from '../utils.js';
export type Command = string | ((...args: unknown[]) => boolean);
interface ServiceAPI {
instance: {
connectWidget: (
widget: Gtk.Widget,
callback: (widget: Gtk.Widget, ...args: unknown[]) => void,
event?: string
) => void
}
type ConnectWidget = (
widget: Gtk.Widget,
callback: (widget: Gtk.Widget, ...args: unknown[]) => void,
event?: string
) => void
interface Connectable extends GObject.Object {
instance: { connectWidget: ConnectWidget }
connectWidget: ConnectWidget
}
interface CommonParams {
@@ -21,7 +23,7 @@ interface CommonParams {
connections?: (
[string, (...args: unknown[]) => unknown] |
[number, (...args: unknown[]) => unknown] |
[ServiceAPI, (...args: unknown[]) => unknown, string]
[Connectable, (...args: unknown[]) => unknown, string]
)[]
properties?: [string, unknown][]
setup?: (widget: Gtk.Widget) => void
@@ -43,16 +45,16 @@ function parseCommon(widget: Gtk.Widget, {
connections, properties, setup,
}: CommonParams) {
if (className !== undefined)
// @ts-ignore
// @ts-expect-error
widget.className = className;
if (style !== undefined)
// @ts-ignore
// @ts-expect-error
widget.style = style;
if (typeof halign === 'string') {
// @ts-ignore
// @ts-expect-error
const align = Gtk.Align[halign.toUpperCase()];
if (typeof align !== 'number')
console.error('wrong halign value');
@@ -64,7 +66,7 @@ function parseCommon(widget: Gtk.Widget, {
widget.halign = halign;
if (typeof valign === 'string') {
// @ts-ignore
// @ts-expect-error
const align = Gtk.Align[valign.toUpperCase()];
if (typeof align !== 'number')
console.error('wrong valign value');
@@ -77,7 +79,7 @@ function parseCommon(widget: Gtk.Widget, {
if (properties) {
properties.forEach(([key, value]) => {
// @ts-ignore
// @ts-expect-error
widget[`_${key}`] = value;
});
}
@@ -93,8 +95,14 @@ function parseCommon(widget: Gtk.Widget, {
else if (typeof s?.instance?.connectWidget === 'function')
s.instance.connectWidget(widget, callback, event);
else if (typeof s?.connectWidget === 'function')
s.connectWidget(widget, callback, event);
else if (typeof s?.connect === 'function')
connect(s, widget, callback, event);
else
logError(new Error(`${s} is not an instanceof Service`));
logError(new Error(`${s} is not connectable`));
});
}
src/widgets/stack.ts
+1 -1
View File
@@ -74,7 +74,7 @@ export default class AgsStack extends Gtk.Stack {
return;
}
// @ts-ignore
// @ts-expect-error
this.transitionType = Gtk.StackTransitionType[transition.toUpperCase()];
}
src/widgets/window.ts
+2 -2
View File
@@ -115,10 +115,10 @@ export default class AgsWindow extends Gtk.Window {
_margin: number[] | number = [0];
// @ts-ignore
// @ts-expect-error
get margin() { return this._margin; }
// @ts-ignore
// @ts-expect-error
set margin(margin: number[] | number) {
let margins: [side: string, index: number][] = [];
if (typeof margin === 'number')