From 3e8ee00f8652c4a08ca7e3592ce1fb82e5610cfe Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Thu, 21 May 2020 00:12:35 +0200
Subject: [PATCH] Generate UTF paths

---
 webext/js/options_accounts.js | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/webext/js/options_accounts.js b/webext/js/options_accounts.js
index c978845..a3a8150 100644
--- a/webext/js/options_accounts.js
+++ b/webext/js/options_accounts.js
@@ -35,10 +35,8 @@ SysTrayX.Accounts = {
             if (!r[name]) {
               r[name] = { result: [] };
               r.result.push({
-                accountName: accountName,
                 accountId: folder.accountId,
                 name: folder.name,
-                path: folder.path,
                 subFolders: r[name].result,
               });
             }
@@ -47,21 +45,35 @@ SysTrayX.Accounts = {
           }, level);
       });
 
-      return result;
-    }
-
-    function createFolderTree(accountName, folders) {
-      function traverse(folders) {
+      function traverse(path, folders) {
         if (!folders) {
           return;
         }
         for (let f of folders) {
           f.accountName = accountName;
-          traverse(f.subFolders);
+          f.path = path + "/" + f.name;
+          traverse(path + "/" + f.name, f.subFolders);
         }
       }
 
-      traverse(folders);
+      traverse("", result);
+
+      return result;
+    }
+
+    function createFolderTree(accountName, folders) {
+      function traverse(path, folders) {
+        if (!folders) {
+          return;
+        }
+        for (let f of folders) {
+          f.accountName = accountName;
+          f.path = path + "/" + f.name;
+          traverse(path + "/" + f.name, f.subFolders);
+        }
+      }
+
+      traverse("", folders);
 
       return folders;
     }