Changeset 1516 for trunk

Timestamp:

03/10/20 16:00:19 (4 years ago)

Author:

bnemhaus

Message:

Fixed an issue with saving (and subsequent loading) of new SampledTrack widgets.

Location:

trunk/src/org

Files:

• apollo/widgets/SampledTrack.java (modified) (3 diffs)
• expeditee/gui/management/ResourceManager.java (modified) (3 diffs)

trunk/src/org/apollo/widgets/SampledTrack.java

@@ -814 +814 @@
                 
                 if (trackModel != null && trackModel.getFilepath() != null &&
-                                trackModel.equals(f.getPath())) {
+                                trackModel.getFilepath().equals(f.getPath())) {
                         
                         // already have loaded
@@ -968 +968 @@
                 // If saving for the file time then get a filename
                 if (trackModel.getFilepath() == null) {
-                        File audioResource = ResourceManager.getAudioResource(localFileName, DisplayController.getCurrentFrame());
+                        Frame parentFrame = this.getParentFrame();
+                        File audioResource = ResourceManager.getAudioUnusedFilename(localFileName, parentFrame);
                         trackModel.setFilepath(audioResource.getAbsolutePath());
                         loadFilenameArgument = localFileName; // set to now local, next load will be local
@@ -1060 +1061 @@
                 //File oldLocalFile = new File(AudioPathManager.AUDIO_HOME_DIRECTORY + localFileName);
                 File oldLocalFile = ResourceManager.getAudioResource(localFileName, getParentFrame());
+                
+                if (oldLocalFile == null) {
+                        //It was never saved and therefore does not need to be deleted.
+                        return;
+                }
+                
                 if (oldLocalFile.isFile() && oldLocalFile.exists()) {
                         try {

trunk/src/org/expeditee/gui/management/ResourceManager.java

@@ -223 +223 @@
         }
         
+        
+        public static File getAudioUnusedFilename(String fileName, Frame parentFrame) {
+                List<String> directories = audio.getDirectories(parentFrame);
+                directories.add(FrameIO.PARENT_FOLDER);
+                for (String directory: directories) {
+                        Path p = Paths.get(directory).resolve(fileName);
+                        File file = p.toFile();
+                        if (!file.exists()) {
+                                return file;
+                        }
+                }
+                
+                return null;
+        }
+        
         public static void invalidateAllResourceDirectories() {
                 commonInvalidated = true;
@@ -230 +245 @@
                 Frame currentFrame = DisplayController.getCurrentFrame();
                 String framesetPath = currentFrame == null ? null : currentFrame.getFramesetPath();
-                frames.refresh(framesetPath);
-                images.refresh(framesetPath);
-                audio.refresh(framesetPath);
+                refreshAll(framesetPath);
+        }
+        
+        private static void refreshAll(String contextPath) {
+                frames.refresh(contextPath);
+                images.refresh(contextPath);
+                audio.refresh(contextPath);
         }
         
@@ -259 +278 @@
                 private List<String> getDirectories(String context) { 
                         if (commonInvalidated) {
-                                ResourceManager.refreshAll();
+                                ResourceManager.refreshAll(context);
                         } else {        
                                 boolean requiresRefresh = context == null || contextFramesetPath == null || !contextFramesetPath.equals(context);