WebSVN - OpenConcerto - Diff - Rev 144 and 182 - /trunk/OpenConcerto/src/org/openconcerto/utils/BaseDirs.java

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
- * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ * Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
+ *
  * The contents of this file are subject to the terms of the GNU General Public License Version 3
  * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
  * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
  * language governing permissions and limitations under the License.
     static public final class XDG extends BaseDirs {
         protected XDG(final ProductInfo info, final String subdir) {
             super(info, subdir);
+        }
+        private String getHomePath() {
+            // ATTN on FreeBSD man 8 service : "service command sets HOME to /" thus one should
+            // probably not use this class (perhaps Portable).
+            return StringUtils.coalesce(System.getenv("HOME"), System.getProperty("user.home"));
+        }
+        private String getInHomePath(final String subPath) {
+            final String homePath = getHomePath();
+            // If no home, use current working directory
+            return homePath == null ? subPath : homePath + '/' + subPath;
+        }
         @Override
         protected File _getAppDataFolder() {
             /*
              * $XDG_DATA_HOME defines the base directory relative to which user specific data files
              * should be stored. If $XDG_DATA_HOME is either not set or empty, a default equal to
              * $HOME/.local/share should be used.
              */
-            return new File(StringUtils.coalesce(System.getenv("XDG_DATA_HOME"), System.getenv("HOME") + "/.local/share"), this.getAppID());
+            return new File(StringUtils.coalesce(System.getenv("XDG_DATA_HOME"), getInHomePath(".local/share")), this.getAppID());
+        }
         @Override
         protected File _getPreferencesFolder() {
             /*
              * $XDG_CONFIG_HOME defines the base directory relative to which user specific
              * configuration files should be stored. If $XDG_CONFIG_HOME is either not set or empty,
              * a default equal to $HOME/.config should be used.
              */
-            return new File(StringUtils.coalesce(System.getenv("XDG_CONFIG_HOME"), System.getenv("HOME") + "/.config"), this.getAppID());
+            return new File(StringUtils.coalesce(System.getenv("XDG_CONFIG_HOME"), getInHomePath(".config")), this.getAppID());
+        }
         @Override
         protected File _getCacheFolder() {
             /*
              * $XDG_CACHE_HOME defines the base directory relative to which user specific
              * non-essential data files should be stored. If $XDG_CACHE_HOME is either not set or
              * empty, a default equal to $HOME/.cache should be used.
              */
-            return new File(StringUtils.coalesce(System.getenv("XDG_CACHE_HOME"), System.getenv("HOME") + "/.cache"), this.getAppID());
+            return new File(StringUtils.coalesce(System.getenv("XDG_CACHE_HOME"), getInHomePath(".cache")), this.getAppID());
+        }
+    }
     static public final class Unknown extends BaseDirs {
     protected final String getAppFullID() {
         final String res = this.getInfo().getFullID();
         return res != null ? res : this.getAppID();
+    }
-    protected File getFolderToWrite(final File dir) throws IOException {
+    static public final File getFolderToWrite(final File dir) throws IOException {
+        // MAYBE test for symlink
         if (dir.isDirectory() && dir.canWrite())
             return dir;
         if (dir.exists())
             throw new IOException((dir.isDirectory() ? "Not writable: " : "Not a directory: ") + dir);
         // create with 0700 mode (from § Referencing this specification)
     public final File getAppDataFolderToWrite() throws IOException {
         return getFolderToWrite(this.getAppDataFolder());
+    }
     protected File _getPreferencesFolder() {
-        return this.getAppDataFolder();
+        return this._getAppDataFolder();
+    }
     // where to write configuration
     public final File getPreferencesFolder() {
         return getSubDir(_getPreferencesFolder());
     public final File getCacheFolderToWrite() throws IOException {
         return getFolderToWrite(this.getCacheFolder());
+    }
+    protected File _getStateFolder() {
+        return this._getCacheFolder();
+    }
+    // where to write data that is non-essential but cannot be recreated
+    // - logfiles
+    // - state of application windows on exit
+    // - recently opened files
+    // See STATE directory in https://wiki.debian.org/XDGBaseDirectorySpecification
+    public final File getStateFolder() {
+        return getSubDir(_getStateFolder());
+    }
+    public final File getStateFolderToWrite() throws IOException {
+        return getFolderToWrite(this.getStateFolder());
+    }
     @Override
     public String toString() {
         return BaseDirs.class.getSimpleName() + " " + this.getClass().getSimpleName();
+    }

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/utils/BaseDirs.java - Rev 144 → 182