moparisthebest/rcrdit
1
0
Fork 0
mirror of https://github.com/moparisthebest/rcrdit synced 2024-12-21 23:08:57 -05:00
Code Issues Releases Wiki Activity

Add list of programs to channel for UI

Browse Source
This commit is contained in:
Travis Burtrum 2017-03-03 00:39:09 -05:00
parent 896f5f0698
commit ae8df83ce8
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/moparisthebest/rcrdit/xmltv/Channel.java
View File

@ -18,9 +18,7 @@
package com.moparisthebest.rcrdit.xmltv;
import java.util.Collections;
import java.util.Objects;
import java.util.Set;
import java.util.*;
/**
* Created by mopar on 2/17/17.
@ -33,6 +31,11 @@ public class Channel {
//@JacksonXmlElementWrapper(localName = "display-name", useWrapping = false)
private final Set<String> displayNames;
String displayName;
final List<Program> programs = new ArrayList<>();
private final List<Program> finalPrograms = Collections.unmodifiableList(programs);
public Channel(final String id, final Set<String> displayNames) {
this.id = id;
this.displayNames = Collections.unmodifiableSet(displayNames);
@ -42,10 +45,18 @@ public class Channel {
return id;
}
public String getDisplayName() {
return displayName;
}
public Set<String> getDisplayNames() {
return displayNames;
}
public List<Program> getPrograms() {
return finalPrograms;
}
@Override
public boolean equals(final Object o) {
if (this == o) return true;
@ -64,7 +75,9 @@ public class Channel {
public String toString() {
return "Channel{" +
"id='" + id + '\'' +
", displayName='" + displayName + '\'' +
", displayNames=" + displayNames +
", programs=" + programs +
'}';
}
}

17
src/main/java/com/moparisthebest/rcrdit/xmltv/Tv.java
View File

@ -115,12 +115,13 @@ public class Tv {
final XmlElement tv = AbstractXmlElement.getFactory().readFromFile(resource);
//System.out.print(tv);
final Map<String, String> chanIdToChanName = new HashMap<>();
final Map<String, Channel> chanIdToChannel = new HashMap<>();
for (final XmlElement chan : tv.getChildren("channel")) {
final Channel channel = new Channel(chan.getAttribute("id"), Arrays.stream(chan.getChildren("display-name")).map(XmlElement::getValue).collect(Collectors.toSet()));
for (final String displayName : channel.getDisplayNames())
if (allChannels == null || allChannels.isEmpty() || allChannels.contains(displayName)) {
chanIdToChanName.put(channel.getId(), displayName);
channel.displayName = displayName;
chanIdToChannel.put(channel.getId(), channel);
channels.add(channel);
break;
}
@ -129,14 +130,16 @@ public class Tv {
final Instant now = Instant.now().truncatedTo(ChronoUnit.MINUTES);
for (final XmlElement prog : tv.getChildren("programme")) {
final String chanId = prog.getAttribute("channel");
final String chanName = chanIdToChanName.get(chanId);
if (chanName != null) {
final Channel channel = chanIdToChannel.get(chanId);
if (channel != null) {
final Instant stop = INSTANT.parse(prog.getAttribute("stop"), Instant::from);
if (stop.isAfter(now)) {
programs.add(new Program(INSTANT.parse(prog.getAttribute("start"), Instant::from), stop, chanId, chanName,
final Program program = new Program(INSTANT.parse(prog.getAttribute("start"), Instant::from), stop, chanId, channel.getDisplayName(),
val(prog.getChild("title")), val(prog.getChild("sub-title")), val(prog.getChild("desc")), val(prog.getChild("episode-num")),
val(prog.getChild("date")), val(prog.getChild("category")), prog.getChild("previously-shown") != null
));
);
channel.programs.add(program);
programs.add(program);
if (stop.isAfter(lastEndTime))
lastEndTime = stop;
}
@ -158,6 +161,8 @@ public class Tv {
}
programs.sort(ProgramTimeComparator.instance);
channels.forEach(c -> c.programs.sort(ProgramTimeComparator.instance));
return new Tv(channels, programs, lastEndTime);
/*
} catch (Exception e) {