better way to solve #18

Author: daimor

Diff for: commands/export.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
 import fs = require('fs');
 import path = require('path');
 import { AtelierAPI } from '../api';
-import { outputChannel, mkdirSyncRecursive, currentWorkspaceFolder, notNull } from '../utils';
+import { outputChannel, mkdirSyncRecursive, notNull, workspaceFolderUri, currentWorkspaceFolder } from '../utils';
 import { PackageNode } from '../explorer/models/packageNode';
 import { ClassNode } from '../explorer/models/classesNode';
 import { RoutineNode } from '../explorer/models/routineNode';
@@ -19,7 +19,6 @@ const filesFilter = (file: any) => {
 const getFileName = (folder: string, name: string, split: boolean, addCategory: boolean): string => {
   let fileNameArray: string[] = name.split('.');
   let fileExt = fileNameArray.pop().toLowerCase();
-  const root = [vscode.workspace.rootPath, currentWorkspaceFolder()].join(path.sep);
   const cat = addCategory
     ? fileExt === 'cls'
       ? 'CLS'
@@ -28,17 +27,18 @@ const getFileName = (folder: string, name: string, split: boolean, addCategory:
       : 'OTH'
     : null;
   if (split) {
-    let fileName = [root, folder, cat, ...fileNameArray].filter(notNull).join(path.sep);
+    let fileName = [folder, cat, ...fileNameArray].filter(notNull).join(path.sep);
     return [fileName, fileExt].join('.');
   }
-  return [root, folder, cat, name].filter(notNull).join(path.sep);
+  return [folder, cat, name].filter(notNull).join(path.sep);
 };
 
-export async function exportFile(name: string, fileName: string): Promise<any> {
-  if (!config('conn').active) {
+export async function exportFile(workspaceFolder: string, name: string, fileName: string): Promise<any> {
+  if (!config('conn', workspaceFolder).active) {
     return;
   }
   const api = new AtelierAPI();
+  api.setConnection(workspaceFolder);
   const log = status => outputChannel.appendLine(`export "${name}" as "${fileName}" - ${status}`);
   const folders = path.dirname(fileName);
   return mkdirSyncRecursive(folders)
@@ -110,49 +110,51 @@ export async function exportFile(name: string, fileName: string): Promise<any> {
     });
 }
 
-export async function exportList(files: string[]): Promise<any> {
+export async function exportList(files: string[], workspaceFolder: string): Promise<any> {
   if (!files || !files.length) {
     vscode.window.showWarningMessage('Nothing to export');
   }
-  const { atelier, folder, maxConcurrentConnections, addCategory } = config('export');
+  const { atelier, folder, maxConcurrentConnections, addCategory } = config('export', workspaceFolder);
 
+  const root = [workspaceFolderUri(workspaceFolder).fsPath, folder].join(path.sep);
   if (maxConcurrentConnections > 0) {
     const limiter = new Bottleneck({
       maxConcurrent: maxConcurrentConnections
     });
     const results = [];
     for (let i = 0; i < files.length; i++) {
       const result = await limiter.schedule(() =>
-        exportFile(files[i], getFileName(folder, files[i], atelier, addCategory))
+        exportFile(workspaceFolder, files[i], getFileName(root, files[i], atelier, addCategory))
       );
       results.push(result);
     }
     return results;
   }
   return Promise.all(
     files.map(file => {
-      exportFile(file, getFileName(folder, file, atelier, addCategory));
+      exportFile(workspaceFolder, file, getFileName(root, file, atelier, addCategory));
     })
   );
 }
 
 export async function exportAll(): Promise<any> {
-  if (!config('conn').active) {
+  const workspaceFolder = currentWorkspaceFolder();
+  if (!config('conn', workspaceFolder).active) {
     return;
   }
   const api = new AtelierAPI();
   outputChannel.show(true);
-  const { category, generated, filter } = config('export');
+  const { category, generated, filter } = config('export', workspaceFolder);
   const files = data => data.result.content.filter(filesFilter).map(file => file.name);
   return api.getDocNames({ category, generated, filter }).then(data => {
-    return exportList(files(data));
+    return exportList(files(data), workspaceFolder);
   });
 }
 
 export async function exportExplorerItem(node: PackageNode | ClassNode | RoutineNode): Promise<any> {
-  if (!config('conn').active) {
+  if (!config('conn', node.workspaceFolder).active) {
     return;
   }
   const items = node instanceof PackageNode ? node.getClasses() : [node.fullName];
-  return exportList(items);
+  return exportList(items, node.workspaceFolder);
 }

Diff for: explorer/models/classesNode.ts

@@ -13,6 +13,10 @@ export class ClassNode extends NodeBase {
     super(label);
   }
 
+  get workspaceFolder(): string {
+    return this._workspaceFolder;
+  }
+
   getTreeItem(): vscode.TreeItem {
     let displayName: string = this.label;
 

Diff for: explorer/models/packageNode.ts

@@ -13,6 +13,10 @@ export class PackageNode extends NodeBase {
     super(label);
   }
 
+  get workspaceFolder(): string {
+    return this._workspaceFolder;
+  }
+
   getTreeItem(): vscode.TreeItem {
     let displayName: string = this.label;
 

Diff for: explorer/models/routineNode.ts

@@ -13,6 +13,10 @@ export class RoutineNode extends NodeBase {
     super(label);
   }
 
+  get workspaceFolder(): string {
+    return this._workspaceFolder;
+  }
+
   getTreeItem(): vscode.TreeItem {
     let displayName: string = this.label;
 

Diff for: utils/index.ts

@@ -86,7 +86,7 @@ export function currentWorkspaceFolder(): string {
   return workspaceFolder || workspaceState.get<string>('workspaceFolder');
 }
 
-export function workspaceFolderUri(workspaceFolder: string): vscode.Uri {
+export function workspaceFolderUri(workspaceFolder: string = currentWorkspaceFolder()): vscode.Uri {
   return vscode.workspace.workspaceFolders.find(el => el.name.toLowerCase() === workspaceFolder.toLowerCase()).uri;
 }