krusader-commits Mailing List for Krusader (Page 168)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7686/krusader/VFS

Modified Files:
	ftp_vfs.cpp ftp_vfs.h vfile.h 
Log Message:
KIO::Slave url redirection handling (e.g. now devices:/ and settings:/ works !)

Index: vfile.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfile.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** vfile.h	16 Mar 2004 08:23:17 -0000	1.11
--- vfile.h	30 May 2004 14:43:20 -0000	1.12
***************
*** 87,90 ****
--- 87,92 ----
    inline gid_t						vfile_getGid()			{ return vfile_groupId;		}
    inline time_t           vfile_getTime_t()   { return vfile_time_t;    }
+   inline KURL             vfile_getUrl()      { return vfile_url;       }
+   
  	QString						      vfile_getOwner();
    QString						      vfile_getGroup();
***************
*** 99,103 ****
  	 */
  	inline void             vfile_setSize(KIO::filesize_t size) {vfile_size = size;}
! 
    virtual ~vfile(){}

--- 101,105 ----
  	 */
  	inline void             vfile_setSize(KIO::filesize_t size) {vfile_size = size;}
! 	inline void             vfile_setUrl(const KURL& url){ vfile_url = url; }
    virtual ~vfile(){}

Index: ftp_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/ftp_vfs.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** ftp_vfs.cpp	28 Apr 2004 18:35:15 -0000	1.28
--- ftp_vfs.cpp	30 May 2004 14:43:20 -0000	1.29
***************
*** 88,92 ****
      {
        symDest = kfi.linkDest();
!       if ( kfi.isDir() || mime.contains("directory") )
           perm[0] = 'd';
      }
--- 88,92 ----
      {
        symDest = kfi.linkDest();
!       if ( kfi.isDir() || mime.contains("directory") );
           perm[0] = 'd';
      }
***************
*** 104,109 ****
        temp=new vfile(name,size,perm,mtime,symLink,kfi.user(),kfi.group(),currentUser,mime,symDest,mode);
      }
      addToList(temp);
! 	}
  }

--- 104,115 ----
        temp=new vfile(name,size,perm,mtime,symLink,kfi.user(),kfi.group(),currentUser,mime,symDest,mode);
      }
+     
+     temp->vfile_setUrl(kfi.url());
      addToList(temp);
!   }
! }
! 
! void ftp_vfs::slotPermanentRedirection(KIO::Job*,const KURL&,const KURL& newUrl){
!   vfs_origin    = newUrl;
  }

***************
*** 114,122 ****

  void ftp_vfs::slotListResult(KIO::Job *job){
!  if( job && job->error()){
      // we failed to refresh
-     QString msg= KIO::buildErrorString(job->error(),vfs_origin.prettyURL());
      // display error message
!     if ( !msg.isEmpty() && !quietMode ) KMessageBox::sorry(krApp,msg);
      error = true;
    }
--- 120,127 ----

  void ftp_vfs::slotListResult(KIO::Job *job){
!   if( job && job->error()){
      // we failed to refresh
      // display error message
!     if ( !quietMode ) job->showErrorDialog(krApp);
      error = true;
    }
***************
*** 135,166 ****
    // Open the directory	marked by origin
    krConfig->setGroup("Look&Feel");
!   KIO::Job *job = new KIO::ListJob(vfs_origin,false,false,QString::null,
!                       krConfig->readBoolEntry("Show Hidden",_ShowHidden));
    connect(job,SIGNAL(entries(KIO::Job*,const KIO::UDSEntryList&)),
           this,SLOT(slotAddFiles(KIO::Job*,const KIO::UDSEntryList&)));
    connect(job,SIGNAL(redirection(KIO::Job*,const KURL&)),
           this,SLOT(slotRedirection(KIO::Job*,const KURL&)));
    connect(job,SIGNAL(result(KIO::Job*)),
           this,SLOT(slotListResult(KIO::Job*)));

    if( !quietMode ) new KrProgress(job);
  }

  bool ftp_vfs::vfs_refresh(const KURL& origin) {
! 	error = false;

! 	QString errorMsg = QString::null;	
! 	if ( origin.isMalformed() )
      errorMsg = i18n("Malformed URL:\n%1").arg(origin.url());
    if( !KProtocolInfo::supportsListing(origin) )
! 		errorMsg = i18n("Protocol not supported by Krusader:\n%1").arg(origin.url());

! 	if( !errorMsg.isEmpty() ){
      if (!quietMode) KMessageBox::sorry(krApp, errorMsg);
! 		error = true;
      return false;
! 	}

! 	busy = true;

    // clear the the list and back up out current situation
--- 140,176 ----
    // Open the directory	marked by origin
    krConfig->setGroup("Look&Feel");
!   KIO::Job *job = KIO::listDir(vfs_origin,false,
!                                krConfig->readBoolEntry("Show Hidden",_ShowHidden));
    connect(job,SIGNAL(entries(KIO::Job*,const KIO::UDSEntryList&)),
           this,SLOT(slotAddFiles(KIO::Job*,const KIO::UDSEntryList&)));
    connect(job,SIGNAL(redirection(KIO::Job*,const KURL&)),
           this,SLOT(slotRedirection(KIO::Job*,const KURL&)));
+   connect(job,SIGNAL(permanentRedirection(KIO::Job*,const KURL&,const KURL&)),
+          this,SLOT(slotPermanentRedirection(KIO::Job*,const KURL&,const KURL&)));
+   
    connect(job,SIGNAL(result(KIO::Job*)),
           this,SLOT(slotListResult(KIO::Job*)));

+   job->setWindow(krApp);
+  
    if( !quietMode ) new KrProgress(job);
  }

  bool ftp_vfs::vfs_refresh(const KURL& origin) {
!   error = false;

!   QString errorMsg = QString::null;	
!   if ( !origin.isValid() )
      errorMsg = i18n("Malformed URL:\n%1").arg(origin.url());
    if( !KProtocolInfo::supportsListing(origin) )
!     errorMsg = i18n("Protocol not supported by Krusader:\n%1").arg(origin.url());

!   if( !errorMsg.isEmpty() ){
      if (!quietMode) KMessageBox::sorry(krApp, errorMsg);
!     error = true;
      return false;
!   }

!   busy = true;

    // clear the the list and back up out current situation
***************
*** 178,182 ****
    if( error ) return false;

! 	return true;
  }

--- 188,192 ----
    if( error ) return false;

!   return true;
  }

***************
*** 234,242 ****
  // return a path to the file
  KURL ftp_vfs::vfs_getFile(const QString& name){	
!   KURL url = vfs_origin;
! 
!   url.addPath(name);
! 
!   return url;
  }

--- 244,251 ----
  // return a path to the file
  KURL ftp_vfs::vfs_getFile(const QString& name){	
!   vfile* vf=vfs_search(name);
!   if( !vf ) return KURL(); // empty 
!  
!   return vf->vfile_getUrl();
  }

Index: ftp_vfs.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/ftp_vfs.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ftp_vfs.h	25 Dec 2003 23:56:54 -0000	1.9
--- ftp_vfs.h	30 May 2004 14:43:20 -0000	1.10
***************
*** 43,47 ****
  	// the constructor simply uses the inherited constructor
  	ftp_vfs(QObject* panel);
!  ~ftp_vfs(){}

  	/// Copy a file to the vfs (physical).
--- 43,47 ----
  	// the constructor simply uses the inherited constructor
  	ftp_vfs(QObject* panel);
! 	~ftp_vfs(){}

  	/// Copy a file to the vfs (physical).
***************
*** 58,62 ****
  	virtual void vfs_rename(const QString& fileName,const QString& newName);
  	/// Calculate the amount of space occupied by a file or directory (recursive).
!   /// Not implemted (yet) in ftp_vfs
  	virtual void vfs_calcSpace(QString name ,KIO::filesize_t *totalSize,unsigned long *totalFiles,unsigned long *totalDirs, bool * stop = 0);

--- 58,62 ----
  	virtual void vfs_rename(const QString& fileName,const QString& newName);
  	/// Calculate the amount of space occupied by a file or directory (recursive).
! 	/// Not implemted (yet) in ftp_vfs
  	virtual void vfs_calcSpace(QString name ,KIO::filesize_t *totalSize,unsigned long *totalFiles,unsigned long *totalDirs, bool * stop = 0);

***************
*** 67,72 ****
  	/// Handles new files from the dir lister
  	void slotAddFiles(KIO::Job * job, const KIO::UDSEntryList& entries);
! 	/// Redirection signal handler
  	void slotRedirection(KIO::Job *, const KURL &url);
  	/// Called when the dir listing job is finished (for better or worst)
  	void slotListResult(KIO::Job *job);
--- 67,73 ----
  	/// Handles new files from the dir lister
  	void slotAddFiles(KIO::Job * job, const KIO::UDSEntryList& entries);
! 	/// Redirection signal handlers
  	void slotRedirection(KIO::Job *, const KURL &url);
+ 	void slotPermanentRedirection(KIO::Job*,const KURL&,const KURL& newUrl);
  	/// Called when the dir listing job is finished (for better or worst)
  	void slotListResult(KIO::Job *job);
***************
*** 74,86 ****
  	bool vfs_refresh(const KURL& origin);

!   void startLister();

  protected:
  	QList<vfile>  vfs_files;    //< List of pointers to vfile.
!   //QList<vfile>  vfs_files2;   //< The second list of pointers to vfiles.
!   //QList<vfile>  *vfs_filesP2; //< pointer to the second list
!   KURL origin_backup;         //< used to backup the old URL when refreshing to a new one,

!   bool busy;
  };

--- 75,85 ----
  	bool vfs_refresh(const KURL& origin);

! 	void startLister();

  protected:
  	QList<vfile>  vfs_files;    //< List of pointers to vfile.
! 	KURL origin_backup;         //< used to backup the old URL when refreshing to a new one,

! 	bool busy;
  };

2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (98)	Sep (138)	Oct (100)	Nov (49)	Dec (131)
2004	Jan (94)	Feb (65)	Mar (100)	Apr (83)	May (72)	Jun (29)	Jul (167)	Aug (127)	Sep (131)	Oct (269)	Nov (122)	Dec (100)
2005	Jan (228)	Feb (266)	Mar (63)	Apr (135)	May (157)	Jun (52)	Jul (25)	Aug (49)	Sep (184)	Oct (159)	Nov (75)	Dec (37)
2006	Jan (60)	Feb (129)	Mar (110)	Apr (34)	May (31)	Jun (42)	Jul (72)	Aug (90)	Sep (57)	Oct (66)	Nov (42)	Dec (90)
2007	Jan (106)	Feb (54)	Mar (93)	Apr (27)	May (21)	Jun (17)	Jul (19)	Aug (22)	Sep (25)	Oct (2)	Nov (1)	Dec (1)
2008	Jan (65)	Feb (70)	Mar (29)	Apr (45)	May (91)	Jun (20)	Jul (11)	Aug (24)	Sep (23)	Oct (13)	Nov (23)	Dec (39)
2009	Jan (23)	Feb (39)	Mar (15)	Apr (56)	May (5)	Jun	Jul	Aug	Sep	Oct	Nov	Dec