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

Kai Reinhard
16.22.2019 9584ff38cebcdc3c07b997b281fb475c096889a7
DemoRepos...
2 files modified
20 ■■■■■ changed files
borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java 9 ●●●● patch | view | raw | blame | history
borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java 11 ●●●●● patch | view | raw | blame | history
borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java
@@ -89,13 +89,8 @@
    }
    public List<BorgRepoConfig> getRepoConfigs() {
        if (!ConfigurationHandler.getConfiguration().isShowDemoRepos()) {
            return repoConfigs;
        }
        List<BorgRepoConfig> result = new ArrayList<>();
        result.addAll(repoConfigs);
        DemoRepos.addDemoRepos(result);
        return result;
        DemoRepos.handleDemoRepos(repoConfigs);
        return repoConfigs;
    }
    List<BorgRepoConfig> _getRepoConfigs() {
borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java
@@ -34,8 +34,17 @@
     *
     * @param repositoryList
     */
    public static void addDemoRepos(List<BorgRepoConfig> repositoryList) {
    public static void handleDemoRepos(List<BorgRepoConfig> repositoryList) {
        if (!ConfigurationHandler.getConfiguration().isShowDemoRepos()) {
            // Remove any demo repository if exist due to former settings:
            Iterator<BorgRepoConfig> it = repositoryList.iterator();
            while(it.hasNext()) {
                BorgRepoConfig repoConfig = it.next();
                if (!StringUtils.startsWith(repoConfig.getRepo(), DEMO_IDENTIFIER)) {
                    continue;
                }
                it.remove();
            }
            return;
        }
        init();