Skip to content

Moving over code Search fix #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shabtaisharon merged 1 commit into from
Apr 3, 2020
Merged

Moving over code Search fix #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Builders/Mac/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

CODESIGN_IDENTITY='Developer ID Application: Spectra Logic Corporation (YAUF7295LE)'

VERSION='5.0.10'
VERSION='5.0.11'

/Library/Java/JavaVirtualMachines/amazon-corretto-8.jdk/Contents/Home/bin/javafxpackager -deploy -native dmg -srcfiles ../../dsb-gui/build/libs/dsb-gui-$VERSION-all.jar -outdir deploy -appclass com.spectralogic.dsbrowser.gui.Main -outfile BlackPearlEonBrowser -name BlackPearlEonBrowser -BappVersion=$VERSION -Bicon=eonbrowse.icns -v

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/

buildscript {
ext.kotlin_version = '1.3.50'
ext.kotlin_version = '1.3.71'

repositories {
maven {
Expand All @@ -35,7 +35,7 @@ plugins {

allprojects {
group = 'com.spectralogic.dsbrowser'
version = '5.0.10'
version = '5.0.11'
}

subprojects {
Expand Down
41 changes: 22 additions & 19 deletions dsb-gui/src/main/java/com/spectralogic/dsbrowser/gui/services/tasks/SearchJobTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@
import com.spectralogic.dsbrowser.gui.services.Workers;
import com.spectralogic.dsbrowser.gui.services.sessionStore.Session;
import com.spectralogic.dsbrowser.gui.util.*;
import com.spectralogic.dsbrowser.util.GuavaCollectors;
import javafx.scene.layout.HBox;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;

public class SearchJobTask extends Ds3Task<List<Ds3TreeTableItem>> {
private final static Logger LOG = LoggerFactory.getLogger(SearchJobTask.class);
Expand Down Expand Up @@ -67,26 +69,27 @@ public SearchJobTask(final List<Bucket> searchableBuckets,
@Override
protected List<Ds3TreeTableItem> call() throws Exception {
try {
final List<Ds3TreeTableItem> list = new ArrayList<>();
searchableBuckets.forEach(bucket -> {
if (bucket.getName().contains(searchText)) {
loggingService.logMessage(StringBuilderUtil.bucketFoundMessage("'" + searchText + "'", bucket.getName()).toString(), LogType.SUCCESS);
final Ds3TreeTableValue value = new Ds3TreeTableValue(bucket.getName(), bucket.getName(), Ds3TreeTableValue.Type.Bucket,
0, StringConstants.TWO_DASH, StringConstants.TWO_DASH, false, null);
list.add(new Ds3TreeTableItem(value.getName(), session, value, workers, ds3Common, dateTimeUtils, loggingService));
} else {
final List<DetailedS3Object> detailedDs3Objects = getDetailedDs3Objects(bucket.getName());
if (Guard.isNotNullAndNotEmpty(detailedDs3Objects)) {
final List<Ds3TreeTableItem> treeTableItems = buildTreeItems(detailedDs3Objects, bucket.getName(), dateTimeUtils);
if (Guard.isNotNullAndNotEmpty(treeTableItems)) {
list.addAll(treeTableItems);
loggingService.logMessage(StringBuilderUtil.searchInBucketMessage(bucket.getName(), list.size()).toString(),
LogType.SUCCESS);
return searchableBuckets.parallelStream().map(Bucket::getName)
.flatMap(bucketName -> {
if (bucketName.contains(searchText)) {
loggingService.logMessage(StringBuilderUtil.bucketFoundMessage("'" + searchText + "'", bucketName).toString(), LogType.SUCCESS);
final Ds3TreeTableValue value = new Ds3TreeTableValue(bucketName, bucketName, Ds3TreeTableValue.Type.Bucket,
0, StringConstants.TWO_DASH, StringConstants.TWO_DASH, false, null);
return Stream.of(new Ds3TreeTableItem(value.getName(), session, value, workers, ds3Common, dateTimeUtils, loggingService));
} else {
final List<DetailedS3Object> detailedDs3Objects = getDetailedDs3Objects(bucketName);
if (Guard.isNotNullAndNotEmpty(detailedDs3Objects)) {
final List<Ds3TreeTableItem> treeTableItems = buildTreeItems(detailedDs3Objects, bucketName, dateTimeUtils);
if (Guard.isNotNullAndNotEmpty(treeTableItems)) {
loggingService.logMessage(StringBuilderUtil.searchInBucketMessage(bucketName, treeTableItems.size()).toString(),
LogType.SUCCESS);
return treeTableItems.stream();
}
}
return Stream.empty();
}
}
}
});
return list;
})
.collect(GuavaCollectors.immutableList());
} catch (final Exception e) {
LOG.error("Search failed", e);
loggingService.logMessage(StringBuilderUtil.searchFailedMessage().append(e).toString(), LogType.ERROR);
Expand Down