michael/discord-vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: ability to define {lang} and {LANG} in details #84

Browse source
This commit is contained in:
Crawl 2018-11-02 15:33:14 +01:00
parent 7b1b862704
commit aa9fcf94de
No known key found for this signature in database
GPG key ID: E41A6DB922EC2CFE
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/extension.ts
View file

@ -232,8 +232,8 @@ function setActivity(workspaceElapsedTime: boolean = false): void {
if (window.activeTextEditor && window.activeTextEditor.document.fileName === lastKnownFile) { if (window.activeTextEditor && window.activeTextEditor.document.fileName === lastKnownFile) {
activity = { activity = {
...activity, ...activity,
details: generateDetails('detailsDebugging', 'detailsEditing', 'detailsIdle'), details: generateDetails('detailsDebugging', 'detailsEditing', 'detailsIdle', this.largeImageKey),
state: generateDetails('lowerDetailsDebugging', 'lowerDetailsEditing', 'lowerDetailsIdle'), state: generateDetails('lowerDetailsDebugging', 'lowerDetailsEditing', 'lowerDetailsIdle', this.largeImageKey),
smallImageKey: debug.activeDebugSession smallImageKey: debug.activeDebugSession
? 'debug' ? 'debug'
: env.appName.includes('Insiders') : env.appName.includes('Insiders')
@ -260,8 +260,8 @@ function setActivity(workspaceElapsedTime: boolean = false): void {
if (activity) previousTimestamp = activity['startTimestamp']; if (activity) previousTimestamp = activity['startTimestamp'];
// Create a JSON Object with the user's activity information. // Create a JSON Object with the user's activity information.
activity = { activity = {
details: generateDetails('detailsDebugging', 'detailsEditing', 'detailsIdle'), details: generateDetails('detailsDebugging', 'detailsEditing', 'detailsIdle', largeImageKey),
state: generateDetails('lowerDetailsDebugging', 'lowerDetailsEditing', 'lowerDetailsIdle'), state: generateDetails('lowerDetailsDebugging', 'lowerDetailsEditing', 'lowerDetailsIdle', largeImageKey),
startTimestamp: window.activeTextEditor && previousTimestamp && workspaceElapsedTime ? previousTimestamp : window.activeTextEditor ? new Date().getTime() : null, startTimestamp: window.activeTextEditor && previousTimestamp && workspaceElapsedTime ? previousTimestamp : window.activeTextEditor ? new Date().getTime() : null,
largeImageKey: largeImageKey largeImageKey: largeImageKey
? largeImageKey.image ? largeImageKey.image
@ -281,7 +281,7 @@ function setActivity(workspaceElapsedTime: boolean = false): void {
}; };
} }
function generateDetails(debugging, editing, idling): string { function generateDetails(debugging, editing, idling, largeImageKey): string {
const emptySpaces = '\u200b\u200b'; const emptySpaces = '\u200b\u200b';
let string: string = config.get(idling).replace('{null}', emptySpaces); let string: string = config.get(idling).replace('{null}', emptySpaces);
@ -319,7 +319,9 @@ function generateDetails(debugging, editing, idling): string {
checkState ? checkState ?
workspaceFolder.name : workspaceFolder.name :
config.get('lowerDetailsNotFound').replace('{null}', emptySpaces) config.get('lowerDetailsNotFound').replace('{null}', emptySpaces)
); )
.replace('{lang}', largeImageKey ? largeImageKey.image || largeImageKey : 'txt')
.replace('{LANG}', largeImageKey ? (largeImageKey.image || largeImageKey).toUpperCase() : 'TXT');
if (totalLines) rawString = rawString.replace('{totallines}', totalLines); if (totalLines) rawString = rawString.replace('{totallines}', totalLines);
if (size) rawString = rawString.replace('{filesize}', size); if (size) rawString = rawString.replace('{filesize}', size);
if (currentLine) rawString = rawString.replace('{currentline}', currentLine); if (currentLine) rawString = rawString.replace('{currentline}', currentLine);
@ -337,7 +339,9 @@ function generateDetails(debugging, editing, idling): string {
checkState ? checkState ?
workspaceFolder.name : workspaceFolder.name :
config.get('lowerDetailsNotFound').replace('{null}', emptySpaces) config.get('lowerDetailsNotFound').replace('{null}', emptySpaces)
); )
.replace('{lang}', largeImageKey ? largeImageKey.image || largeImageKey : 'txt')
.replace('{LANG}', largeImageKey ? (largeImageKey.image || largeImageKey).toUpperCase() : 'TXT');
if (totalLines) rawString = rawString.replace('{totallines}', totalLines); if (totalLines) rawString = rawString.replace('{totallines}', totalLines);
if (size) rawString = rawString.replace('{filesize}', size); if (size) rawString = rawString.replace('{filesize}', size);
if (currentLine) rawString = rawString.replace('{currentline}', currentLine); if (currentLine) rawString = rawString.replace('{currentline}', currentLine);
@ -383,3 +387,5 @@ function getFileDetails(rawString): FileDetail {
} }
return obj; return obj;
} }
process.on('unhandledRejection', console.error);

3
tsconfig.json
View file

@ -15,6 +15,7 @@
}, },
"exclude": [ "exclude": [
"node_modules", "node_modules",
".vscode-test" ".vscode-test",
"out"
] ]
} }