Menu
▾
▴
[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));
|
