Fix TDIS-6958 by modify directories as file URI path
authoryuhanx.xu <yuhanx.xu@intel.com>
Mon, 2 Sep 2013 05:35:13 +0000 (13:35 +0800)
committerwanmingx.lin <wanmingx.lin@intel.com>
Mon, 2 Sep 2013 11:34:22 +0000 (19:34 +0800)
Signed-off-by: yuhanx.xu <yuhanx.xu@intel.com>
tests/Security/js/main.js

index 058c264..a728cb8 100755 (executable)
@@ -30,14 +30,16 @@ Authors:
 */
 
 var gFiles = [];
-var home_dir = "/opt/home/app",
-    shared_media_dir = "/opt/usr/media",
-    shared_system_dir_1 = "/usr/share",
-    shared_system_dir_2 = "/opt/share",
-    shared_system_dir_3 = "/opt/dbspace",
-    shared_system_dir_4 = "/opt/usr/dbspace",
-    shared_system_dir_5 = "/opt/var/kdb/db",
-    etc_dir = "/etc";
+var home_dir = "file:///opt/home/app",
+    home_delete_dir = "/opt/home/app/",
+    shared_media_dir = "file:///opt/usr/media",
+    media_delete_dir = "internal0/",
+    shared_system_dir_1 = "file:///usr/share",
+    shared_system_dir_2 = "file:///opt/share",
+    shared_system_dir_3 = "file:///opt/dbspace",
+    shared_system_dir_4 = "file:///opt/usr/dbspace",
+    shared_system_dir_5 = "file:///opt/var/kdb/db",
+    etc_dir = "file:///etc";
 var count = 0, homeDir, mediaDir, systemDir, etcDir,
             usrShareDir, optShareDir, optDbshareDir, optUsrDbspaceDir, optVarKdbDbDir;
 var etcFlag = false;
@@ -72,76 +74,75 @@ $(document).ready(function(){
 
     function openDirectory(str, selector) {
         try {
-            tizen.filesystem.resolve(str, function(dir) {
-                dir.listFiles(function(files) {
-                    makeFileList(files, selector);
-                    switch (str) {
-                        case home_dir: {
-                            homeDir = dir;
-                            alert("Open Success");
-                            break;
+            if (str == home_dir || str == shared_media_dir) {
+                tizen.filesystem.resolve(str, function(dir) {
+                    dir.listFiles(function(files) {
+                        makeFileList(files, selector);
+                        switch (str) {
+                            case home_dir: {
+                                homeDir = dir;
+                                alert("Open Success");
+                                break;
+                            }
+                            case shared_media_dir: {
+                                mediaDir = dir;
+                                alert("Open Success");
+                                break;
+                            }
+                            default: break;
                         }
-                        case shared_media_dir: {
-                            mediaDir = dir;
-                            alert("Open Success");
-                            break;
+                    }, function(err) {
+                        alert("Open Fail: " + err.message);
+                    });
+                }, onError, "rw");
+            } else {
+                tizen.filesystem.resolve(str, function(dir) {
+                    dir.listFiles(function(files) {
+                        makeFileList(files, selector);
+                        switch (str) {
+                            //case "/usr/share": {
+                            //    systemDir = dir;
+                            //    alert("Open Success");
+                            //    break;
+                            //}
+                            /* Shared System Directory */
+                            case shared_system_dir_1: {
+                                usrShareDir = dir;
+                                alert("Open Success");
+                                break;
+                            }
+                            case shared_system_dir_2: {
+                                optShareDir = dir;
+                                alert("Open Success");
+                                break;
+                            }
+                            case shared_system_dir_3: {
+                                optDbshareDir = dir;
+                                alert("Open Success");
+                                break;
+                            }
+                            case shared_system_dir_4: {
+                                optUsrDbspaceDir = dir;
+                                alert("Open Success");
+                                break;
+                            }
+                            case shared_system_dir_5: {
+                                optVarKdbDbDir = dir;
+                                alert("Open Success");
+                                break;
+                            }
+                            case etc_dir: {
+                                etcDir = dir;
+                                alert("Open Success");
+                                break;
+                            }
+                            default: break;
                         }
-                        //case "/usr/share": {
-                        //    systemDir = dir;
-                        //    alert("Open Success");
-                        //    break;
-                        //}
-                        /* Shared System Directory */
-                        case shared_system_dir_1: {
-                            usrShareDir = dir;
-                            alert("Open Success");
-                            break;
-                        }
-                        case shared_system_dir_2: {
-                            optShareDir = dir;
-                            alert("Open Success");
-                            break;
-                        }
-                        case shared_system_dir_3: {
-                            optDbshareDir = dir;
-                            alert("Open Success");
-                            break;
-                        }
-                        case shared_system_dir_4: {
-                            optUsrDbspaceDir = dir;
-                            alert("Open Success");
-                            break;
-                        }
-                        case shared_system_dir_5: {
-                            optVarKdbDbDir = dir;
-                            alert("Open Success");
-                            break;
-                        }
-                        case etc_dir: {
-                            etcDir = dir;
-                            alert("Open Success");
-                            break;
-                        }
-                        default: break;
-                    }
-                }, function(err) {
-                    switch (str) {
-                        case home_dir:
-                        case shared_media_dir:
-                        //case "/usr/share":
-                        case shared_system_dir_1:
-                        case shared_system_dir_2:
-                        case shared_system_dir_3:
-                        case shared_system_dir_4:
-                        case shared_system_dir_5:
-                        case etc_dir: {
-                            alert("Open Fail: " + err.message);
-                            break;
-                        }
-                        default: break;
-                    }
-                });
-            }, onError, "rw");
+                    }, function(err) {
+                        alert("Open Fail: " + err.message);
+                    });
+                }, onError, "r");
+            }
         } catch (exc) {
             alert("tizen.filesystem.resolve(" + str + ") exc: " + exc.message);
         }
@@ -268,8 +269,8 @@ function deleteFile(id) {
     var dir, selector;
     try {
         switch (gFiles[Number(id)].path) {
-            case home_dir: dir = homeDir; selector = "#home"; break;
-            case shared_media_dir: dir = mediaDir; selector = "#media"; break;
+            case home_delete_dir: dir = homeDir; selector = "#home"; break;
+            case media_delete_dir: dir = mediaDir; selector = "#media"; break;
             //case "/usr/share": dir = systemDir; selector = "#system"; break;
             default: break;
         }