[Babeldoc-devel] babeldoc/modules/scanner/src/com/babeldoc/scanner/worker VFSScanner.java, 1.3, 1.4

[paspes <pa...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/worker
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6726/modules/scanner/src/com/babeldoc/scanner/worker

Modified Files:
	VFSScanner.java 
Log Message:
vfs (tst directori)

Index: VFSScanner.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/worker/VFSScanner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VFSScanner.java	14 Dec 2007 00:51:12 -0000	1.3
--- VFSScanner.java	17 Dec 2007 16:00:03 -0000	1.4
***************
*** 73,76 ****
--- 73,77 ----
  
  import org.apache.commons.vfs.FileContent;
+ import org.apache.commons.vfs.FileFilterSelector;
  import org.apache.commons.vfs.FileObject;
  import org.apache.commons.vfs.FileSelectInfo;
***************
*** 79,83 ****
--- 80,88 ----
  import org.apache.commons.vfs.FileSystemOptions;
  import org.apache.commons.vfs.FileType;
+ import org.apache.commons.vfs.FileTypeSelector;
+ import org.apache.commons.vfs.CacheStrategy;
  import org.apache.commons.vfs.VFS;
+ import org.apache.commons.vfs.auth.StaticUserAuthenticator;
+ import org.apache.commons.vfs.impl.DefaultFileSystemConfigBuilder;
  
  import com.babeldoc.core.I18n;
***************
*** 167,174 ****
  	public void initialize() throws ScannerConfigurationException {
  		try {
  			fsManager = VFS.getManager();
! 			opts = new FileSystemOptions();
! 
! 			// setInDirectory(
  			// new File((String) this.getInfo().getOption(IN_DIR).getValue()));
  			setInDirectory(this.getInfo().getStrValue(IN_DIR));
--- 172,181 ----
  	public void initialize() throws ScannerConfigurationException {
  		try {
+ 			StaticUserAuthenticator auth = new StaticUserAuthenticator("username", "password", null); 
+ 			opts = new FileSystemOptions(); 
+ 			DefaultFileSystemConfigBuilder.getInstance().setUserAuthenticator(opts, auth);
+ 			//FileObject fo = VFS.getManager().resolveFile("smb://host/anyshare/dir", opts);
  			fsManager = VFS.getManager();
! 			
  			// new File((String) this.getInfo().getOption(IN_DIR).getValue()));
  			setInDirectory(this.getInfo().getStrValue(IN_DIR));
***************
*** 226,230 ****
  	 */
  	public void relinquishResources() {
! 
  	}
  
--- 233,240 ----
  	 */
  	public void relinquishResources() {
! 		fsManager.closeFileSystem(getInDirectory().getFileSystem());
! 		if (doneDirectory != null) {
! 			fsManager.closeFileSystem(doneDirectory.getFileSystem());
! 		}
  	}
  
***************
*** 246,252 ****
  
  				String path = file.getName().getPath();
! 				FileObject outDir = fsManager.resolveFile(getDoneDirectory()
! 						+ getInDirectory().getName().getPathDecoded()
! 								.toString());
  
  				// create out dir if not exist
--- 256,260 ----
  
  				String path = file.getName().getPath();
! 				FileObject outDir = fsManager.resolveFile(getDoneDirectory());
  
  				// create out dir if not exist
***************
*** 258,262 ****
  				FileObject outfile = fsManager.resolveFile(outDir.getName()
  						.getURI()
! 						+ file.getName().getBaseName());
  
  				// delete file it is already exists
--- 266,270 ----
  				FileObject outfile = fsManager.resolveFile(outDir.getName()
  						.getURI()
! 						+ "/" + file.getName().getBaseName());
  
  				// delete file it is already exists
***************
*** 264,270 ****
  					outfile.delete();
  				}
! 
! 				// copy
! 				outfile.getContent().getFile().copyFrom(file, null);
  				// rename file
  				/*
--- 272,280 ----
  					outfile.delete();
  				}
! 				
! 				FileTypeSelector filter = new FileTypeSelector(FileType.FILE); 
! 				outfile.createFile();
! 				outfile.copyFrom(file, filter);
! 				outfile.close();
  				// rename file
  				/*
***************
*** 308,313 ****
  	 */
  	private void processVFS(FileObject dir) throws FileSystemException {
  		// inner class that implements FileFilter interface
! 		org.apache.commons.vfs.FileFilter filter = new org.apache.commons.vfs.FileFilter() {
  			public boolean accept(FileSelectInfo currentInfo) {
  				FileObject currentFile = currentInfo.getFile();
--- 318,324 ----
  	 */
  	private void processVFS(FileObject dir) throws FileSystemException {
+ 		dir.refresh();
  		// inner class that implements FileFilter interface
! 		/*org.apache.commons.vfs.FileFilter filter = new org.apache.commons.vfs.FileFilter() {
  			public boolean accept(FileSelectInfo currentInfo) {
  				FileObject currentFile = currentInfo.getFile();
***************
*** 327,333 ****
  			}
  		};
  
  		FileObject[] files = dir.getChildren();
! 
  		for (int i = 0; i < files.length; i++) {
  			if (files[i].getType() == FileType.FOLDER) {
--- 338,346 ----
  			}
  		};
+ 		*/
+ 	
  
  		FileObject[] files = dir.getChildren();
! 		
  		for (int i = 0; i < files.length; i++) {
  			if (files[i].getType() == FileType.FOLDER) {
***************
*** 335,345 ****
  				processVFS(files[i]);
  			} else {
! 				// create scan document and queue it!
! 				try {
! 					processFile(files[i]);
! 					moveFile(files[i]);
! 				} catch (Exception ex) {
! 					log.logError(
! 							"Error getting document from file " + files[i], ex);
  				}
  			}
--- 348,360 ----
  				processVFS(files[i]);
  			} else {
! 				if(acceptFile(files[i])){
! 					// create scan document and queue it!
! 					try {
! 						processFile(files[i]);
! 						moveFile(files[i]);
! 					} catch (Exception ex) {
! 						log.logError(
! 								"Error getting document from file " + files[i], ex);
! 					}
  				}
  			}
***************
*** 438,442 ****
  	public void setInDirectory(String inDirectory) throws FileSystemException {
  		this.inDirectory = fsManager.resolveFile(this.getInfo().getStrValue(
! 				IN_DIR));
  	}
  
--- 453,457 ----
  	public void setInDirectory(String inDirectory) throws FileSystemException {
  		this.inDirectory = fsManager.resolveFile(this.getInfo().getStrValue(
! 				IN_DIR),opts);
  	}