X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=crawler%2Fkiss%2Fsrc%2Forg%2Fwamblee%2Fcrawler%2Fkiss%2Fmain%2FProgramActionExecutor.java;h=fae06bda35ea10189da41d60e9ce48f6c7691ed5;hb=3c68ffbb4f2b908015301accc3f4473acc4619e2;hp=44132b5f5e88d42f93ee2d82f9f64f4bf2331aa8;hpb=6333480c32ee3eed2c3a8b23673991f9f2c8bddb;p=utils

diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramActionExecutor.java b/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramActionExecutor.java
index 44132b5f..fae06bda 100644
--- a/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramActionExecutor.java
+++ b/crawler/kiss/src/org/wamblee/crawler/kiss/main/ProgramActionExecutor.java
@@ -16,7 +16,7 @@
 
 package org.wamblee.crawler.kiss.main;
 
-import java.util.EnumMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -24,9 +24,8 @@ import java.util.TreeSet;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.dom4j.DocumentFactory;
-import org.dom4j.Element;
 import org.wamblee.crawler.kiss.guide.Program;
+import org.wamblee.crawler.kiss.guide.TimeInterval;
 import org.wamblee.crawler.kiss.guide.Program.RecordingResult;
 
 /**
@@ -35,38 +34,27 @@ import org.wamblee.crawler.kiss.guide.Program.RecordingResult;
  * in what order and makes decisions in case of conflicts.
  */
 public class ProgramActionExecutor {
-    
-    private static final Log LOG = LogFactory.getLog(ProgramActionExecutor.class);
 
-    /**
-     * A map of category name to a set of program. Useful for displaying the
-     * output of possibly interesting programs on a per category basis.
-     */
-    private Map<String, Set<Program>> _interestingShows;
+    private static final Log LOG = LogFactory
+            .getLog(ProgramActionExecutor.class);
 
     /**
-     * Set of programs to record.
+     * Map of priority to set of programs.
      */
-    private Set<Program> _showsToRecord;
-
+    private Map<Integer, Set<Program>> _showsToRecord;
+    
     /**
-     * Map or recording result to a set of programs.
+     * Report to use. 
      */
-    private EnumMap<RecordingResult, Set<Program>> _recordings;
+    private Report _report; 
 
     /**
      * Constructs the program action executor.
      * 
      */
-    public ProgramActionExecutor() {
-        _interestingShows = new TreeMap<String, Set<Program>>();
-        _showsToRecord = new TreeSet<Program>(new Program.TimeSorter());
-        _recordings = new EnumMap<RecordingResult, Set<Program>>(
-                RecordingResult.class);
-        for (RecordingResult result : RecordingResult.values()) {
-            _recordings.put(result, new TreeSet<Program>(
-                    new Program.TimeSorter()));
-        }
+    public ProgramActionExecutor(Report aReport) {
+        _showsToRecord = new TreeMap<Integer, Set<Program>>();
+        _report = aReport;
     }
 
     /**
@@ -79,7 +67,14 @@ public class ProgramActionExecutor {
      */
     public void recordProgram(int aPriority, Program aProgram) {
         LOG.info("priority = " + aPriority + ", program: " + aProgram);
-        _showsToRecord.add(aProgram);
+        // Putting -priority into the set makes sure that iteration order
+        // over the priorities will go from higher priority to lower priority.
+        Set<Program> programs = _showsToRecord.get(-aPriority);
+        if (programs == null) {
+            programs = new TreeSet<Program>(new Program.TimeComparator());
+            _showsToRecord.put(-aPriority, programs);
+        }
+        programs.add(aProgram);
     }
 
     /**
@@ -92,60 +87,44 @@ public class ProgramActionExecutor {
      */
     public void interestingProgram(String aCategory, Program aProgram) {
         LOG.info("category = '" + aCategory + "', program: " + aProgram);
-        Set<Program> programs = _interestingShows.get(aCategory);
-        if (programs == null) {
-            programs = new TreeSet<Program>(new Program.TimeSorter());
-            _interestingShows.put(aCategory, programs);
-        }
-        programs.add(aProgram);
+        _report.interestingProgram(aCategory, aProgram);
     }
 
     /**
      * Makes sure that the actions are performed.
-     * 
      */
     public void commit() {
-        for (Program program : _showsToRecord) {
-            RecordingResult result = program.record();
-            _recordings.get(result).add(program);
+        Set<TimeInterval> previouslyRecorded = new HashSet<TimeInterval>();
+        for (Integer priority : _showsToRecord.keySet()) {
+            for (Program program : _showsToRecord.get(priority)) {
+                TimeInterval interval = program.getInterval();
+                if (recordingConflictExists(previouslyRecorded, interval)) {
+                    _report.setRecordingResult(RecordingResult.CONFLICT, program);
+                } else {
+                    RecordingResult result = program.record();
+                    _report.setRecordingResult(result, program);
+                    previouslyRecorded.add(interval);
+                }
+            }
         }
     }
 
     /**
-     * Get report as XML.
+     * Checks an interval for overlap with a previously recorded program.
      * 
-     * @return XML report
+     * @param aPreviouslyRecorded
+     *            Previously recorded programs.
+     * @param aInterval
+     *            Interval.
+     * @return True iff there is a recording conflict.
      */
-    public Element getReport() {
-        DocumentFactory factory = DocumentFactory.getInstance();
-        Element report = factory.createElement("report");
-
-        for (RecordingResult result : RecordingResult.values()) {
-            if (_recordings.get(result).size() > 0) {
-                Element recordingResult = report.addElement("recorded")
-                        .addAttribute("result", result.toString());
-
-                for (Program program : _recordings.get(result)) {
-                    recordingResult.add(program.asXml());
-                }
-            }
-        }
-
-        if (_interestingShows.size() > 0) {
-            Element interesting = report.addElement("interesting");
-            for (String category : _interestingShows.keySet()) {
-                Element categoryElem = interesting;
-                if (category.length() > 0) {
-                    categoryElem = interesting.addElement("category");
-                    categoryElem.addAttribute("name", category);
-                }
-                for (Program program : _interestingShows.get(category)) {
-                    categoryElem.add(program.asXml());
-                }
+    private boolean recordingConflictExists(
+            Set<TimeInterval> aPreviouslyRecorded, TimeInterval aInterval) {
+        for (TimeInterval recordedInterval : aPreviouslyRecorded) {
+            if (aInterval.overlap(recordedInterval)) {
+                return true;
             }
-
         }
-
-        return report;
+        return false;
     }
 }