Skip to content

Commit dbd15a5

Browse files
authored
Merge pull request #105 from geriyoco/feat/telemetry
Feat/telemetry
2 parents b54ebd3 + b084185 commit dbd15a5

File tree

13 files changed

+447
-77
lines changed

13 files changed

+447
-77
lines changed

.vscodeignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
.vscode-test-web/**
44
out/**
55
node_modules/**
6-
src/**
6+
src/**/*.ts
77
.gitignore
88
.yarnrc
99
webpack.config.js

package-lock.json

Lines changed: 103 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
"vscode": "^1.65.0"
1818
},
1919
"categories": [
20+
"Visualization",
2021
"Data Science",
21-
"Machine Learning",
22-
"Visualization"
22+
"Machine Learning"
2323
],
2424
"keywords": [
2525
"image",
@@ -67,11 +67,18 @@
6767
"type": "string",
6868
"default": null,
6969
"markdownDescription": "Variant collations for certain locales. Possible values include:\n- \"`compat`\" - Arabic\n- \"`dict`\" - Sinhala\n- \"`emoji`\" - root\n- \"`eor`\" - root\n- \"`phonebk`\" - German\n- \"`phonetic`\" - Lingala\n- \"`pinyin`\" - Chinese\n- \"`reformed`\" - Swedish\n- \"`stroke`\" - Chinese\n- \"`trad`\"\n- \"`zhuyin`\" - Chinese"
70+
},
71+
72+
"telemetry.geriyocoImageGallery.isTelemetryEnabled": {
73+
"type": "boolean",
74+
"default": true,
75+
"markdownDescription": "Enable / disable telemetry of this extension. If any of the global telemetry settings, including `telemetryLevel`, `isTelemetryEnabled`, `onDidChangeTelemetryEnabled`, rejects telemetry, this setting will be treated as `false`, i.e. this extension will not send any telemetry."
7076
}
7177
}
7278
},
7379
"customEditors": [
7480
{
81+
"displayName": "Viewer (GeriYoco Image Gallery)",
7582
"viewType": "gryc.viewer",
7683
"priority": "default",
7784
"selector": [
@@ -121,7 +128,6 @@
121128
"@typescript-eslint/parser": "^5.16.0",
122129
"@vscode/test-electron": "^2.1.3",
123130
"@vscode/test-web": "^0.0.24",
124-
"@vscode/codicons": "^0.0.31",
125131
"eslint": "^8.11.0",
126132
"glob": "^7.2.0",
127133
"mocha": "^9.2.2",
@@ -132,6 +138,7 @@
132138
"webpack-cli": "^4.9.2"
133139
},
134140
"dependencies": {
141+
"@vscode/extension-telemetry": "^0.6.2",
135142
"panzoom": "^9.4.2"
136143
}
137144
}

src/custom_typings/index.d.ts renamed to src/custom_typings.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
declare module 'custom_typings' {
32
import * as vscode from 'vscode';
43

src/extension.ts

Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,16 @@
11
import * as vscode from 'vscode';
2-
import { ViewerWebview } from './viewer/viewer';
3-
import { GalleryWebview } from './gallery/gallery';
2+
import * as gallery from './gallery/gallery';
3+
import * as viewer from './viewer/viewer';
4+
import * as telemetry from './telemetry';
45

56
export function activate(context: vscode.ExtensionContext) {
6-
console.log('Welcome! VS Code extension "GeriYoco: Image Gallery" is now active.');
7-
8-
const viewer = new ViewerWebview(context);
9-
const viewerPanel = vscode.window.registerCustomEditorProvider(
10-
ViewerWebview.viewType,
11-
viewer,
12-
{
13-
supportsMultipleEditorsPerDocument: true,
14-
webviewOptions: {
15-
retainContextWhenHidden: true,
16-
}
17-
},
18-
);
19-
context.subscriptions.push(viewerPanel);
20-
21-
const gallery = new GalleryWebview(context);
22-
const disposableGallery = vscode.commands.registerCommand(
23-
'gryc.openGallery',
24-
async (galleryFolder?: vscode.Uri) => {
25-
const panel = await gallery.createPanel(galleryFolder);
26-
panel.webview.onDidReceiveMessage(
27-
message => gallery.messageListener(message, panel.webview),
28-
undefined,
29-
context.subscriptions
30-
);
31-
32-
const fileWatcher = gallery.createFileWatcher(panel.webview, galleryFolder);
33-
context.subscriptions.push(fileWatcher);
34-
panel.onDidDispose(
35-
() => fileWatcher.dispose(),
36-
undefined,
37-
context.subscriptions
38-
);
39-
}
40-
);
41-
context.subscriptions.push(disposableGallery);
7+
telemetry.activate(context);
8+
gallery.activate(context);
9+
viewer.activate(context);
4210
}
4311

44-
export function deactivate() { }
12+
export function deactivate() {
13+
gallery.deactivate();
14+
viewer.deactivate();
15+
telemetry.deactivate();
16+
}

0 commit comments

Comments
 (0)