Merge branch 'PGCK-329_fix_lib_load' into 'master'

PGCK-329 added checks

See merge request codekeeper/codekeeper!812

CHANGELOG.md

@@ -13,6 +13,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+- Fixed bug when loading libraries at the same time.
+- Fixed an error when trying to open the New Object wizard.
+
 ## [9.4.2] - 2024-03-13
 
 ### Fixed

CHANGELOG.ru.md

@@ -13,6 +13,9 @@
 
 ### Исправлено
 
+ - Исправлена ошибка при одновременной загрузке библиотек.
+ - Исправлена ошибка при попытке открытия мастера создания новых объектов.
+
 ## [9.4.2] - 2024-03-13
 
 ### Исправлено

ru.taximaxim.codekeeper.core/src/main/java/ru/taximaxim/codekeeper/core/loader/LibraryLoader.java

@@ -19,6 +19,7 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.FileVisitResult;
@@ -205,6 +206,8 @@ private PgDatabase loadURI(URI uri, PgDiffArguments args, boolean isIgnorePriv)
             try (InputStream in = uri.toURL().openStream()) {
                 Files.createDirectories(dir);
                 Files.copy(in, file);
+            } catch (FileAlreadyExistsException e) {
+                // someone else won the race and created the file
             } catch (IOException e) {
                 IOException ioe = new IOException(
                         MessageFormat.format("Error while read library from URI : {0} - {1} ",
@@ -265,8 +268,11 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th
             });
         }
 
-        // rename to expected name
-        Files.move(tempDir, dir, StandardCopyOption.REPLACE_EXISTING);
+        // data racing
+        if (!Files.exists(dir)) {
+            // rename to expected name
+            Files.move(tempDir, dir, StandardCopyOption.REPLACE_EXISTING);
+        }
 
         return dir.toRealPath().toString();
     }

ru.taximaxim.codekeeper.ui/src/ru/taximaxim/codekeeper/ui/pgdbproject/NewObjectPage.java

@@ -157,7 +157,7 @@ private void fillAllowedTypes() {
 
     private void parseFolder(IResource resource) {
         type = allowedTypes.stream()
-                .filter(e -> WorkDirs.getDirectoryNameForType(DatabaseType.PG, type).equals(resource.getName()))
+                .filter(e -> resource.getName().equals(WorkDirs.getDirectoryNameForType(DatabaseType.PG, e)))
                 .findAny().orElse(null);
         IContainer cont = resource.getParent();
         if (cont != null) {