[Sageplugins-commit] webserver/net/sf/sageplugins/webserver FavoriteCommandServlet.java, 1.10, 1.11 Favorite.java, 1.16, 1.17

[jreichen <jre...@us...>]

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

Modified Files:
	FavoriteCommandServlet.java Favorite.java 
Log Message:
- Favorite automatic conversion setup failed with error "Must specify conversion destination folder" even when Alternate Destination Folder had a valid value
- Verify that Favorite automatic conversion Alternate Destination Folder exists and is writable


Index: FavoriteCommandServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/FavoriteCommandServlet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FavoriteCommandServlet.java	17 Jul 2010 15:21:57 -0000	1.10
--- FavoriteCommandServlet.java	14 Mar 2011 01:51:35 -0000	1.11
***************
*** 107,111 ****
          String favoriteAutomaticConversionFormat = req.getParameter("transcodeMode");
          boolean isFavoriteAutomaticConversionDestinationOriginalDir = "yes".equals(req.getParameter("origDestDir"));
!         String favoriteAutomaticConversionDestination = req.getParameter("destfoldername");
          String parentalRating = req.getParameter("parentalrating");
          String rated = req.getParameter("rated");
--- 107,111 ----
          String favoriteAutomaticConversionFormat = req.getParameter("transcodeMode");
          boolean isFavoriteAutomaticConversionDestinationOriginalDir = "yes".equals(req.getParameter("origDestDir"));
!         String favoriteAutomaticConversionDestination = req.getParameter("destDir");
          String parentalRating = req.getParameter("parentalrating");
          String rated = req.getParameter("rated");

Index: Favorite.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/Favorite.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Favorite.java	14 Mar 2011 00:58:01 -0000	1.16
--- Favorite.java	14 Mar 2011 01:51:35 -0000	1.17
***************
*** 611,618 ****
          if (isAutomaticConversionSupported &&
              isAutoConvert &&
!             !isFavoriteAutomaticConversionDestinationOriginalDir &&
!             favoriteAutomaticConversionDestination == null)
!         {
!             throw new IllegalArgumentException("Must specify conversion destination folder");
          }
  
--- 611,631 ----
          if (isAutomaticConversionSupported &&
              isAutoConvert &&
!             !isFavoriteAutomaticConversionDestinationOriginalDir)
!         {    
!             if ((favoriteAutomaticConversionDestination == null) || favoriteAutomaticConversionDestination.trim().length() == 0)
!             {
!                 throw new IllegalArgumentException("Must specify conversion destination folder");
!             }
! 
!             File favoriteAutomaticConversionDestinationFile = new File(favoriteAutomaticConversionDestination);
!             if (!favoriteAutomaticConversionDestinationFile.exists())
!             {
!                 throw new IllegalArgumentException("Conversion destination folder does not exist");
!             }
! 
!             if (!favoriteAutomaticConversionDestinationFile.canWrite())
!             {
!                 throw new IllegalArgumentException("Unable to write to conversion destination folder");
!             }
          }