sageplugins-commic Mailing List for SageTV Plugins (Page 2)

Status: Beta

Brought to you by: dbattams, fonceur, jreichen, nielm

sageplugins-commic — CVS Checkin messages

You can subscribe to this list here.

2004	Jan	Feb	Mar	Apr	May (2)	Jun	Jul (29)	Aug (20)	Sep (6)	Oct (89)	Nov (24)	Dec (12)
2005	Jan (16)	Feb (1)	Mar (7)	Apr (32)	May (36)	Jun (21)	Jul (65)	Aug (6)	Sep	Oct (30)	Nov (26)	Dec (44)
2006	Jan (35)	Feb (15)	Mar (29)	Apr (24)	May (8)	Jun (2)	Jul (7)	Aug (11)	Sep (61)	Oct (36)	Nov (10)	Dec (14)
2007	Jan (6)	Feb (43)	Mar (55)	Apr (20)	May (26)	Jun (21)	Jul (24)	Aug (22)	Sep (24)	Oct (4)	Nov	Dec (60)
2008	Jan	Feb	Mar	Apr	May	Jun (51)	Jul (2)	Aug (13)	Sep	Oct (16)	Nov (99)	Dec (12)
2009	Jan (23)	Feb (44)	Mar (4)	Apr	May	Jun (9)	Jul (70)	Aug (14)	Sep (13)	Oct (6)	Nov	Dec (3)
2010	Jan (13)	Feb (17)	Mar (2)	Apr (3)	May (71)	Jun (19)	Jul (95)	Aug	Sep	Oct	Nov (71)	Dec (3)
2011	Jan (52)	Feb	Mar (34)	Apr (10)	May (8)	Jun (8)	Jul	Aug	Sep	Oct	Nov (1)	Dec
2012	Jan	Feb	Mar	Apr	May	Jun	Jul (2)	Aug	Sep	Oct (1)	Nov	Dec

Flat | Threaded

<< < 1 2 3 4 .. 73 > >> (Page 2 of 73)

[Sageplugins-commit] MediaStreaming build.xml,1.6,1.7

From: jreichen <jre...@us...> - 2011-04-09 00:24:42

Update of /cvsroot/sageplugins/MediaStreaming
In directory vz-cvs-3.sog:/tmp/cvs-serv11276

Modified Files:
	build.xml 
Log Message:
Version 1.2

Index: build.xml
===================================================================
RCS file: /cvsroot/sageplugins/MediaStreaming/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** build.xml	18 Jan 2011 01:39:10 -0000	1.6
--- build.xml	9 Apr 2011 00:24:40 -0000	1.7
***************
*** 6,10 ****
     <property file="build.properties"/>
  
!    <property name="plugin.version" value="1.1.2"/>
  
     <property name="src.dir"   location="src"/>
--- 6,10 ----
     <property file="build.properties"/>
  
!    <property name="plugin.version" value="1.2.0"/>
  
     <property name="src.dir"   location="src"/>

[Sageplugins-commit] MediaStreaming/src/sagex/streaming/httpls/segment SegmenterProcess.java, 1.3, 1.4

From: jreichen <jre...@us...> - 2011-04-09 00:22:31

Update of /cvsroot/sageplugins/MediaStreaming/src/sagex/streaming/httpls/segment
In directory vz-cvs-3.sog:/tmp/cvs-serv9939/src/sagex/streaming/httpls/segment

Modified Files:
	SegmenterProcess.java 
Log Message:
- Calculate aspect ratio from width and height if it's not provided by SageTV metadata
- Add support for Android and Lavf (ffmpeg-based players such as VPlayer and Mirage) User-Agents.  This does not necessarily mean these will immediately work in clients that use this service.  Those must be fixed separately by their developers.
- Return more meaningful errors if Quality or User-Agent parameters are invalid.

Index: SegmenterProcess.java
===================================================================
RCS file: /cvsroot/sageplugins/MediaStreaming/src/sagex/streaming/httpls/segment/SegmenterProcess.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SegmenterProcess.java	15 Jan 2011 21:26:03 -0000	1.3
--- SegmenterProcess.java	9 Apr 2011 00:22:28 -0000	1.4
***************
*** 389,393 ****
          // TODO TN2224 for qualities, different for iPad vs iPhone/iPod touch
          String size = "400x300";
!         if (userAgent.contains("iPhone") || userAgent.contains("iPod") || userAgent.length() == 0)
          {
              // 16:9
--- 389,396 ----
          // TODO TN2224 for qualities, different for iPad vs iPhone/iPod touch
          String size = "400x300";
!         if (userAgent.contains("Lavf") || // assume Android's VPlayer or Mirage (or any ffmpeg-based player)
!             userAgent.contains("Android") ||
!             userAgent.contains("iPhone") || userAgent.contains("iPod") ||
!             userAgent.length() == 0)
          {
              // 16:9
***************
*** 428,431 ****
--- 431,438 ----
              qualityMap.put("150", s6);
          }
+         else
+         {
+             throw new IllegalArgumentException("Unsupported User-Agent header: " + userAgent);
+         }
  
          String[] currentQuality = qualityMap.get(quality);
***************
*** 433,437 ****
          if (currentQuality == null)
          {
!             throw new IllegalArgumentException("Invalid quality argument");
          }
          
--- 440,444 ----
          if (currentQuality == null)
          {
!             throw new IllegalArgumentException("Invalid quality argument: " + quality);
          }
          
***************
*** 457,460 ****
--- 464,490 ----
          Object mediaFile = MediaFileAPI.GetMediaFileForFilePath(inputFile);
          String aspect = MediaFileAPI.GetMediaFileMetadata(mediaFile, "Format.Video.Aspect");
+         if ((aspect == null) || (aspect.trim().length() == 0))
+         {
+             aspect = null;
+             String videoWidth = MediaFileAPI.GetMediaFileMetadata(mediaFile, "Format.Video.Width");
+             String videoHeight = MediaFileAPI.GetMediaFileMetadata(mediaFile, "Format.Video.Height");
+ 
+             if ((videoWidth != null) && (videoWidth.trim().length() != 0) &&
+                 (videoHeight != null) && (videoHeight.trim().length() != 0))
+             {
+                 try
+                 {
+                     Double widthDouble = Double.valueOf(videoWidth);
+                     Double heightDouble = Double.valueOf(videoHeight);
+                     aspect = Double.toString(widthDouble / heightDouble);
+                 }
+                 catch (NumberFormatException e)
+                 {
+                     Log.info(e.getMessage());
+                     Log.ignore(e);
+                 }
+             }
+ 
+         }
          isCurrentlyRecording = MediaFileAPI.IsFileCurrentlyRecording(mediaFile);
          
***************
*** 500,504 ****
  //            "-cropbottom", "0",
          params.add("-s"); params.add(currentQuality[0]);
!         params.add("-aspect"); params.add(aspect);
          params.add("-y");
          params.add("-f"); params.add("mpegts");
--- 530,537 ----
  //            "-cropbottom", "0",
          params.add("-s"); params.add(currentQuality[0]);
!         if (aspect != null)
!         {
!             params.add("-aspect"); params.add(aspect);
!         }
          params.add("-y");
          params.add("-f"); params.add("mpegts");
***************
*** 511,515 ****
          params.add("-qmax"); params.add("48");
          params.add("-qmin"); params.add("2");
!         params.add("-r"); params.add("29.97");
  //        "-acodec", "libmp3lame",
          params.add("-vol"); params.add("1024");
--- 544,548 ----
          params.add("-qmax"); params.add("48");
          params.add("-qmin"); params.add("2");
!         params.add("-r"); params.add("29.97"); // 25
  //        "-acodec", "libmp3lame",
          params.add("-vol"); params.add("1024");

[Sageplugins-commit] MediaStreaming/src/sagex/streaming/servlet HTTPLiveStreamingSegmentServlet.java, 1.4, 1.5

From: jreichen <jre...@us...> - 2011-04-09 00:06:27

Update of /cvsroot/sageplugins/MediaStreaming/src/sagex/streaming/servlet
In directory vz-cvs-3.sog:/tmp/cvs-serv7464/src/sagex/streaming/servlet

Modified Files:
	HTTPLiveStreamingSegmentServlet.java 
Log Message:
- Rethrow IllegalArgumentException so SageServlet will return an HTTP error code if the URL contains invalid parameters

Index: HTTPLiveStreamingSegmentServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/MediaStreaming/src/sagex/streaming/servlet/HTTPLiveStreamingSegmentServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HTTPLiveStreamingSegmentServlet.java	18 Jan 2011 01:41:40 -0000	1.4
--- HTTPLiveStreamingSegmentServlet.java	9 Apr 2011 00:06:25 -0000	1.5
***************
*** 191,194 ****
--- 191,198 ----
                      segmentProducer.streamNextSegment(resp.getOutputStream());
                  }
+                 catch (IllegalArgumentException e)
+                 {
+                     throw e;
+                 }
                  catch (Throwable t)
                  {

[Sageplugins-commit] MediaStreaming/src/sagex/streaming/servlet HTTPLiveStreamingPlaylistServlet.java, 1.4, 1.5

From: jreichen <jre...@us...> - 2011-04-09 00:04:42

Update of /cvsroot/sageplugins/MediaStreaming/src/sagex/streaming/servlet
In directory vz-cvs-3.sog:/tmp/cvs-serv6114/src/sagex/streaming/servlet

Modified Files:
	HTTPLiveStreamingPlaylistServlet.java 
Log Message:
- Change response content type
- Pass servlet request object to playlist generators

Index: HTTPLiveStreamingPlaylistServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/MediaStreaming/src/sagex/streaming/servlet/HTTPLiveStreamingPlaylistServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HTTPLiveStreamingPlaylistServlet.java	18 Jan 2011 01:41:40 -0000	1.4
--- HTTPLiveStreamingPlaylistServlet.java	9 Apr 2011 00:04:40 -0000	1.5
***************
*** 23,26 ****
--- 23,38 ----
              throws Exception
      {
+ //        System.out.println("PathInfo " + req.getPathInfo());
+ //        System.out.println("PathTranslated " + req.getPathTranslated());
+ //        System.out.println("Protocol " + req.getProtocol());
+ //        System.out.println("RequestURI " + req.getRequestURI());
+ //        System.out.println("Scheme " + req.getScheme());
+ //        System.out.println("ServerName " + req.getServerName());
+ //        System.out.println("ServerPort " + req.getServerPort());
+ //        System.out.println("ContextPath " + req.getContextPath());
+ //        System.out.println("ServletPath " + req.getServletPath());
+ //        System.out.println("RequestURL " + req.getRequestURL());
+ //        System.out.println("ServerURL " + req.getRequestURL().toString().replace(req.getRequestURI(), ""));
+         
          // remove servlet URL from thread name so the SageTV log is easier to read
          String threadName = Thread.currentThread().getName();
***************
*** 52,57 ****
  
          // Servers that are constrained for compatibility can serve files ending in .m3u with MIME type audio/mpegURL
! //        resp.setContentType("application/x-mpegURL");
!         resp.setContentType("application/vnd.apple.mpegurl");
  
          resp.setHeader("Accept-Ranges", "none");
--- 64,70 ----
  
          // Servers that are constrained for compatibility can serve files ending in .m3u with MIME type audio/mpegURL
! //        resp.setContentType("audio/x-mpegurl");
!         resp.setContentType("application/x-mpegURL");
! //        resp.setContentType("application/vnd.apple.mpegurl");
  
          resp.setHeader("Accept-Ranges", "none");
***************
*** 63,71 ****
          if (conversionId == null)
          {
!             playlist = new VariantPlaylist(mediaFileId).toString();
          }
          else
          {
!             playlist = new SegmentPlaylist(mediaFile, conversionId, quality).toString();
          }
          
--- 76,84 ----
          if (conversionId == null)
          {
!             playlist = new VariantPlaylist(req, mediaFileId, quality).toString();
          }
          else
          {
!             playlist = new SegmentPlaylist(req, mediaFile, conversionId, quality).toString();
          }

[Sageplugins-commit] MediaStreaming/src/sagex/streaming/servlet SageServlet.java, 1.2, 1.3

From: jreichen <jre...@us...> - 2011-04-08 23:51:06

Update of /cvsroot/sageplugins/MediaStreaming/src/sagex/streaming/servlet
In directory vz-cvs-3.sog:/tmp/cvs-serv3884/src/sagex/streaming/servlet

Modified Files:
	SageServlet.java 
Log Message:
- Log error messages
- Return HTTP error code if exception thrown by servlets
- Return exception message as content body


Index: SageServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/MediaStreaming/src/sagex/streaming/servlet/SageServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SageServlet.java	5 Nov 2010 02:58:36 -0000	1.2
--- SageServlet.java	8 Apr 2011 23:51:03 -0000	1.3
***************
*** 60,66 ****
              doServletGet(req,resp);
          }
          catch (Exception e)
          {
!             throw new ServletException(e.getMessage(), e);
          }
      }
--- 60,78 ----
              doServletGet(req,resp);
          }
+         catch (IllegalArgumentException e)
+         {
+             Log.info(e.getMessage());
+             Log.ignore(e);
+             resp.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+             resp.setContentType("text/plain");
+             resp.getWriter().write(e.getMessage());
+         }
          catch (Exception e)
          {
!             Log.info(e.getMessage());
!             Log.ignore(e);
!             resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
!             resp.setContentType("text/plain");
!             resp.getWriter().write(e.getMessage());
          }
      }

[Sageplugins-commit] webapp/WebContent/m/images Rating_TV-MA.gif, NONE, 1.1

From: jreichen <jre...@us...> - 2011-03-28 01:01:09

Update of /cvsroot/sageplugins/webapp/WebContent/m/images
In directory vz-cvs-3.sog:/tmp/cvs-serv32152/WebContent/m/images

Added Files:
	Rating_TV-MA.gif 
Log Message:


--- NEW FILE: Rating_TV-MA.gif ---
(This appears to be a binary file; contents omitted.)

[Sageplugins-commit] webapp/WebContent/m systemmessages.jsp, 1.3, 1.4

From: jreichen <jre...@us...> - 2011-03-27 17:52:34

Update of /cvsroot/sageplugins/webapp/WebContent/m
In directory vz-cvs-3.sog:/tmp/cvs-serv7843/WebContent/m

Modified Files:
	systemmessages.jsp 
Log Message:
Add system message level to system message id

Index: systemmessages.jsp
===================================================================
RCS file: /cvsroot/sageplugins/webapp/WebContent/m/systemmessages.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** systemmessages.jsp	5 Nov 2010 03:08:01 -0000	1.3
--- systemmessages.jsp	27 Mar 2011 17:52:32 -0000	1.4
***************
*** 58,62 ****
                 <div class="listcell">
                    <div class="title">
!                      <input type="checkbox" value="${messageTypeCode}-${messageTime}" name="SystemMessage"/><b>${status.count}. ${messageTypeName}</b>
                    </div>
                    <p>
--- 58,62 ----
                 <div class="listcell">
                    <div class="title">
!                      <input type="checkbox" value="${messageLevel}-${messageTypeCode}-${messageTime}" name="SystemMessage"/><b>${status.count}. ${messageTypeName}</b>
                    </div>
                    <p>

[Sageplugins-commit] webserver plugin.xml,1.4,1.5

From: jreichen <jre...@us...> - 2011-03-23 17:29:50

Update of /cvsroot/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv29738

Modified Files:
	plugin.xml 
Log Message:


Index: plugin.xml
===================================================================
RCS file: /cvsroot/sageplugins/webserver/plugin.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** plugin.xml	22 Mar 2011 03:39:34 -0000	1.4
--- plugin.xml	23 Mar 2011 17:29:47 -0000	1.5
***************
*** 17,21 ****
  1. Support V7.1 Channel Logos
  2. Fix header logo links to return to Home page
! 3. Add system message type to system message id
  4. Display show season and episode
  5. Add property to CSS file so a background image can be used if the user wants a custom one
--- 17,21 ----
  1. Support V7.1 Channel Logos
  2. Fix header logo links to return to Home page
! 3. Add system message level to system message id
  4. Display show season and episode
  5. Add property to CSS file so a background image can be used if the user wants a custom one

[Sageplugins-commit] webapp/WebContent/m extenderdetails.jsp, 1.8, 1.9

From: jreichen <jre...@us...> - 2011-03-23 16:33:27

Update of /cvsroot/sageplugins/webapp/WebContent/m
In directory vz-cvs-3.sog:/tmp/cvs-serv15563/WebContent/m

Modified Files:
	extenderdetails.jsp 
Log Message:


Index: extenderdetails.jsp
===================================================================
RCS file: /cvsroot/sageplugins/webapp/WebContent/m/extenderdetails.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** extenderdetails.jsp	6 Mar 2011 20:52:17 -0000	1.8
--- extenderdetails.jsp	23 Mar 2011 16:33:24 -0000	1.9
***************
*** 65,68 ****
--- 65,70 ----
           </div>
  
+ <%--
+          // No API for GetOS that takes context as a parameter
           <sageglbl:GetOS var="platform" context="${param.context}"/>
           <div class="label">Platform</div>
***************
*** 70,73 ****
--- 72,76 ----
              ${platform}
           </div>
+  --%>
  
           <sageglbl:GetRemoteClientVersion var="uiVersion" context="${param.context}"/>

[Sageplugins-commit] webserver/webserver/webroot/sage Background.jpg, 1.5, NONE

From: jreichen <jre...@us...> - 2011-03-22 03:46:23

Update of /cvsroot/sageplugins/webserver/webserver/webroot/sage
In directory vz-cvs-3.sog:/tmp/cvs-serv28507/webserver/webroot/sage

Removed Files:
	Background.jpg 
Log Message:
Restore background image property in CSS so users can specify their own in jetty/static/sage.  Renamed the old Background.jpg to BlueBackground.jpg so there won't be a background image by default.  It's solid gray.

--- Background.jpg DELETED ---

[Sageplugins-commit] webserver plugin.xml, 1.3, 1.4 build.xml, 1.16, 1.17

From: jreichen <jre...@us...> - 2011-03-22 03:39:36

Update of /cvsroot/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv27709

Modified Files:
	plugin.xml build.xml 
Log Message:
Version 2.30

Index: build.xml
===================================================================
RCS file: /cvsroot/sageplugins/webserver/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** build.xml	20 Mar 2011 17:27:53 -0000	1.16
--- build.xml	22 Mar 2011 03:39:34 -0000	1.17
***************
*** 2,6 ****
    <!-- set global properties for this build -->
    <property file="build.properties"/>
!   <property name="plugin.version" value="2.29"/>
    <property name="src" location="."/>
    <property name="build" location="build"/>
--- 2,6 ----
    <!-- set global properties for this build -->
    <property file="build.properties"/>
!   <property name="plugin.version" value="2.30"/>
    <property name="src" location="."/>
    <property name="build" location="build"/>

Index: plugin.xml
===================================================================
RCS file: /cvsroot/sageplugins/webserver/plugin.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** plugin.xml	15 Mar 2011 01:04:52 -0000	1.3
--- plugin.xml	22 Mar 2011 03:39:34 -0000	1.4
***************
*** 14,17 ****
--- 14,24 ----
    <ReleaseNotes>
      <![CDATA[
+ Version 2.30
+ 1. Support V7.1 Channel Logos
+ 2. Fix header logo links to return to Home page
+ 3. Add system message type to system message id
+ 4. Display show season and episode
+ 5. Add property to CSS file so a background image can be used if the user wants a custom one
+  
  Version 2.29
  1. An error "is not a valid directory on the server" was displayed on the XML Importer if the user didn't want to import from a directory of XML files and left the directory name blank
***************
*** 43,47 ****
    <Dependency>
      <Core></Core>
!     <MinVersion>7.0.10</MinVersion>
    </Dependency>
    <Dependency>
--- 50,54 ----
    <Dependency>
      <Core></Core>
!     <MinVersion>7.1.5</MinVersion>
    </Dependency>
    <Dependency>
***************
*** 51,55 ****
    <Dependency>
      <Plugin>sageutls</Plugin>
!     <MinVersion>1.4</MinVersion>
    </Dependency>
    <Dependency>
--- 58,62 ----
    <Dependency>
      <Plugin>sageutls</Plugin>
!     <MinVersion>1.4.2</MinVersion>
    </Dependency>
    <Dependency>

[Sageplugins-commit] webserver/net/sf/sageplugins/webserver DetailedInfoServlet.java, 1.63, 1.64 Airing.java, 1.40, 1.41

From: jreichen <jre...@us...> - 2011-03-22 03:33:23

Update of /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv25837/net/sf/sageplugins/webserver

Modified Files:
	DetailedInfoServlet.java Airing.java 
Log Message:
Display show season and episode

Index: Airing.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/Airing.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** Airing.java	20 Mar 2011 17:25:54 -0000	1.40
--- Airing.java	22 Mar 2011 03:33:21 -0000	1.41
***************
*** 254,257 ****
--- 254,258 ----
  		
  
+         String seasonAndEpisode = null;
  		String ep=getEpisode();
          if (  ep != null && ep.trim().length()==0)
***************
*** 283,287 ****
  		out.println("      </a></div></td>");
  		
!         if ( showfilesize ) {
              String sizeStr=null;
              if ( idType==ID_TYPE_MEDIAFILE){
--- 284,310 ----
  		out.println("      </a></div></td>");
  		
!         if ( idType == ID_TYPE_AIRING || 
!             ( idType == ID_TYPE_MEDIAFILE &&
!               SageApi.booleanApi("IsTVFile",new Object[]{sageAiring} )
!            )
!         ){
!             Integer seasonNumber = (Integer)SageApi.Api("GetShowSeasonNumber", new Object[]{sageAiring});
!             Integer episodeNumber = (Integer)SageApi.Api("GetShowEpisodeNumber", new Object[]{sageAiring});
!             if (((seasonNumber != null) && (seasonNumber > 0)) ||
!                 ((episodeNumber != null) &&(episodeNumber > 0))) {
!                 if ((seasonNumber > 0)) {
!                     seasonAndEpisode = "Season " + seasonNumber;
!                 }
!                 if ((seasonNumber > 0) && (episodeNumber > 0)) {
!                     seasonAndEpisode += "<br />";
!                 }
!                 if ((episodeNumber > 0)) {
!                     seasonAndEpisode += "Episode " + episodeNumber;
!                 }
!                 out.println("      <td class=\"seasonepisodecell\"><div class=\""+tdclass+"\">"+infoLink+seasonAndEpisode+"</a></div></td>");
!             }
!         }
! 		
! 		if ( showfilesize ) {
              String sizeStr=null;
              if ( idType==ID_TYPE_MEDIAFILE){

Index: DetailedInfoServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/DetailedInfoServlet.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** DetailedInfoServlet.java	20 Mar 2011 17:25:54 -0000	1.63
--- DetailedInfoServlet.java	22 Mar 2011 03:33:21 -0000	1.64
***************
*** 462,465 ****
--- 462,481 ----
                  out.println("<p>"+"Original Air Date: "+Translate.encode(formattedOriginalAirDate)+"</p>");
              }
+             Integer seasonNumber = (Integer)SageApi.Api("GetShowSeasonNumber", new Object[]{airing.sageAiring});
+             Integer episodeNumber = (Integer)SageApi.Api("GetShowEpisodeNumber", new Object[]{airing.sageAiring});
+             if (((seasonNumber != null) && (seasonNumber > 0)) ||
+                 ((episodeNumber != null) &&(episodeNumber > 0))) {
+                 out.print("<p>");
+                 if ((seasonNumber > 0)) {
+                     out.print("Season " + seasonNumber);
+                 }
+                 if ((seasonNumber > 0) && (episodeNumber > 0)) {
+                     out.print(" ");
+                 }
+                 if ((episodeNumber > 0)) {
+                     out.print("Episode " + episodeNumber);
+                 }
+                 out.println("</p>");
+             }
              getAndDisplay(out,"","GetExtraAiringDetails",airing);
      		getAndDisplay(out,"","GetShowMisc",airing);

[Sageplugins-commit] webserver/webserver/webroot/sage sage_all.css, 1.29, 1.30

From: jreichen <jre...@us...> - 2011-03-22 03:06:50

Update of /cvsroot/sageplugins/webserver/webserver/webroot/sage
In directory vz-cvs-3.sog:/tmp/cvs-serv20058/webserver/webroot/sage

Modified Files:
	sage_all.css 
Log Message:
Restore background image property in CSS so users can specify their own in jetty/static/sage.  Renamed the old Background.jpg to BlueBackground.jpg so there won't be a background image by default.  It's solid gray.

Index: sage_all.css
===================================================================
RCS file: /cvsroot/sageplugins/webserver/webserver/webroot/sage/sage_all.css,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** sage_all.css	14 Mar 2011 03:37:16 -0000	1.29
--- sage_all.css	22 Mar 2011 03:06:47 -0000	1.30
***************
*** 7,10 ****
--- 7,11 ----
  	background-color: #333;
  	color:#FFFFFF;
+     background-image: url('Background.jpg');
  	background-repeat: repeat;
  	background-position: top left;

[Sageplugins-commit] webserver/webserver/webroot/sage BlueBackground.jpg, NONE, 1.1

From: jreichen <jre...@us...> - 2011-03-22 02:44:08

Update of /cvsroot/sageplugins/webserver/webserver/webroot/sage
In directory vz-cvs-3.sog:/tmp/cvs-serv13546/webserver/webroot/sage

Added Files:
	BlueBackground.jpg 
Log Message:


--- NEW FILE: BlueBackground.jpg ---
(This appears to be a binary file; contents omitted.)

[Sageplugins-commit] sagexmlinfo deploy-test-package.xml, NONE, 1.1 build.xml, 1.3, 1.4 plugin.xml, 1.1, 1.2

From: jreichen <jre...@us...> - 2011-03-22 00:01:16

Update of /cvsroot/sageplugins/sagexmlinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv25665

Modified Files:
	build.xml plugin.xml 
Added Files:
	deploy-test-package.xml 
Log Message:
Store files on SourceForge

--- NEW FILE: deploy-test-package.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<project name="Nielm's Sage XML Info" default="deploy">

   <property file="build.properties"/>

   <property name="test.download.url.location" value="http://localhost/sageplugins"/>
   <property name="test.download.url.params" value=""/>

   <property name="download.url.location" value="${test.download.url.location}"/>
   <property name="download.url.params" value="${test.download.url.params}"/>
   
   <property name="test.webserver.home" value="/var/www"/>
   <property name="test.sagetv.home" value="/opt/sagetv/server"/>

   <target name="build">
      <ant antfile="build.xml" target="dist"/>
   </target>

   <target name="deploy" depends="build">
      <unzip dest="${test.webserver.home}">
         <fileset dir="dist">
            <include name="nielm-sagexmlinfo-plugin*.zip"/>
         </fileset>
      </unzip>

      <copy todir="${test.sagetv.home}">
         <fileset dir="build/packages" includes="plugin*.xml"/>
         <mergemapper to="SageTVPluginsDev.xml"/>
      </copy>
   </target>

</project>

Index: build.xml
===================================================================
RCS file: /cvsroot/sageplugins/sagexmlinfo/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.xml	16 May 2010 17:34:29 -0000	1.3
--- build.xml	22 Mar 2011 00:01:12 -0000	1.4
***************
*** 12,15 ****
--- 12,18 ----
    </condition>
  
+   <property name="download.url.location" value="http://downloads.sourceforge.net/project/sageplugins/sagexmlinfo/${plugin.version}/plugin"/>
+   <property name="download.url.params" value="?use_mirror="/>
+ 
    <!--
       - The target that Hudson calls when launching this build.  It has steps specific
***************
*** 96,100 ****
--- 99,106 ----
        <replacefilter token="@@jar-checksum@@"              value="${md5.jars}"/>
        <replacefilter token="@@last-modified@@"             value="${last.modified}"/>
+       <replacefilter token="@@download-url-location@@"     value="${download.url.location}"/>
+       <replacefilter token="@@download-url-params@@"       value="${download.url.params}"/>
        <replacefilter token="@@plugin-version@@"            value="${plugin.version}"/>
+       <replacefilter token="@@plugin-impl-version@@"       value="${plugin.version}"/>
      </replace>
  

Index: plugin.xml
===================================================================
RCS file: /cvsroot/sageplugins/sagexmlinfo/plugin.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** plugin.xml	1 May 2010 16:43:28 -0000	1.1
--- plugin.xml	22 Mar 2011 00:01:12 -0000	1.2
***************
*** 18,22 ****
    <Package>
      <PackageType>JAR</PackageType>
!     <Location>http://download.sage.tv/plugins/jreichen/sagexmlinfo/nielm-sagexmlinfo-jars-@@plugin-version@@.zip</Location>
      <MD5>@@jar-checksum@@</MD5>
    </Package>
--- 18,22 ----
    <Package>
      <PackageType>JAR</PackageType>
!     <Location>@@download-url-location@@/nielm-sagexmlinfo-jars-@@plugin-impl-version@@.zip@@download-url-params@@</Location>
      <MD5>@@jar-checksum@@</MD5>
    </Package>

[Sageplugins-commit] sageutils build.xml,1.5,1.6

From: jreichen <jre...@us...> - 2011-03-21 23:53:49

Update of /cvsroot/sageplugins/sageutils
In directory vz-cvs-3.sog:/tmp/cvs-serv23684

Modified Files:
	build.xml 
Log Message:
Fix download URL

Index: build.xml
===================================================================
RCS file: /cvsroot/sageplugins/sageutils/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build.xml	21 Mar 2011 23:50:10 -0000	1.5
--- build.xml	21 Mar 2011 23:53:47 -0000	1.6
***************
*** 10,14 ****
    </condition>
  
!   <property name="download.url.location" value="http://downloads.sourceforge.net/project/sageplugins/sagexmlinfo/v${plugin.version}/plugin"/>
    <property name="download.url.params" value="?use_mirror="/>
  
--- 10,14 ----
    </condition>
  
!   <property name="download.url.location" value="http://downloads.sourceforge.net/project/sageplugins/sageutls/${plugin.version}/plugin"/>
    <property name="download.url.params" value="?use_mirror="/>

[Sageplugins-commit] sageutils deploy-test-package.xml, NONE, 1.1 plugin.xml, 1.1, 1.2 build.xml, 1.4, 1.5

From: jreichen <jre...@us...> - 2011-03-21 23:50:12

Update of /cvsroot/sageplugins/sageutils
In directory vz-cvs-3.sog:/tmp/cvs-serv22195

Modified Files:
	plugin.xml build.xml 
Added Files:
	deploy-test-package.xml 
Log Message:
Store files on SourceForge

--- NEW FILE: deploy-test-package.xml ---
<?xml version="1.0" encoding="UTF-8"?>

<project name="Nielm's Sage Utilities" default="deploy">

   <property file="build.properties"/>

   <property name="test.download.url.location" value="http://localhost/sageplugins"/>
   <property name="test.download.url.params" value=""/>

   <property name="download.url.location" value="${test.download.url.location}"/>
   <property name="download.url.params" value="${test.download.url.params}"/>
   
   <property name="test.webserver.home" value="/var/www"/>
   <property name="test.sagetv.home" value="/opt/sagetv/server"/>

   <target name="build">
      <ant antfile="build.xml" target="dist"/>
   </target>

   <target name="deploy" depends="build">
      <unzip dest="${test.webserver.home}">
         <fileset dir="dist">
            <include name="nielm-sageutls-plugin*.zip"/>
         </fileset>
      </unzip>

      <copy todir="${test.sagetv.home}">
         <fileset dir="build/packages" includes="plugin*.xml"/>
         <mergemapper to="SageTVPluginsDev.xml"/>
      </copy>
   </target>

</project>

Index: build.xml
===================================================================
RCS file: /cvsroot/sageplugins/sageutils/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build.xml	21 Mar 2011 13:08:29 -0000	1.4
--- build.xml	21 Mar 2011 23:50:10 -0000	1.5
***************
*** 10,13 ****
--- 10,16 ----
    </condition>
  
+   <property name="download.url.location" value="http://downloads.sourceforge.net/project/sageplugins/sagexmlinfo/v${plugin.version}/plugin"/>
+   <property name="download.url.params" value="?use_mirror="/>
+ 
    <!--
       - The target that Hudson calls when launching this build.  It has steps specific
***************
*** 87,91 ****
--- 90,97 ----
          <replacefilter token="@@jar-checksum@@"              value="${md5.jars}"/>
          <replacefilter token="@@last-modified@@"             value="${last.modified}"/>
+         <replacefilter token="@@download-url-location@@"     value="${download.url.location}"/>
+         <replacefilter token="@@download-url-params@@"       value="${download.url.params}"/>
          <replacefilter token="@@plugin-version@@"            value="${plugin.version}"/>
+         <replacefilter token="@@plugin-impl-version@@"       value="${plugin.version}"/>
      </replace>
  

Index: plugin.xml
===================================================================
RCS file: /cvsroot/sageplugins/sageutils/plugin.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** plugin.xml	1 May 2010 16:42:10 -0000	1.1
--- plugin.xml	21 Mar 2011 23:50:10 -0000	1.2
***************
*** 13,17 ****
    <Package>
      <PackageType>JAR</PackageType>
!     <Location>http://download.sage.tv/plugins/jreichen/sageutls/nielm-sageutls-jars-@@plugin-version@@.zip</Location>
      <MD5>@@jar-checksum@@</MD5>
    </Package>
--- 13,17 ----
    <Package>
      <PackageType>JAR</PackageType>
!     <Location>@@download-url-location@@/nielm-sageutls-jars-@@plugin-impl-version@@.zip@@download-url-params@@</Location>
      <MD5>@@jar-checksum@@</MD5>
    </Package>

[Sageplugins-commit] sageutils build.xml,1.3,1.4

From: jreichen <jre...@us...> - 2011-03-21 13:08:31

Update of /cvsroot/sageplugins/sageutils
In directory vz-cvs-3.sog:/tmp/cvs-serv24162

Modified Files:
	build.xml 
Log Message:
Version 1.4.2
Add message level to message id

Index: build.xml
===================================================================
RCS file: /cvsroot/sageplugins/sageutils/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.xml	16 May 2010 17:34:09 -0000	1.3
--- build.xml	21 Mar 2011 13:08:29 -0000	1.4
***************
*** 2,6 ****
    <!-- set global properties for this build -->
    <property file="build.properties"/>
!   <property name="plugin.version" value="1.4.1"/>
    <property name="src" location="."/>
    <property name="build" location="build"/>
--- 2,6 ----
    <!-- set global properties for this build -->
    <property file="build.properties"/>
!   <property name="plugin.version" value="1.4.2"/>
    <property name="src" location="."/>
    <property name="build" location="build"/>

[Sageplugins-commit] webserver/net/sf/sageplugins/webserver SystemMessagesCommandServlet.java, 1.2, 1.3

From: jreichen <jre...@us...> - 2011-03-21 13:08:00

Update of /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv23909/net/sf/sageplugins/webserver

Modified Files:
	SystemMessagesCommandServlet.java 
Log Message:
Add message level to message id

Index: SystemMessagesCommandServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/SystemMessagesCommandServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SystemMessagesCommandServlet.java	24 Jan 2010 06:15:33 -0000	1.2
--- SystemMessagesCommandServlet.java	21 Mar 2011 13:07:58 -0000	1.3
***************
*** 48,52 ****
  	            Object systemMessages = SageApi.Api("GetSystemMessages");
  	            
! 	            // messages do not have ids, but it appears the combination of time and type code is unique
  	            for (String messageParam : messageParams)
  	            {
--- 48,52 ----
  	            Object systemMessages = SageApi.Api("GetSystemMessages");
  	            
! 	            // messages do not have ids, but the combination of level, time and type code is unique
  	            for (String messageParam : messageParams)
  	            {

[Sageplugins-commit] sageutils/net/sf/sageplugins/sageutils SystemMessageApi.java, 1.1, 1.2

From: jreichen <jre...@us...> - 2011-03-21 13:07:57

Update of /cvsroot/sageplugins/sageutils/net/sf/sageplugins/sageutils
In directory vz-cvs-3.sog:/tmp/cvs-serv23900/net/sf/sageplugins/sageutils

Modified Files:
	SystemMessageApi.java 
Log Message:
Add message level to message id

Index: SystemMessageApi.java
===================================================================
RCS file: /cvsroot/sageplugins/sageutils/net/sf/sageplugins/sageutils/SystemMessageApi.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SystemMessageApi.java	24 Jan 2010 06:15:28 -0000	1.1
--- SystemMessageApi.java	21 Mar 2011 13:07:55 -0000	1.2
***************
*** 45,52 ****
      public static String getKey(Object message) throws InvocationTargetException
      {
          int typeCode = SageApi.IntApi("GetSystemMessageTypeCode", new Object[]{message});
          Long time = (Long) SageApi.Api("GetSystemMessageTime", new Object[]{message}); 
  
!         String messageKey = typeCode + "-" + time;
          
          return messageKey;
--- 45,53 ----
      public static String getKey(Object message) throws InvocationTargetException
      {
+         int level = SageApi.IntApi("GetSystemMessageLevel", new Object[]{message});
          int typeCode = SageApi.IntApi("GetSystemMessageTypeCode", new Object[]{message});
          Long time = (Long) SageApi.Api("GetSystemMessageTime", new Object[]{message}); 
  
!         String messageKey = level + "-" + typeCode + "-" + time;
          
          return messageKey;
***************
*** 56,64 ****
      public static String getUid(Object message) throws InvocationTargetException
      {
          int typeCode = SageApi.IntApi("GetSystemMessageTypeCode", new Object[]{message});
          Long time = (Long) SageApi.Api("GetSystemMessageTime", new Object[]{message}); 
          Long endTime = (Long) SageApi.Api("GetSystemMessageEndTime", new Object[]{message});
          
!         String messageUid = typeCode + "-" + time + "-" + endTime;
  
          return messageUid;
--- 57,66 ----
      public static String getUid(Object message) throws InvocationTargetException
      {
+         int level = SageApi.IntApi("GetSystemMessageLevel", new Object[]{message});
          int typeCode = SageApi.IntApi("GetSystemMessageTypeCode", new Object[]{message});
          Long time = (Long) SageApi.Api("GetSystemMessageTime", new Object[]{message}); 
          Long endTime = (Long) SageApi.Api("GetSystemMessageEndTime", new Object[]{message});
          
!         String messageUid = level + "-" + typeCode + "-" + time + "-" + endTime;
  
          return messageUid;

[Sageplugins-commit] webserver build.xml,1.15,1.16

From: jreichen <jre...@us...> - 2011-03-20 17:27:55

Update of /cvsroot/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv17738

Modified Files:
	build.xml 
Log Message:
Fix header logo links to return to Home page

Index: build.xml
===================================================================
RCS file: /cvsroot/sageplugins/webserver/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** build.xml	15 Mar 2011 01:33:49 -0000	1.15
--- build.xml	20 Mar 2011 17:27:53 -0000	1.16
***************
*** 54,65 ****
      <mkdir dir="${build}/jar"/>
      <mkdir dir="${build}/war"/>
!     <mkdir dir="${build}/zip"/>
      <mkdir dir="${build}/zip/jetty"/>
      <mkdir dir="${build}/zip/jetty/contexts"/>
!     <mkdir dir="${build}/zip/jetty/webapps"/>
      <mkdir dir="${build}/packages"/>
      <mkdir dir="${build}/packages/context"/>
      <mkdir dir="${build}/packages/properties"/>
      <mkdir dir="${build}/packages/war"/>
      <mkdir dir="${dist}"/>
    </target>
--- 54,66 ----
      <mkdir dir="${build}/jar"/>
      <mkdir dir="${build}/war"/>
!     <!--mkdir dir="${build}/zip"/>
      <mkdir dir="${build}/zip/jetty"/>
      <mkdir dir="${build}/zip/jetty/contexts"/>
!     <mkdir dir="${build}/zip/jetty/webapps"/-->
      <mkdir dir="${build}/packages"/>
      <mkdir dir="${build}/packages/context"/>
      <mkdir dir="${build}/packages/properties"/>
      <mkdir dir="${build}/packages/war"/>
+     <mkdir dir="${build}/packages/warfiles"/>
      <mkdir dir="${dist}"/>
    </target>
***************
*** 104,107 ****
--- 105,109 ----
         <fileset dir="webserver/webroot/">
           <include name="*.*" /> <!-- this pattern is not recursive -->
+          <exclude name="index.html"/>
         </fileset>
         <fileset dir="webserver/webroot/sage/">
***************
*** 198,206 ****
    <target name="package-war">
  
!     <copy file="web.xml" todir="${build}/war/WEB-INF" includeemptydirs="true"/>
  
!     <copy todir="${build}/war" includeemptydirs="true">
        <fileset dir="webserver/webroot/">
          <include name="*.*" /> <!-- this pattern is not recursive -->
        </fileset>
        <fileset dir="webserver/webroot/sage/">
--- 200,209 ----
    <target name="package-war">
  
!     <copy file="web.xml" todir="${build}/packages/warfiles/WEB-INF" includeemptydirs="true"/>
  
!     <copy todir="${build}/packages/warfiles" includeemptydirs="true">
        <fileset dir="webserver/webroot/">
          <include name="*.*" /> <!-- this pattern is not recursive -->
+         <exclude name="index.html"/>
        </fileset>
        <fileset dir="webserver/webroot/sage/">
***************
*** 209,213 ****
      </copy>
  
!     <fixcrlf srcdir="${build}/war" eol="dos">
        <include name="**/*.MF"/>
        <include name="**/*.html"/>
--- 212,216 ----
      </copy>
  
!     <fixcrlf srcdir="${build}/packages/warfiles" eol="dos">
        <include name="**/*.MF"/>
        <include name="**/*.html"/>
***************
*** 222,228 ****
      </fixcrlf>
  
!     <war basedir="${build}/war"
           destfile="${build}/packages/war/nielm_sagewebserver.war"
!          webxml="${build}/war/WEB-INF/web.xml">
        <classes dir="${build}/classes" />
        <manifest>
--- 225,231 ----
      </fixcrlf>
  
!     <war basedir="${build}/packages/warfiles"
           destfile="${build}/packages/war/nielm_sagewebserver.war"
!          webxml="${build}/packages/warfiles/WEB-INF/web.xml">
        <classes dir="${build}/classes" />
        <manifest>

[Sageplugins-commit] webserver/net/sf/sageplugins/webserver EpgListServlet.java, 1.28, 1.29 DetailedInfoServlet.java, 1.62, 1.63 EpgGridServlet.java, 1.29, 1.30 EpgChannelServlet.java, 1.14, 1.15 ChannelLogoServlet.java, 1.6, 1.7 Airing.java, 1.39, 1.40 Favorite.java, 1.17, 1.18

From: jreichen <jre...@us...> - 2011-03-20 17:25:56

Update of /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv15915/net/sf/sageplugins/webserver

Modified Files:
	EpgListServlet.java DetailedInfoServlet.java 
	EpgGridServlet.java EpgChannelServlet.java 
	ChannelLogoServlet.java Airing.java Favorite.java 
Log Message:
Support V7.1 Channel Logos

Index: Favorite.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/Favorite.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Favorite.java	14 Mar 2011 01:51:35 -0000	1.17
--- Favorite.java	20 Mar 2011 17:25:54 -0000	1.18
***************
*** 896,900 ****
  				out.println("                " + Translate.encode(channelNumber) + " - ");
  				if ( usechannellogos && null != SageApi.Api("GetChannelLogo",channel) ) {
! 					out.println("                <img class=\"infochannellogo\" src=\"ChannelLogo?ChannelID="+channelId+"\" alt=\""+Translate.encode(channelName)+" logo\" title=\""+Translate.encode(channelName)+"\"/>");
  				} else {
  					out.println("                " + Translate.encode(channelName));
--- 896,900 ----
  				out.println("                " + Translate.encode(channelNumber) + " - ");
  				if ( usechannellogos && null != SageApi.Api("GetChannelLogo",channel) ) {
! 					out.println("                <img class=\"infochannellogo\" src=\"ChannelLogo?ChannelID="+channelId+"&type=Med&index=1&fallback=true\" alt=\""+Translate.encode(channelName)+" logo\" title=\""+Translate.encode(channelName)+"\"/>");
  				} else {
  					out.println("                " + Translate.encode(channelName));

Index: EpgGridServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/EpgGridServlet.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** EpgGridServlet.java	20 Jan 2010 03:30:56 -0000	1.29
--- EpgGridServlet.java	20 Mar 2011 17:25:54 -0000	1.30
***************
*** 109,113 ****
                  String chname=SageApi.Api("GetChannelName",new Object[]{channel}).toString();
                  if ( usechannellogos && null != SageApi.Api("GetChannelLogo",channel)) {
!                     out.println("      <img src=\"ChannelLogo?ChannelID="+chID+"\" alt=\""+Translate.encode(chname)+" logo\" title=\""+Translate.encode(chname)+"\"/>");
                  } else {
                      out.println(Translate.encode(chname));
--- 109,113 ----
                  String chname=SageApi.Api("GetChannelName",new Object[]{channel}).toString();
                  if ( usechannellogos && null != SageApi.Api("GetChannelLogo",channel)) {
!                     out.println("      <img src=\"ChannelLogo?ChannelID="+chID+"&type=Med&index=1&fallback=true\" alt=\""+Translate.encode(chname)+" logo\" title=\""+Translate.encode(chname)+"\"/>");
                  } else {
                      out.println(Translate.encode(chname));

Index: DetailedInfoServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/DetailedInfoServlet.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** DetailedInfoServlet.java	14 Mar 2011 03:50:43 -0000	1.62
--- DetailedInfoServlet.java	20 Mar 2011 17:25:54 -0000	1.63
***************
*** 234,238 ****
      				         && null != SageApi.Api("GetChannelLogo",channel)){
      				        String chID=SageApi.Api("GetStationID",new Object[]{channel}).toString();
!     						out.println("<img class=\"infochannellogo\" src=\"ChannelLogo?ChannelID="+chID+"\" alt=\""+Translate.encode(airing.getChannelName())+" logo\" title=\""+Translate.encode(airing.getChannelName())+"\"/>");
      				    }
      				} else {
--- 234,238 ----
      				         && null != SageApi.Api("GetChannelLogo",channel)){
      				        String chID=SageApi.Api("GetStationID",new Object[]{channel}).toString();
!     						out.println("<img class=\"infochannellogo\" src=\"ChannelLogo?ChannelID="+chID+"&type=Large&index=1&fallback=true\" alt=\""+Translate.encode(airing.getChannelName())+" logo\" title=\""+Translate.encode(airing.getChannelName())+"\"/>");
      				    }
      				} else {
***************
*** 253,257 ****
      		         && null != SageApi.Api("GetChannelLogo",channel)){
      		        String chID=SageApi.Api("GetStationID",new Object[]{channel}).toString();
!     				out.println("<img class=\"infochannellogo\" src=\"ChannelLogo?ChannelID="+chID+"\" alt=\""+Translate.encode(airing.getChannelName())+" logo\" title=\""+Translate.encode(airing.getChannelName())+"\"/>");
      		    }
      		    out.println(Translate.encode(airing.getTitle())+"</h3>");
--- 253,257 ----
      		         && null != SageApi.Api("GetChannelLogo",channel)){
      		        String chID=SageApi.Api("GetStationID",new Object[]{channel}).toString();
!                     out.println("<img class=\"infochannellogo\" src=\"ChannelLogo?ChannelID="+chID+"&type=Large&index=1&fallback=true\" alt=\""+Translate.encode(airing.getChannelName())+" logo\" title=\""+Translate.encode(airing.getChannelName())+"\"/>");
      		    }
      		    out.println(Translate.encode(airing.getTitle())+"</h3>");

Index: ChannelLogoServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/ChannelLogoServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ChannelLogoServlet.java	3 May 2007 12:19:55 -0000	1.6
--- ChannelLogoServlet.java	20 Mar 2011 17:25:54 -0000	1.7
***************
*** 3,6 ****
--- 3,9 ----
  
  
+ import java.awt.Graphics2D;
+ import java.awt.Image;
+ import java.awt.image.BufferedImage;
  import java.io.File;
  import java.io.FileInputStream;
***************
*** 40,44 ****
  			throws Exception {
  		try {
! 			String ChannelID=req.getParameter("ChannelID");
  			if ( ChannelID==null || ChannelID.length()==0)
  				throw new Exception ("no ChannelID");
--- 43,76 ----
  			throws Exception {
  		try {
!             String channelLogoTypeStr = req.getParameter("type");
!             String channelLogoIndexStr = req.getParameter("index");
!             String channelLogoFallbackStr = req.getParameter("fallback");
!             String channelLogoType = "Small";
!             Integer channelLogoIndex = 1;
!             Boolean channelLogoFallback = true;
! 
!             if ((channelLogoTypeStr != null) &&
!                 ((channelLogoTypeStr.equals("Small")) ||
!                  (channelLogoTypeStr.equals("Med")) ||
!                  (channelLogoTypeStr.equals("Large"))))
!             {
!                 channelLogoType = channelLogoTypeStr;
!             }
! 
!             if ((channelLogoIndexStr != null) &&
!                 ((channelLogoIndexStr.equals("0")) ||
!                  (channelLogoIndexStr.equals("1")) ||
!                  (channelLogoIndexStr.equals("2"))))
!             {
!                 channelLogoIndex = Integer.valueOf(channelLogoIndexStr);
!             }
! 
!             if ((channelLogoFallbackStr != null) &&
!                 (!channelLogoFallbackStr.equals("true")))
!             {
!                 channelLogoFallback = false;
!             }
! 
!             String ChannelID=req.getParameter("ChannelID");
  			if ( ChannelID==null || ChannelID.length()==0)
  				throw new Exception ("no ChannelID");
***************
*** 60,79 ****
  			    logofile=new File(dirname+channelname+".png");
  			}
- 			if ( ! logofile.exists() ) 
- 			    throw new Exception ("logofile not found in "+dirname+" for Channel: "+channelname);
  			
  			boolean headOnly=false;
! 			long lastMod = logofile.lastModified();
! 			try {
! 			    if ( ! FileServlet.CheckIfModifiedSince(req,lastMod)){
! 			        resp.setStatus( HttpServletResponse.SC_NOT_MODIFIED );
! 			        headOnly=true;
! 			    }
! 			} catch ( IllegalArgumentException e) {
! 			    log(e.toString());
  			}
- 			resp.setContentType(getServletContext().getMimeType(logofile.getPath()));
- 			resp.setDateHeader( "Last-modified", lastMod );
- 			resp.setBufferSize(8192);
  			// set expiry date to now+1 week
  			long expiry=System.currentTimeMillis()+(1000*60*60*24*7);
--- 92,141 ----
  			    logofile=new File(dirname+channelname+".png");
  			}
  			
  			boolean headOnly=false;
! 			if (logofile.exists())
! 			{
!     			long lastMod = logofile.lastModified();
!     			try {
!     			    if ( ! FileServlet.CheckIfModifiedSince(req,lastMod)){
!     			        resp.setStatus( HttpServletResponse.SC_NOT_MODIFIED );
!     			        headOnly=true;
!     			    }
!     			} catch ( IllegalArgumentException e) {
!     			    log(e.toString());
!     			}
!     			resp.setContentType(getServletContext().getMimeType(logofile.getPath()));
!     			resp.setDateHeader( "Last-modified", lastMod );
!     			resp.setBufferSize(8192);
! 			}
! 			else
! 			{
! 	            Logo=SageApi.Api("GetChannelLogo",new Object[] {Channel, channelLogoType, channelLogoIndex, channelLogoFallback});
! 	            BufferedImage image=(BufferedImage)SageApi.Api("GetImageAsBufferedImage",Logo);
! 	            if ( image==null) 
! 	                throw new Exception("GetImageAsBufferedImage returned null");
! 	            // got a BufferedImage, write it out as PNG
! 	            // cache for at least 10 mins 
! 	            long lastMod = System.currentTimeMillis()-(10*60*1000);
! 	            try {
! 	                if ( ! FileServlet.CheckIfModifiedSince(req,lastMod)){
! 	                    resp.setStatus( HttpServletResponse.SC_NOT_MODIFIED );
! 	                    headOnly=true;
! 	                }
! 	            } catch ( IllegalArgumentException e) {
! 	                log(e.toString());
! 	            }
! 	            resp.setContentType("image/png");
! 	            resp.setDateHeader( "Last-modified", lastMod );
! 	            resp.setBufferSize(8192);
! 	            // set expiry date to now+1 week
! 	            long expiry=System.currentTimeMillis()+(1000*60*60*24*7);
! 	            resp.setDateHeader ("Expires", expiry);
! 	            if ( ! headOnly ) {
! 	                OutputStream os=resp.getOutputStream();
! 	                javax.imageio.ImageIO.write(image,"png",os);
! 	                os.close();
! 	            }
  			}
  			// set expiry date to now+1 week
  			long expiry=System.currentTimeMillis()+(1000*60*60*24*7);

Index: EpgChannelServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/EpgChannelServlet.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** EpgChannelServlet.java	20 Jan 2010 03:30:56 -0000	1.14
--- EpgChannelServlet.java	20 Mar 2011 17:25:54 -0000	1.15
***************
*** 85,89 ****
      	            String chID=SageApi.Api("GetStationID",new Object[]{channel}).toString();
      	            // TODO style
!     	            out.println("<img style=\"height: 2.5em\" src=\"ChannelLogo?ChannelID="+chID+"\" alt=\""+Translate.encode(chname)+" logo\" title=\""+Translate.encode(chname)+"\"/>");
      	        } else {
      	            out.println(Translate.encode(chname));
--- 85,89 ----
      	            String chID=SageApi.Api("GetStationID",new Object[]{channel}).toString();
      	            // TODO style
!     	            out.println("<img style=\"height: 2.5em\" src=\"ChannelLogo?ChannelID="+chID+"&type=Med&index=1&fallback=true\" alt=\""+Translate.encode(chname)+" logo\" title=\""+Translate.encode(chname)+"\"/>");
      	        } else {
      	            out.println(Translate.encode(chname));

Index: Airing.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/Airing.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Airing.java	20 Jan 2010 03:30:56 -0000	1.39
--- Airing.java	20 Mar 2011 17:25:54 -0000	1.40
***************
*** 410,414 ****
      		if ( usechannellogos && null != SageApi.Api("GetChannelLogo",channel) ) {
      		    String chID=SageApi.Api("GetStationID",new Object[]{channel}).toString();
!     		    out.println("<img class=\"infochannellogo\" src=\"ChannelLogo?ChannelID="+chID+"\" alt=\""+Translate.encode(getChannelName())+" logo\" title=\""+Translate.encode(getChannelName())+"\"/>");
      		} else {
      			out.println(Translate.encode(getChannelName()));
--- 410,414 ----
      		if ( usechannellogos && null != SageApi.Api("GetChannelLogo",channel) ) {
      		    String chID=SageApi.Api("GetStationID",new Object[]{channel}).toString();
!     		    out.println("<img class=\"infochannellogo\" src=\"ChannelLogo?ChannelID="+chID+"&type=Med&index=1&fallback=true\" alt=\""+Translate.encode(getChannelName())+" logo\" title=\""+Translate.encode(getChannelName())+"\"/>");
      		} else {
      			out.println(Translate.encode(getChannelName()));

Index: EpgListServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/EpgListServlet.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** EpgListServlet.java	20 Jan 2010 03:30:56 -0000	1.28
--- EpgListServlet.java	20 Mar 2011 17:25:54 -0000	1.29
***************
*** 107,111 ****
  		        String chname=SageApi.Api("GetChannelName",new Object[]{channel}).toString();	
  		        if ( showChannelLogos && null != SageApi.Api("GetChannelLogo",channel)) {
! 		            out.println("         <img src=\"ChannelLogo?ChannelID="+chID+"\" alt=\""+Translate.encode(chname)+" logo\" title=\""+Translate.encode(chname)+"\"/>");
  		        } else {
  		            out.println(Translate.encode(chname));
--- 107,111 ----
  		        String chname=SageApi.Api("GetChannelName",new Object[]{channel}).toString();	
  		        if ( showChannelLogos && null != SageApi.Api("GetChannelLogo",channel)) {
! 		            out.println("         <img src=\"ChannelLogo?ChannelID="+chID+"&type=Med&index=1&fallback=true\" alt=\""+Translate.encode(chname)+" logo\" title=\""+Translate.encode(chname)+"\"/>");
  		        } else {
  		            out.println(Translate.encode(chname));

[Sageplugins-commit] webserver build.xml,1.14,1.15

From: jreichen <jre...@us...> - 2011-03-15 01:33:51

Update of /cvsroot/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv31912

Modified Files:
	build.xml 
Log Message:


Index: build.xml
===================================================================
RCS file: /cvsroot/sageplugins/webserver/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** build.xml	15 Mar 2011 01:24:37 -0000	1.14
--- build.xml	15 Mar 2011 01:33:49 -0000	1.15
***************
*** 42,47 ****
        <!-- The jar with the SageTV APIs is placed in the Hudson home directory -->
        <property name="sageLibDir" value="${hudson.home.dir}"/>
-       <property name="sageutilsRoot" location="../../sageutils"/>
-       <property name="sagexmlinfoRoot" location="../../sagexmlinfo"/>
        <property name="build.number" value="${env.BUILD_NUMBER}"/>
      </ant>
--- 42,45 ----

[Sageplugins-commit] webserver build.xml,1.13,1.14

From: jreichen <jre...@us...> - 2011-03-15 01:24:39

Update of /cvsroot/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv28161

Modified Files:
	build.xml 
Log Message:


Index: build.xml
===================================================================
RCS file: /cvsroot/sageplugins/webserver/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** build.xml	15 Mar 2011 01:20:41 -0000	1.13
--- build.xml	15 Mar 2011 01:24:37 -0000	1.14
***************
*** 42,47 ****
        <!-- The jar with the SageTV APIs is placed in the Hudson home directory -->
        <property name="sageLibDir" value="${hudson.home.dir}"/>
!       <property name="sageutilsRoot" value="../../sageutils"/>
!       <property name="sagexmlinfoRoot" value="../../sagexmlinfo"/>
        <property name="build.number" value="${env.BUILD_NUMBER}"/>
      </ant>
--- 42,47 ----
        <!-- The jar with the SageTV APIs is placed in the Hudson home directory -->
        <property name="sageLibDir" value="${hudson.home.dir}"/>
!       <property name="sageutilsRoot" location="../../sageutils"/>
!       <property name="sagexmlinfoRoot" location="../../sagexmlinfo"/>
        <property name="build.number" value="${env.BUILD_NUMBER}"/>
      </ant>

[Sageplugins-commit] webserver build.xml,1.12,1.13

From: jreichen <jre...@us...> - 2011-03-15 01:20:43

Update of /cvsroot/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv26340

Modified Files:
	build.xml 
Log Message:


Index: build.xml
===================================================================
RCS file: /cvsroot/sageplugins/webserver/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** build.xml	15 Mar 2011 00:56:39 -0000	1.12
--- build.xml	15 Mar 2011 01:20:41 -0000	1.13
***************
*** 42,45 ****
--- 42,47 ----
        <!-- The jar with the SageTV APIs is placed in the Hudson home directory -->
        <property name="sageLibDir" value="${hudson.home.dir}"/>
+       <property name="sageutilsRoot" value="../../sageutils"/>
+       <property name="sagexmlinfoRoot" value="../../sagexmlinfo"/>
        <property name="build.number" value="${env.BUILD_NUMBER}"/>
      </ant>

Flat | Threaded

<< < 1 2 3 4 .. 73 > >> (Page 2 of 73)