mirror of https://github.com/micromata/borgbackup-butler.git

Kai Reinhard
24.52.2019 c50335dff01dffab42f4f25639eb14c11d80a70c
Remove duplicated demo repositories.
1 files modified
20 ■■■■■ changed files
borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java 20 ●●●●● patch | view | raw | blame | history
borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java
@@ -38,7 +38,7 @@
        if (!ConfigurationHandler.getConfiguration().isShowDemoRepos()) {
            // Remove any demo repository if exist due to former settings:
            Iterator<BorgRepoConfig> it = repositoryList.iterator();
            while(it.hasNext()) {
            while (it.hasNext()) {
                BorgRepoConfig repoConfig = it.next();
                if (!StringUtils.startsWith(repoConfig.getRepo(), DEMO_IDENTIFIER)) {
                    continue;
@@ -52,6 +52,24 @@
            if (!repositoryList.contains(repo))
                repositoryList.add(repo);
        }
        // Remove duplicate entries (produced by former versions of BorgButler:
        Set<String> set = new HashSet<>();
        Iterator<BorgRepoConfig> it = repositoryList.iterator();
        try {
            while (it.hasNext()) {
                BorgRepoConfig repoConfig = it.next();
                if (!StringUtils.startsWith(repoConfig.getRepo(), DEMO_IDENTIFIER)) {
                    continue;
                }
                if (set.contains(repoConfig.getRepo())) {
                    it.remove();
                } else {
                    set.add(repoConfig.getRepo());
                }
            }
        } catch (Exception ex) {
            // ConcurrentException, ignore it, it's only for demo purposes.
        }
    }
    public static boolean isDemo(String name) {