Add ability to import multiple xmltv.xml files

rcrdit.cfg.example.xml

@@ -22,8 +22,11 @@
     <databaseUrl>jdbc:mysql://localhost:3306/rcrdit?user=rcrdit&amp;password=rcrdit</databaseUrl>
     <!-- server uri (context path and port) for web application -->
     <serverUri>http://localhost:8080/rcrdit/</serverUri>
-    <!-- path to xmltv.xml file normally generated by xmltv scripts from schedulesdirect or http://zap2xml.awardspace.info/ -->
+    <!-- paths to xmltv.xml files normally generated by xmltv scripts from schedulesdirect or http://zap2xml.awardspace.info/ -->
+    <xmltvPaths>
         <xmltvPath>/etc/xmltv.xml</xmltvPath>
+        <xmltvPath>/etc/xmltv-other.xml</xmltvPath>
+    </xmltvPaths>
     <!-- all channels you recieve, one of the names from each channel from xmltv.xml above -->
     <channels>
         <channel>2.1</channel>

src/main/java/com/moparisthebest/rcrdit/RcrdIt.java

@@ -79,7 +79,8 @@ public class RcrdIt extends ResourceConfig implements AutoCloseable {
     // config items
     private final Tuners tuners;
     private final Set<String> allChannels;
-    private final String databaseUrl, xmltvPath;
+    private final List<String> xmltvPaths;
+    private final String databaseUrl;
 
     private final TimerTask scheduleTask = new ScheduleTask();
     private final Timer timer = new Timer();
@@ -102,7 +103,7 @@ public class RcrdIt extends ResourceConfig implements AutoCloseable {
             serverUri += "/";
         this.serverUri = serverUri;
 
-        this.xmltvPath = rcrdit.getChild("xmltvPath").getValue();
+        this.xmltvPaths = Arrays.stream(rcrdit.getChild("xmltvPaths").getChildren("xmltvPath")).map(XmlElement::getValue).collect(Collectors.toList());
         this.allChannels = Arrays.stream(rcrdit.getChild("channels").getChildren("channel")).map(XmlElement::getValue).collect(Collectors.toSet());
 
         final List<Tuner> tuners = new ArrayList<>();
@@ -370,7 +371,7 @@ public class RcrdIt extends ResourceConfig implements AutoCloseable {
         @Override
         public void run() {
             try {
-                schedule = Tv.readSchedule(xmltvPath, allChannels);
+                schedule = Tv.readSchedule(xmltvPaths, allChannels);
                 //System.out.println(schedule);
                 // todo: only re-calcuate if schedule changed
                 reCalculateSchedule();
@@ -412,7 +413,7 @@ public class RcrdIt extends ResourceConfig implements AutoCloseable {
                 "tuners=" + tuners +
                 ", allChannels=" + allChannels +
                 ", databaseUrl='" + databaseUrl + '\'' +
-                ", xmltvPath='" + xmltvPath + '\'' +
+                ", xmltvPaths='" + xmltvPaths + '\'' +
                 '}';
     }
 

src/main/java/com/moparisthebest/rcrdit/xmltv/Tv.java

@@ -76,7 +76,7 @@ public class Tv {
                 '}';
     }
 
-    public static Tv readSchedule(final String resource, final Set<String> allChannels) throws Exception {
+    public static Tv readSchedule(final List<String> resources, final Set<String> allChannels) throws Exception {
         //try /*(InputStream is = new FileInputStream(resource))*/ {
             /*
             ObjectMapper mapper = new XmlMapper(new XmlFactory()); // create once, reuse
@@ -107,10 +107,14 @@ public class Tv {
                 .withZone(ZoneId.systemDefault())
                 .withResolverStyle(ResolverStyle.STRICT);
 
+        final List<Channel> channels = new ArrayList<>();
+        final List<Program> programs = new ArrayList<>();
+        Instant lastEndTime = Instant.now();
+
+        for(final String resource : resources) {
             final XmlElement tv = AbstractXmlElement.getFactory().readFromFile(resource);
             //System.out.print(tv);
 
-        final List<Channel> channels = new ArrayList<>();
             final Map<String, String> chanIdToChanName = 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()));
@@ -122,9 +126,7 @@ public class Tv {
                     }
             }
 
-        final List<Program> programs = new ArrayList<>();
             final Instant now = Instant.now().truncatedTo(ChronoUnit.MINUTES);
-        Instant lastEndTime = now;
             for (final XmlElement prog : tv.getChildren("programme")) {
                 final String chanId = prog.getAttribute("channel");
                 final String chanName = chanIdToChanName.get(chanId);
@@ -140,6 +142,21 @@ public class Tv {
                     }
                 }
             }
+        }
+
+        // de-duplicate, keep channels in order, programs don't matter since we will sort anyway...
+        // in theory we should only have to do this if resources.size() > 1, but who knows what kind of crazy xml will appear...
+        {
+            final Set<Channel> dedup = new LinkedHashSet<>(channels);
+            channels.clear();
+            channels.addAll(dedup);
+        }
+        {
+            final Set<Program> dedup = new HashSet<>(programs);
+            programs.clear();
+            programs.addAll(dedup);
+        }
+
         programs.sort(ProgramTimeComparator.instance);
         return new Tv(channels, programs, lastEndTime);
             /*