59796 2003-06-15 06:09:26 +0000 the suggest renaming could be more intelligent (when you try to copy a file over another one) 2004-02-16 10:36:26 +0000 1 1 10 Unmaintained kio general unspecified Compiled Sources Linux RESOLVED FIXED NOR normal --- 1 hadacek faure devriese fnschy jeremyhu kossebau neitzke 0 oldest_to_newest 140052 0 hadacek 2003-06-15 06:09:26 +0000 Version: (using KDE Devel) Installed from: Compiled sources in directory "a" you have a file "a.png". in directory "b" you have files "a.png" and "a_1.png" when copying or moving the file from directory "a" to "b", a dialog asks for overwriting or propose some name for renaming. Unfortunately it always propose "a_1.png" even when it already exists... leading it to ask again for "a_2.png"... a more usdeful behaviour would be to find the first "a_i.png" which does not exists and to propose that instead. 176864 1 binner 2003-11-15 21:05:44 +0000 *** Bug 68288 has been marked as a duplicate of this bug. *** 176875 2 binner 2003-11-15 21:24:36 +0000 *** Bug 68146 has been marked as a duplicate of this bug. *** 192295 3 thiago 2004-01-07 04:59:54 +0000 *** Bug 72018 has been marked as a duplicate of this bug. *** 192410 4 devriese 2004-01-07 13:49:48 +0000 It's a bit of a corner case, but imho, this is more of a normal bug than a wishlist one. 192486 5 thiago 2004-01-07 16:23:32 +0000 It was a wishlist because it's an unimplemented feature. But name it what you will. 193102 6 binner 2004-01-09 15:12:45 +0000 *** Bug 72216 has been marked as a duplicate of this bug. *** 205421 7 4674 fnschy 2004-02-13 16:00:36 +0000 Created attachment 4674 Proposed patch The patch adds a new helper function which recurses until a non-existent filename is found. In addition the suggestion for 'file_' is now 'file_1' and not 'file__1' as it used to be. Looking forward to your comments, Anna 205449 8 faure 2004-02-13 17:04:57 +0000 On Friday 13 February 2004 16:00, Anna Nymos wrote: > The patch adds a new helper function which recurses until a non-existent > filename is found. Thanks for the patch. The basic idea is good, but it currently only works with local paths, I'm improving it to work with any URL, patch coming up soon. 205673 9 faure 2004-02-14 12:45:31 +0000 CVS commit by faure: Fixed 59796, "the suggest renaming could be more intelligent", based on patch by Anna Nymos <fnschy-at-yahoo.de> CCMAIL: 59796-done@bugs.kde.org M +38 -27 renamedlg.cpp 1.71 --- kdelibs/kio/kio/renamedlg.cpp #1.70:1.71 @@ -29,4 +29,5 @@ #include <qlayout.h> #include <qlineedit.h> +#include <qdir.h> #include <kmessagebox.h> @@ -424,15 +425,10 @@ void RenameDlg::b1Pressed() done( 1 ); } -// Propose button clicked -void RenameDlg::b8Pressed() -{ - int pos; - - /* no name to play with */ - if ( d->m_pLineEdit->text().isEmpty() ) - return; - QString dotSuffix, tmp; - QString basename = d->m_pLineEdit->text(); +static QString suggestName(const KURL& baseURL, const QString& oldName) +{ + kdDebug() << "suggestName " << baseURL << " oldName=" << oldName << endl; + QString dotSuffix, suggestedName; + QString basename = oldName; int index = basename.find( '.' ); @@ -440,32 +436,47 @@ void RenameDlg::b8Pressed() dotSuffix = basename.mid( index ); basename.truncate( index ); - } else - dotSuffix = QString::null; + } - pos = basename.findRev('_' ); + int pos = basename.findRev( '_' ); if(pos != -1 ){ + QString tmp = basename.mid( pos+1 ); bool ok; - tmp = basename.right( basename.length() - (pos + 1) ); - int number = tmp.toInt( &ok, 10 ); + int number = tmp.toInt( &ok ); if ( !ok ) {// ok there is no number - basename.append("_1" ); - d->m_pLineEdit->setText(basename + dotSuffix ); - return; + suggestedName = basename + "1" + dotSuffix; } else { // yes there's already a number behind the _ so increment it by one - QString tmp2 = QString::number ( number + 1 ); - basename.replace( pos+1, tmp.length() ,tmp2); - d->m_pLineEdit->setText( basename + dotSuffix ); - return; + basename.replace( pos+1, tmp.length(), QString::number(number+1) ); + suggestedName = basename + dotSuffix; } } else // no underscore yet - { - d->m_pLineEdit->setText( basename + "_1" + dotSuffix ); + suggestedName = basename + "_1" + dotSuffix ; + + // Check if suggested name already exists + bool exists = false; + // TODO: network transparency. However, using NetAccess from a modal dialog + // could be a problem, no? (given that it uses a modal widget itself....) + if ( baseURL.isLocalFile() ) + exists = QFileInfo( baseURL.path(+1) + suggestedName ).exists(); + + if ( !exists ) + return suggestedName; + else // already exists -> recurse + return suggestName( baseURL, suggestedName ); +} + +// Propose button clicked +void RenameDlg::b8Pressed() +{ + /* no name to play with */ + if ( d->m_pLineEdit->text().isEmpty() ) return; - } - return; // we should never return from here jic + KURL destDirectory( d->dest ); + destDirectory.setPath( destDirectory.directory() ); + d->m_pLineEdit->setText( suggestName( destDirectory, d->m_pLineEdit->text() ) ); + return; } 206202 10 kdeprint_bugs 2004-02-16 10:36:26 +0000 *** Bug 68399 has been marked as a duplicate of this bug. *** 4674 2004-02-13 16:00:36 +0000 2004-02-13 16:00:36 +0000 Proposed patch rename_suggest.diff text/plain 2927 fnschy SW5kZXg6IGtpby9raW8vcmVuYW1lZGxnLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9r ZGUva2RlbGlicy9raW8va2lvL3JlbmFtZWRsZy5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEu NzAKZGlmZiAtdSAtMyAtcCAtcjEuNzAgcmVuYW1lZGxnLmNwcAotLS0ga2lvL2tpby9yZW5hbWVk bGcuY3BwCTIwIEphbiAyMDA0IDIwOjM4OjA1IC0wMDAwCTEuNzAKKysrIGtpby9raW8vcmVuYW1l ZGxnLmNwcAkxMyBGZWIgMjAwNCAxNDozNjoyNCAtMDAwMApAQCAtMjgsNiArMjgsNyBAQAogI2lu Y2x1ZGUgPHFsYWJlbC5oPgogI2luY2x1ZGUgPHFsYXlvdXQuaD4KICNpbmNsdWRlIDxxbGluZWVk aXQuaD4KKyNpbmNsdWRlIDxxZGlyLmg+CiAKICNpbmNsdWRlIDxrbWVzc2FnZWJveC5oPgogI2lu Y2x1ZGUgPGtwdXNoYnV0dG9uLmg+CkBAIC00MjYsMTQgKzQyNywxOSBAQCB2b2lkIFJlbmFtZURs Zzo6YjFQcmVzc2VkKCkKIC8vIFByb3Bvc2UgYnV0dG9uIGNsaWNrZWQKIHZvaWQgUmVuYW1lRGxn OjpiOFByZXNzZWQoKQogewotICBpbnQgcG9zOwotCiAgIC8qIG5vIG5hbWUgdG8gcGxheSB3aXRo ICovCiAgIGlmICggZC0+bV9wTGluZUVkaXQtPnRleHQoKS5pc0VtcHR5KCkgKQogICAgIHJldHVy bjsKKyAgCisgIFFTdHJpbmcgdGFyZ2V0X2RpciA9IGQtPmRlc3QubGVmdCggZC0+ZGVzdC5maW5k UmV2KFFEaXI6OnNlcGFyYXRvcigpKSArIDEgKTsKKyAgZC0+bV9wTGluZUVkaXQtPnNldFRleHQo IHN1Z2dlc3ROYW1lKHRhcmdldF9kaXIsIGQtPm1fcExpbmVFZGl0LT50ZXh0KCkpICk7CisgIHJl dHVybjsKK30KIAotICBRU3RyaW5nIGRvdFN1ZmZpeCwgdG1wOwotICBRU3RyaW5nIGJhc2VuYW1l ID0gZC0+bV9wTGluZUVkaXQtPnRleHQoKTsKK1FTdHJpbmcgUmVuYW1lRGxnOjpzdWdnZXN0TmFt ZShjb25zdCBRU3RyaW5nJiBwYXRoLCBjb25zdCBRU3RyaW5nJiBvbGROYW1lKQorIHsKKyAgUVN0 cmluZyBkb3RTdWZmaXgsIHRtcCwgc3VnZ2VzdGVkTmFtZTsKKyAgUVN0cmluZyBiYXNlbmFtZSA9 IG9sZE5hbWU7CiAKICAgaW50IGluZGV4ID0gYmFzZW5hbWUuZmluZCggJy4nICk7CiAgIGlmICgg aW5kZXggIT0gLTEgKSB7CkBAIC00NDIsMzEgKzQ0OCwyNyBAQCB2b2lkIFJlbmFtZURsZzo6YjhQ cmVzc2VkKCkKICAgfSBlbHNlCiAgICAgZG90U3VmZml4ID0gUVN0cmluZzo6bnVsbDsKICAgCi0g IHBvcyA9IGJhc2VuYW1lLmZpbmRSZXYoJ18nICk7CisgIGludCBwb3MgPSBiYXNlbmFtZS5maW5k UmV2KCdfJyApOwogICBpZihwb3MgIT0gLTEgKXsKICAgICBib29sIG9rOwogICAgIHRtcCA9IGJh c2VuYW1lLnJpZ2h0KCBiYXNlbmFtZS5sZW5ndGgoKSAtIChwb3MgKyAxKSApOwogICAgIGludCBu dW1iZXIgPSB0bXAudG9JbnQoICZvaywgMTAgKTsKICAgICBpZiAoICFvayApIHsvLyBvayB0aGVy ZSBpcyBubyBudW1iZXIKLSAgICAgIGJhc2VuYW1lLmFwcGVuZCgiXzEiICk7Ci0gICAgICBkLT5t X3BMaW5lRWRpdC0+c2V0VGV4dChiYXNlbmFtZSArIGRvdFN1ZmZpeCApOwotICAgICAgcmV0dXJu OworICAgICAgc3VnZ2VzdGVkTmFtZSA9IGJhc2VuYW1lICsgIjEiICsgZG90U3VmZml4OwogICAg IH0KICAgICBlbHNlIHsKICAgICAgLy8geWVzIHRoZXJlJ3MgYWxyZWFkeSBhIG51bWJlciBiZWhp bmQgdGhlIF8gc28gaW5jcmVtZW50IGl0IGJ5IG9uZQogICAgICAgUVN0cmluZyB0bXAyID0gUVN0 cmluZzo6bnVtYmVyICggbnVtYmVyICsgMSApOwogICAgICAgYmFzZW5hbWUucmVwbGFjZSggcG9z KzEsIHRtcC5sZW5ndGgoKSAsdG1wMik7Ci0gICAgICBkLT5tX3BMaW5lRWRpdC0+c2V0VGV4dCgg YmFzZW5hbWUgKyBkb3RTdWZmaXggKTsKLSAgICAgIHJldHVybjsKKyAgICAgIHN1Z2dlc3RlZE5h bWUgPSBiYXNlbmFtZSArIGRvdFN1ZmZpeDsKICAgICB9CiAgIH0KICAgZWxzZSAvLyBubyB1bmRl cnNjb3JlIHlldAotICB7Ci0gICAgZC0+bV9wTGluZUVkaXQtPnNldFRleHQoIGJhc2VuYW1lICsg Il8xIiArIGRvdFN1ZmZpeCApOwotICAgIHJldHVybjsKLQotICB9Ci0gIHJldHVybjsgLy8gd2Ug c2hvdWxkIG5ldmVyIHJldHVybiBmcm9tIGhlcmUgamljCisgICAgc3VnZ2VzdGVkTmFtZSA9IGJh c2VuYW1lICsgIl8xIiArIGRvdFN1ZmZpeCA7CisgIAorICBRRmlsZUluZm8gaW5mbyAocGF0aCAr IHN1Z2dlc3RlZE5hbWUpOworICBpZiAoIWluZm8uZXhpc3RzKCkpIHJldHVybiBzdWdnZXN0ZWRO YW1lOworICBlbHNlIHJldHVybiBzdWdnZXN0TmFtZShwYXRoLCBzdWdnZXN0ZWROYW1lKTsKIH0K IAogdm9pZCBSZW5hbWVEbGc6OmIyUHJlc3NlZCgpCkluZGV4OiBraW8va2lvL3JlbmFtZWRsZy5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGVsaWJzL2tpby9raW8vcmVuYW1lZGxn LmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTAKZGlmZiAtdSAtMyAtcCAtcjEuMTAgcmVuYW1l ZGxnLmgKLS0tIGtpby9raW8vcmVuYW1lZGxnLmgJMTAgU2VwIDIwMDMgMDA6MTI6MTcgLTAwMDAJ MS4xMAorKysga2lvL2tpby9yZW5hbWVkbGcuaAkxMyBGZWIgMjAwNCAxNDozNjoyNCAtMDAwMApA QCAtOTcsNiArOTcsNyBAQCBwdWJsaWMgc2xvdHM6CiBwcm90ZWN0ZWQgc2xvdHM6CiAgIHZvaWQg ZW5hYmxlUmVuYW1lQnV0dG9uKGNvbnN0IFFTdHJpbmcgJik7CiBwcml2YXRlOgorIFFTdHJpbmcg c3VnZ2VzdE5hbWUoIGNvbnN0IFFTdHJpbmcmIHBhdGgsIGNvbnN0IFFTdHJpbmcmIG9sZG5hbWUp OwogIGNsYXNzIFJlbmFtZURsZ1ByaXZhdGU7CiAgUmVuYW1lRGxnUHJpdmF0ZSAqZDsKICB2b2lk IHBsdWdpbkhhbmRsaW5nKCApOwo=