fixed a bug (microsoft#12464)

techwithtim · web-flow · commit e7136b1448d2 · 2020-06-19T18:55:35.000-04:00
diff --git a/src/client/datascience/export/exportBase.ts b/src/client/datascience/export/exportBase.ts
@@ -21,12 +21,35 @@ export class ExportBase implements IExport {
     public async export(_source: Uri, _target: Uri): Promise<void> {}
 
     @reportAction(ReportableAction.PerformingExport)
-    public async executeCommand(source: Uri, args: string[]): Promise<void> {
+    public async executeCommand(source: Uri, target: Uri, args: string[]): Promise<void> {
         const service = await this.getExecutionService(source);
         if (!service) {
             return;
         }
-        await service.execModule('jupyter', ['nbconvert'].concat(args), { throwOnStdErr: false, encoding: 'utf8' });
+
+        const oldFileExists = await this.fileSystem.fileExists(target.fsPath);
+        let oldFileTime;
+        if (oldFileExists) {
+            oldFileTime = (await this.fileSystem.stat(target.fsPath)).mtime;
+        }
+
+        const result = await service.execModule('jupyter', ['nbconvert'].concat(args), {
+            throwOnStdErr: false,
+            encoding: 'utf8'
+        });
+
+        // Need to check if export failed, since throwOnStdErr is not an
+        // indicator of a failed export.
+        if (!(await this.fileSystem.fileExists(target.fsPath))) {
+            throw new Error(result.stderr);
+        } else if (oldFileExists) {
+            // If we exported to a file that already exists we need to check that
+            // this file was actually overriden during export
+            const newFileTime = (await this.fileSystem.stat(target.fsPath)).mtime;
+            if (newFileTime === oldFileTime) {
+                throw new Error(result.stderr);
+            }
+        }
     }
 
     protected async getExecutionService(source: Uri): Promise<IPythonExecutionService | undefined> {
diff --git a/src/client/datascience/export/exportManagerFileOpener.ts b/src/client/datascience/export/exportManagerFileOpener.ts
@@ -31,7 +31,7 @@ export class ExportManagerFileOpener implements IExportManager {
             uri = await this.manager.export(format, model);
         } catch (e) {
             traceError('Export failed', e);
-            await this.showExportFailed(e);
+            this.showExportFailed(e);
             sendTelemetryEvent(Telemetry.ExportNotebookAsFailed, undefined, { format: format });
             return;
         } finally {
@@ -68,11 +68,13 @@ export class ExportManagerFileOpener implements IExportManager {
         await this.documentManager.showTextDocument(doc);
     }
 
-    private async showExportFailed(msg: string) {
-        await this.applicationShell.showErrorMessage(
-            // tslint:disable-next-line: messages-must-be-localized
-            `${getLocString('DataScience.failedExportMessage', 'Export failed')} ${msg}`
-        );
+    private showExportFailed(msg: string) {
+        this.applicationShell
+            .showErrorMessage(
+                // tslint:disable-next-line: messages-must-be-localized
+                `${getLocString('DataScience.failedExportMessage', 'Export failed')} ${msg}`
+            )
+            .then();
     }
 
     private async askOpenFile(uri: Uri): Promise<boolean> {
diff --git a/src/client/datascience/export/exportToHTML.ts b/src/client/datascience/export/exportToHTML.ts
@@ -15,6 +15,6 @@ export class ExportToHTML extends ExportBase {
             '--output-dir',
             path.dirname(target.fsPath)
         ];
-        await this.executeCommand(source, args);
+        await this.executeCommand(source, target, args);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ export class ExportToHTML extends ExportBase {`
`15`	`15`	`'--output-dir',`
`16`	`16`	`path.dirname(target.fsPath)`
`17`	`17`	`];`
`18`		`- await this.executeCommand(source, args);`
	`18`	`+ await this.executeCommand(source, target, args);`
`19`	`19`	`}`
`20`	`20`	`}`