Changeset 83

Timestamp:

08/17/07 22:58:12 (6 years ago)

Author:

saua

Message:

try shorter filenames when IllegalArgumentException? is thrown

File:

• bbtracker/trunk/src/org/bbtracker/mobile/FileTrackStore.java (modified) (3 diffs)

bbtracker/trunk/src/org/bbtracker/mobile/FileTrackStore.java

@@ -66 +66 @@
         public void saveTrack(final Track track) throws TrackStoreException {
                 final String dir = getTrackDirectory();
-                final String filename = getFileName(track);
                 FileConnection connection = null;
                 DataOutputStream dout = null;
                 try {
-                        connection = (FileConnection) Connector.open("file:///" + dir + "/" + filename + EXTENSION,
-                                        Connector.READ_WRITE);
-                        int i = 1;
-                        while (connection.exists()) {
-                                connection.close();
-                                connection = (FileConnection) Connector.open("file:///" + dir + "/" + filename + "_" + (i++) +
-                                                EXTENSION, Connector.WRITE);
-                        }
-                        connection.create();
+                        connection = createTrackFile(dir, track.getName());
                         dout = connection.openDataOutputStream();
                         track.writeToStream(dout);
@@ -104 +95 @@
         }
 
+        private FileConnection createTrackFile(final String dir, final String trackName) throws IOException,
+                        TrackStoreException {
+                final String filename = getFileName(trackName);
+                FileConnection connection = null;
+
+                int i = 0;
+                do {
+                        if (connection != null) {
+                                connection.close();
+                        }
+
+                        String fullName;
+                        if (i == 0) {
+                                fullName = "file:///" + dir + filename + EXTENSION;
+                        } else {
+                                fullName = "file:///" + dir + filename + "_" + i + EXTENSION;
+                        }
+
+                        try {
+                                connection = (FileConnection) Connector.open(fullName, Connector.READ_WRITE);
+                        } catch (final IllegalArgumentException e) {
+                                // some file system don't like file names that are longer than 8.3 (thanks CP/M and DOS!)
+                                if (i == 0) {
+                                        if (filename.length() <= 8) {
+                                                throw new TrackStoreException("Filesystem doesn't accept filename <" + fullName + ">: " +
+                                                                e.getMessage());
+                                        }
+                                        fullName = "file:///" + dir + filename.substring(0, 8) + EXTENSION;
+                                } else {
+                                        final String postfix = "_" + i;
+                                        final int l = 8 - postfix.length();
+                                        fullName = "file:///" + dir + filename.substring(0, l) + postfix + EXTENSION;
+                                }
+                                try {
+                                        connection = (FileConnection) Connector.open(fullName, Connector.READ_WRITE);
+                                } catch (final IllegalArgumentException e2) {
+                                        throw new TrackStoreException("Filesystem doesn't accept filename <" + fullName + ">: " +
+                                                        e2.getMessage());
+                                }
+                        }
+                        i++;
+                } while (connection.exists());
+                connection.create();
+                return connection;
+        }
+
         private String getTrackDirectory() throws TrackStoreException {
                 final String dir = Preferences.getInstance().getTrackDirectory();
@@ -112 +149 @@
         }
 
-        private String getFileName(final Track track) {
-                final String name = track.getName();
-                final char[] chars = name.toCharArray();
+        private String getFileName(final String trackName) {
+                final char[] chars = trackName.toCharArray();
                 for (int i = 0; i < chars.length; i++) {
                         final char c = chars[i];