#805

shanalikhan · Apr 3, 2019 · 57b4bae · 57b4bae
1 parent 691c229
commit 57b4bae
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/src/commons.ts b/src/commons.ts
@@ -148,13 +148,8 @@ export default class Commons {
         const customSettingStr: string = await FileService.ReadFile(
           this.en.FILE_CUSTOMIZEDSETTINGS
         );
-        const tempObj: {
-          [key: string]: any;
-          ignoreUploadSettings: string[];
-        } = JSON.parse(customSettingStr);
-        if (!Array.isArray(tempObj.ignoreUploadSettings)) {
-          tempObj.ignoreUploadSettings = [];
-        }
+        const tempObj = JSON.parse(customSettingStr);
+
         Object.assign(customSettings, tempObj);
         customSettings.token = customSettings.token.trim();
         return customSettings;
@@ -180,13 +175,9 @@ export default class Commons {
 
   public async SetCustomSettings(setting: CustomSettings): Promise<boolean> {
     try {
-      const json: { [key: string]: any; ignoreUploadSettings: string[] } = {
-        ...setting
-      };
-      delete json.ignoreUploadSettings;
       await FileService.WriteFile(
         this.en.FILE_CUSTOMIZEDSETTINGS,
-        JSON.stringify(json, null, 4)
+        JSON.stringify(setting, null, 4)
       );
       return true;
     } catch (e) {
@@ -234,6 +225,14 @@ export default class Commons {
         });
     } else if (customSettings.version < Environment.CURRENT_VERSION) {
       fileChanged = true;
+      // #TODO : Remove this in new update
+      const newIgnoredList = new CustomSettings().ignoreUploadFiles;
+      newIgnoredList.forEach(m => {
+        if (customSettings.ignoreUploadFiles.indexOf(m) === -1) {
+          customSettings.ignoreUploadFiles.push(m);
+        }
+      });
+
       if (this.context.globalState.get("synctoken")) {
         const token = this.context.globalState.get("synctoken");
         if (token !== "") {

diff --git a/src/setting.ts b/src/setting.ts
@@ -44,7 +44,6 @@ export class CustomSettings {
   ];
   public ignoreUploadFolders: string[] = ["workspaceStorage"];
   public ignoreExtensions: string[] = [];
-  public ignoreUploadSettings: string[] = [];
   public gistDescription: string = "Visual Studio Code Settings Sync Gist";
   public version: number = Environment.CURRENT_VERSION;
   public token: string = "";

diff --git a/src/sync.ts b/src/sync.ts
@@ -97,9 +97,7 @@ export class Sync {
         localConfig.customConfig.token,
         localConfig.customConfig.githubEnterpriseUrl
       );
-      // ignoreSettings = await common.GetIgnoredSettings(localConfig.customConfig.ignoreUploadSettings);
       await startGitProcess(localConfig.extConfig, localConfig.customConfig);
-      // await common.SetIgnoredSettings(ignoreSettings);
     } catch (error) {
       Commons.LogException(error, globalCommonService.ERROR_MESSAGE, true);
       return;