Mangrana
/
MangranaCommons
1
0
Fork 0
Code

some improvements and bugfixes. Reached stable version in "production"

This commit is contained in:
xeviff 2022-11-05 22:02:02 +01:00
parent ad33ab73be
commit 807a723506
3 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -90,4 +90,12 @@
</plugins>
</build>
<distributionManagement>
<repository>
<id>hack3</id>
<name>My self-hosted maven repo</name>
<url>https://mavenrepo.hack3.cat/snapshots</url>
</repository>
</distributionManagement>
</project>

1
src/main/java/tv/mangrana/plex/url/PlexLibrarySectionsResolver.java
View File

@ -34,6 +34,7 @@ public class PlexLibrarySectionsResolver {
String directoryNodeOfLocation = getDirectoryKeyValue(xmlDocument, xPath, startingLocationText);
if (directoryNodeOfLocation == null) {
startingLocationText = plexPathStarter.concat("/").concat(keyFolder);
Output.log("but going to retry with {0}", startingLocationText);
return getDirectoryKeyValue(xmlDocument, xPath, startingLocationText);
} else
return directoryNodeOfLocation;

35
src/main/java/tv/mangrana/utils/yml/FakeYmlLoader.java
View File

@ -8,9 +8,9 @@ import java.io.IOException;
import java.nio.file.Files;
import java.util.Arrays;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@ -28,14 +28,11 @@ public class FakeYmlLoader {
@SuppressWarnings("all")
public static <E extends Enum<E>> EnumMap<E, String> getEnumMapFromFile(File ymlFile, Class<E> enumData, boolean silently) throws IncorrectWorkingReferencesException {
EnumMap<E, String> enumMap = new EnumMap<>(enumData);
try (Stream<String> linesStream = Files.lines(ymlFile.toPath())) {
Pattern simpleYmlKeyValuePattern = Pattern.compile(".+: .+");
try (Stream<String> stream = Files.lines(ymlFile.toPath())) {
Map<String, String> fileLines = stream
.filter(keyValueCandidate -> simpleYmlKeyValuePattern
.matcher(keyValueCandidate)
.matches())
.map(s -> s.split(":"))
.collect(Collectors.toMap(e -> e[0], e -> e[1].trim()));
Stream<String> filteredLines = getFilteredLines(simpleYmlKeyValuePattern, linesStream);
Map<String, String> fileLines = mapLinesToKeyValue(filteredLines);
Arrays.stream(enumData.getEnumConstants())
.forEach(cons ->
enumMap.put(cons, fileLines.get(cons.name().toLowerCase()))
@ -53,4 +50,26 @@ public class FakeYmlLoader {
return null;
}
private static Stream<String> getFilteredLines(Pattern simpleYmlKeyValuePattern, Stream<String> stream) {
return stream
.filter(keyValueCandidate -> simpleYmlKeyValuePattern
.matcher(keyValueCandidate)
.matches()
);
}
private static Map<String, String> mapLinesToKeyValue(Stream<String> stringStream) {
Map<String, String> keyValueMap = new HashMap<>();
stringStream.forEach(line -> {
try {
String[] keyValue = line.split(":");
keyValueMap.put(keyValue[0], keyValue[1].trim());
} catch (Exception e) {
logger.nHLog("Some problem occurred trying to map line {0} to key-value", line);
e.printStackTrace();
}
});
return keyValueMap;
}
}