Changeset 509

Timestamp:

2007-07-11 01:45:02 (1 year ago)

Author:

MaierMan

Message:

fixing #253: diskSpaceAvailable fails Win/Minefiled, Linux/All

Files:

• trunk/chrome/content/common/internalFunctions.js (modified) (1 diff)
• trunk/chrome/content/dta/manager.js (modified) (3 diffs)

trunk/chrome/content/common/internalFunctions.js

@@ -260 +260 @@
-        },
-        /**
+         * Gets the disk-space available for a nsILocalFile.
+         * Here, because diskSpaceAvailable requires valid path and/or path to be a directory
+         * @param file Valid nsILocalFile
+         * @return the diskspace available to the caller
+         * @author Nils
+         */
+        getFreeDisk: function(file) {
+                while (file) {
+                        if (file.exists() && file.isDirectory()) {
+                                return file.diskSpaceAvailable;
+                        }
+                        file = file.parent;
+                }
+                return 0;
+        },
+        /**
-         * Play a sound file (if prefs allow to do so)
-         * @param name Name of the sound (correpsonding to the pref name and the file name of desired sound)

trunk/chrome/content/dta/manager.js

@@ -1963 +1963 @@
-                                                if (tmp) {
-                                                        vtmp = Utils.validateDir(tmp);
-vtmp.diskSpaceAvailable
+Utils.getFreeDisk(vtmp)
-                                                                d.fail(_("ndsa"), _("spacetemp"), _("freespace"));
-                                                                return;
@@ -1972 +1972 @@
-                                                        throw new Error("invalid destination folder");
-                                                }
-realDest.diskSpaceAvailable
+Utils.getFreeDisk(realDest)
-                                                // Same save path or same disk (we assume that tmp.avail == dst.avail means same disk)
-                                                // simply moving should succeed
-vtmp.diskSpaceAvailable
+Utils.getFreeDisk(vtmp)
-                                                        // we cannot know how much space we will consume after decompressing.
-                                                        // so we assume factor 1.0 for the compressed and factor 1.5 for the decompressed file.
@@ -1981 +1981 @@
-                                                }
-                                                if (nsd < tsd) {
+                                                        Debug.dump("nsd", nsd);
+                                                        Debug.dump("tsd", tsd);
-                                                        d.fail(_("ndsa"), _("spacedir"), _("freespace"));
-                                                        return;