TeaSpeak/TeaWeb
TeaSpeak/TeaWeb
1
0
Fork 0
Code Issues 1 Pull requests Activity

Updating empty/unset icons when connecting to the target server

Browse source
This commit is contained in:
WolverinDEV 2020-09-26 01:31:29 +02:00 • committed by WolverinDEV
parent d1efa2ba31
commit 0c441e771c
2 changed files with 46 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
shared/js/file/LocalIcons.ts
View file

@ -5,7 +5,7 @@ import {AbstractIconManager, RemoteIcon, RemoteIconState, setIconManager} from "
import * as log from "tc-shared/log"; import * as log from "tc-shared/log";
import {LogCategory, logDebug, logError, logWarn} from "tc-shared/log"; import {LogCategory, logDebug, logError, logWarn} from "tc-shared/log";
import {server_connections} from "tc-shared/ConnectionManager"; import {server_connections} from "tc-shared/ConnectionManager";
import {ConnectionHandler} from "tc-shared/ConnectionHandler"; import {ConnectionEvents, ConnectionHandler, ConnectionState} from "tc-shared/ConnectionHandler";
import {FileTransferState, ResponseTransferTarget, TransferProvider, TransferTargetType} from "tc-shared/file/Transfer"; import {FileTransferState, ResponseTransferTarget, TransferProvider, TransferTargetType} from "tc-shared/file/Transfer";
import {tr} from "tc-shared/i18n/localize"; import {tr} from "tc-shared/i18n/localize";
import {CommandResult} from "tc-shared/connection/ServerConnectionDeclaration"; import {CommandResult} from "tc-shared/connection/ServerConnectionDeclaration";
@ -54,11 +54,51 @@ class LocalRemoteIcon extends RemoteIcon {
export let localIconCache: ImageCache; export let localIconCache: ImageCache;
class IconManager extends AbstractIconManager { class IconManager extends AbstractIconManager {
private cachedIcons: {[key: string]: LocalRemoteIcon} = {}; private cachedIcons: {[key: string]: LocalRemoteIcon} = {};
private connectionStateChangeListener: {[key: string]: (handlerId: string, event: ConnectionEvents["notify_connection_state_changed"]) => void} = {};
private static iconUniqueKey(iconId: number, serverUniqueId: string) : string { private static iconUniqueKey(iconId: number, serverUniqueId: string) : string {
return "v2-" + serverUniqueId + "-" + iconId; return "v2-" + serverUniqueId + "-" + iconId;
} }
constructor() {
super();
server_connections.events().on("notify_handler_created", event => {
this.connectionStateChangeListener[event.handlerId] = this.handleHandlerStateChange.bind(this, event.handlerId);
event.handler.events().on("notify_connection_state_changed", this.connectionStateChangeListener[event.handlerId] as any);
});
server_connections.events().on("notify_handler_deleted", event => {
if(this.connectionStateChangeListener[event.handlerId]) {
event.handler.events().off("notify_connection_state_changed", this.connectionStateChangeListener[event.handlerId] as any);
delete this.connectionStateChangeListener[event.handlerId];
}
});
}
private handleHandlerStateChange(handlerId: string, event: ConnectionEvents["notify_connection_state_changed"]) {
const connection = server_connections.findConnection(handlerId);
if(!connection) {
logWarn(LogCategory.CLIENT, tr("Received handler state changed event for invalid handler id %s"), handlerId);
return;
}
if(event.new_state !== ConnectionState.CONNECTED) {
return;
}
/* update all empty icons */
Object.values(this.cachedIcons).forEach((icon: LocalRemoteIcon) => {
if(icon.serverUniqueId !== connection.getCurrentServerUniqueId()) {
return;
}
if(icon.getState() === "empty") {
this.wrapIconDownload(icon, connection, IconManager.iconUniqueKey(icon.iconId, icon.serverUniqueId)).then(() => {});
}
});
}
resolveIcon(iconId: number, serverUniqueId: string, handlerIdHint: string): RemoteIcon { resolveIcon(iconId: number, serverUniqueId: string, handlerIdHint: string): RemoteIcon {
/* just to ensure */ /* just to ensure */
iconId = iconId >>> 0; iconId = iconId >>> 0;
@ -146,6 +186,10 @@ class IconManager extends AbstractIconManager {
handler = connections[0]; handler = connections[0];
} }
await this.wrapIconDownload(icon, handler, iconUniqueId);
}
private async wrapIconDownload(icon: LocalRemoteIcon, handler: ConnectionHandler, iconUniqueId: string) {
try { try {
await this.downloadIcon(icon, handler, iconUniqueId); await this.downloadIcon(icon, handler, iconUniqueId);
} catch (error) { } catch (error) {

2
shared/js/ui/react-elements/Icon.tsx
View file

@ -35,7 +35,7 @@ export const RemoteIconRenderer = (props: { icon: RemoteIcon, className?: string
return <div key={"loaded"} className={"icon_em client-group_" + props.icon.iconId + " " + props.className} title={props.title} />; return <div key={"loaded"} className={"icon_em client-group_" + props.icon.iconId + " " + props.className} title={props.title} />;
} }
return ( return (
<div key={"icon"} className={"icon-container " + props.className} x-debug-version={2}> <div key={"icon-" + props.icon.iconId} className={"icon-container " + props.className} x-debug-version={2}>
<img style={{ maxWidth: "100%", maxHeight: "100%" }} src={props.icon.getImageUrl()} alt={props.title || ("icon " + props.icon.iconId)} draggable={false} /> <img style={{ maxWidth: "100%", maxHeight: "100%" }} src={props.icon.getImageUrl()} alt={props.title || ("icon " + props.icon.iconId)} draggable={false} />
</div> </div>
); );