Changeset 2913

Timestamp:

Nov 15, 2006, 8:37:31 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Internal subdirectory is now generated taking year, week, day in week and seconds into account
to make sure that not too many files end up in the same directory. The pattern is: yyyy-ww/F-ss
where yyyy = four digit year, ww = two-digit week number of year, F = number of day in week, and
ss = two-digit seconds

File:

• trunk/src/core/net/sf/basedb/core/File.java (modified) (5 diffs)

trunk/src/core/net/sf/basedb/core/File.java

@@ -454 +454 @@
     {
       // an old file exists
-      internalFile = new java.io.File(Application.getUserFilesDirectory(), getInternalName());
+      internalFile = getAbsolutePath(getInternalName());
     }
     if (newInternalFile != null)
@@ -871 +871 @@
       return new ByteArrayInputStream(new byte[0]);
     }
-    java.io.File file = newInternalFile != null ? newInternalFile : new java.io.File(Application.getUserFilesDirectory(), getInternalName());
-    if(!file.exists())
+    java.io.File file = newInternalFile != null ? newInternalFile : getAbsolutePath(getInternalName());
+    if (!file.exists())
     {
       return new ByteArrayInputStream(new byte[0]);
@@ -891 +891 @@
   }
 
-  private static final SimpleDateFormat SUBDIR_FORMAT = new SimpleDateFormat("yyyy-ww");
+  private static final String separator = java.io.File.separator;
+  private static final SimpleDateFormat SUBDIR_FORMAT = 
+    new SimpleDateFormat("yyyy-ww"+separator+"F-ss");
 
   /**
@@ -935 +937 @@
   /**
     Get the relative path of the specified file from the base upload
-    directory.
+    directory and convert directory separator to forward slash.
     @since 2.2
+    @see #getAbsolutePath(String)
   */
   private String getRelativePath(java.io.File file)
@@ -943 +946 @@
     String rootPath = Application.getUserFilesDirectory().getAbsolutePath();
     String relPath = absPath.replace(rootPath, "");
-    if (relPath.startsWith(java.io.File.separator))
-    {
-      relPath = relPath.substring(java.io.File.separator.length());
-    }
+    if (relPath.startsWith(separator))
+    {
+      relPath = relPath.substring(separator.length());
+    }
+    relPath = relPath.replaceAll(separator, "/");
     return relPath;
+  }
+  
+  /**
+    Convert a relative path back to an absolute file path.
+    @since 2.2
+    @see #getRelativePath(java.io.File)
+  */
+  private java.io.File getAbsolutePath(String relativePath)
+  {
+    // Convert forward slash to file system separator
+    relativePath = relativePath.replaceAll("/", separator);
+    return new java.io.File(Application.getUserFilesDirectory(), relativePath);
   }