Skip to content

Commit da32d69

Browse files
authored
Don't parse image paths as URLs (#697)
Fixes #400
1 parent 0d8f24f commit da32d69

File tree

2 files changed

+10
-19
lines changed

2 files changed

+10
-19
lines changed

core/src/main/java/edu/wpi/grip/core/sources/ImageFileSource.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
import java.io.File;
2121
import java.io.IOException;
2222
import java.io.UnsupportedEncodingException;
23-
import java.net.URLDecoder;
24-
import java.nio.charset.StandardCharsets;
25-
import java.nio.file.Paths;
2623
import java.util.List;
2724
import java.util.Properties;
2825

@@ -51,8 +48,7 @@ public final class ImageFileSource extends Source {
5148
final OutputSocket.Factory outputSocketFactory,
5249
final ExceptionWitness.Factory exceptionWitnessFactory,
5350
@Assisted final File file) throws UnsupportedEncodingException {
54-
this(outputSocketFactory, exceptionWitnessFactory, URLDecoder.decode(Paths.get(file
55-
.toURI()).toString(), StandardCharsets.UTF_8.name()));
51+
this(outputSocketFactory, exceptionWitnessFactory, file.getAbsolutePath());
5652
}
5753

5854
@AssistedInject

core/src/main/java/edu/wpi/grip/core/sources/MultiImageFileSource.java

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import edu.wpi.grip.core.util.ExceptionWitness;
1010
import edu.wpi.grip.core.util.ImageLoadingUtility;
1111

12-
import com.google.common.base.Throwables;
1312
import com.google.common.collect.ImmutableList;
1413
import com.google.common.eventbus.EventBus;
1514
import com.google.common.math.IntMath;
@@ -22,15 +21,11 @@
2221
import java.io.File;
2322
import java.io.IOException;
2423
import java.io.UnsupportedEncodingException;
25-
import java.net.URLDecoder;
26-
import java.nio.charset.StandardCharsets;
27-
import java.nio.file.Paths;
2824
import java.util.Arrays;
2925
import java.util.List;
3026
import java.util.Optional;
3127
import java.util.Properties;
3228
import java.util.concurrent.atomic.AtomicInteger;
33-
import java.util.stream.Collectors;
3429

3530
import static com.google.common.base.Preconditions.checkElementIndex;
3631

@@ -66,15 +61,15 @@ public final class MultiImageFileSource extends Source implements PreviousNext {
6661
final ExceptionWitness.Factory exceptionWitnessFactory,
6762
@Assisted final List<File> files,
6863
@Assisted final int index) throws UnsupportedEncodingException {
69-
this(eventBus, outputSocketFactory, exceptionWitnessFactory, files.stream()
70-
.map(file -> {
71-
try {
72-
return URLDecoder.decode(Paths.get(file.toURI()).toString(),
73-
StandardCharsets.UTF_8.name());
74-
} catch (UnsupportedEncodingException e) {
75-
throw Throwables.propagate(e);
76-
}
77-
}).collect(Collectors.toList()).toArray(new String[files.size()]), index);
64+
this(
65+
eventBus,
66+
outputSocketFactory,
67+
exceptionWitnessFactory,
68+
files.stream()
69+
.map(File::getAbsolutePath)
70+
.toArray(String[]::new),
71+
index
72+
);
7873
}
7974

8075
@AssistedInject

0 commit comments

Comments
 (0)