beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-25 00:50:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'order-improvements'

Browse source
This commit is contained in:
crschnick 2024-06-30 11:12:21 +00:00
parent c986030e8e
commit fa90137e39
3 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java
View file

@ -45,7 +45,6 @@ public class StoreEntryWrapper {
this.entry = entry;
this.name = new SimpleStringProperty(entry.getName());
this.lastAccess = new SimpleObjectProperty<>(entry.getLastAccess().minus(Duration.ofMillis(500)));
this.lastAccessApplied.setValue(lastAccess.getValue());
ActionProvider.ALL.stream()
.filter(dataStoreActionProvider -> {
return !entry.isDisabled()

32
app/src/main/java/io/xpipe/app/comp/store/StoreSortMode.java
View file

@ -1,5 +1,7 @@
package io.xpipe.app.comp.store;
import io.xpipe.core.store.FixedChildStore;
import java.time.Instant;
import java.util.Comparator;
import java.util.List;
@ -45,6 +47,17 @@ public interface StoreSortMode {
}
};
StoreSortMode DATE_DESC = new StoreSortMode() {
private Instant date(StoreSection s) {
var la = s.getWrapper().getLastAccessApplied().getValue();
if (la == null) {
return s.getWrapper().getEntry().getStore() instanceof FixedChildStore ?
Instant.MIN : s.getWrapper().getEntry().getLastAccess();
}
return la;
}
@Override
public StoreSection representative(StoreSection s) {
return Stream.concat(
@ -55,8 +68,8 @@ public interface StoreSortMode {
.isUsable())
.map(this::representative),
Stream.of(s))
.max(Comparator.comparing(section ->
section.getWrapper().getLastAccessApplied().getValue()))
.max(Comparator.comparing(
section -> date(section)))
.orElseThrow();
}
@ -68,11 +81,22 @@ public interface StoreSortMode {
@Override
public Comparator<StoreSection> comparator() {
return Comparator.comparing(e -> {
return e.getWrapper().getLastAccessApplied().getValue();
return date(e);
});
}
};
StoreSortMode DATE_ASC = new StoreSortMode() {
private Instant date(StoreSection s) {
var la = s.getWrapper().getLastAccessApplied().getValue();
if (la == null) {
return s.getWrapper().getEntry().getStore() instanceof FixedChildStore ?
Instant.MAX : s.getWrapper().getEntry().getLastAccess();
}
return la;
}
@Override
public StoreSection representative(StoreSection s) {
return Stream.concat(
@ -96,7 +120,7 @@ public interface StoreSortMode {
@Override
public Comparator<StoreSection> comparator() {
return Comparator.<StoreSection, Instant>comparing(e -> {
return e.getWrapper().getLastAccessApplied().getValue();
return date(e);
})
.reversed();
}

1
app/src/main/java/io/xpipe/app/comp/store/StoreViewState.java
View file

@ -100,6 +100,7 @@ public class StoreViewState {
.setAll(FXCollections.observableArrayList(DataStorage.get().getStoreEntries().stream()
.map(StoreEntryWrapper::new)
.toList()));
allEntries.getList().forEach(e -> e.applyLastAccess());
categories
.getList()
.setAll(FXCollections.observableArrayList(DataStorage.get().getStoreCategories().stream()