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

...
Kai Reinhard
13.57.2018 f4ea467ef335b255d57710127559644f77f67a3a
...
1 files deleted
3 files modified
36 ■■■■■ changed files
borgbutler-core/out/test/resources/log4j.properties 8 ●●●●● patch | view | raw | blame | history
borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java 4 ●●●● patch | view | raw | blame | history
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ReposRest.java 18 ●●●● patch | view | raw | blame | history
borgbutler-webapp/src/components/views/repos/RepoListView.jsx 6 ●●●● patch | view | raw | blame | history
borgbutler-core/out/test/resources/log4j.properties
File was deleted
borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java
@@ -63,6 +63,10 @@
        return repositories;
    }
    public void clearRepoInfoCacheAccess() {
        this.repoInfoCacheAccess.clear();
    }
    public RepoList getRepoList(String idOrName) {
        BorgRepoConfig repoConfig = ConfigurationHandler.getConfiguration().getRepoConfig(idOrName);
        //ArchiveInfo archiveInfo = BorgCommands.info(repoConfig, repoConfig.getRepo());
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ReposRest.java
@@ -19,18 +19,6 @@
    private static Logger log = LoggerFactory.getLogger(ReposRest.class);
    @GET
    @Path("refresh")
    @Produces(MediaType.TEXT_PLAIN)
    /**
     * Reloads all templates on the server.
     * @return "OK"
     */
    public String refresh() {
        log.error("refresh not yet implemented.");
        return "FAILED";
    }
    @GET
    @Path("repo")
    @Produces(MediaType.APPLICATION_JSON)
    /**
@@ -49,10 +37,14 @@
    @Produces(MediaType.APPLICATION_JSON)
    /**
     *
     * @param force If true, a reload of all repositories is forced.
     * @param prettyPrinter If true then the json output will be in pretty format.
     * @see JsonUtils#toJson(Object, boolean)
     */
    public String getList(@QueryParam("prettyPrinter") boolean prettyPrinter) {
    public String getList(@QueryParam("force") boolean force, @QueryParam("prettyPrinter") boolean prettyPrinter) {
        if (force) {
            ButlerCache.getInstance().clearRepoInfoCacheAccess();
        }
        List<Repository> repositories = ButlerCache.getInstance().getAllRepositories();
        if (CollectionUtils.isEmpty(repositories)) {
            return "";
borgbutler-webapp/src/components/views/repos/RepoListView.jsx
@@ -19,13 +19,13 @@
        this.fetchRepos();
    };
    fetchRepos = () => {
    fetchRepos = (force) => {
        this.setState({
            isFetching: true,
            failed: false,
            repos: undefined
        });
        fetch(`${this.path}/list`, {
        fetch(`${this.path}/list?force=${force}`, {
            method: 'GET',
            headers: {
                'Accept': 'application/json'
@@ -73,7 +73,7 @@
            content = <React.Fragment>
                <div
                    className={'btn btn-outline-primary refresh-button-right'}
                    onClick={this.fetchRepos}
                    onClick={this.fetchRepos.bind(this, true)}
                >
                    <IconRefresh/>
                </div>