Differential D26588 Diff 73294 src/core/batchrenamejob.cpp

Changeset View

Standalone View

View Options

src/core/batchrenamejob.cpp

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Line(s)46 {
55 // 4. At least two files have same extension and $newName contains an invalid placeholder. 55​ // 4. At least two files have same extension and $newName contains an invalid placeholder.
56 // In this case $index is appended to $newName. 56​ // In this case $index is appended to $newName.
57 57​
58 58​
59 // Check for extensions. 59​ // Check for extensions.
60 QSet<QString> extensions; 60​ QSet<QString> extensions;
61 QMimeDatabase db; 61​ QMimeDatabase db;
62 for (const QUrl &url : qAsConst(m_srcList)) { 62​ for (const QUrl &url : qAsConst(m_srcList)) {
63 const QString extension = db.suffixForFileName(url.toDisplayString().toLower()); 63​ const QString extension = db.suffixForFileName(url.path());
64 if (extensions.contains(extension)) { 64​ if (extensions.contains(extension)) {
65 m_allExtensionsDifferent = false; 65​ m_allExtensionsDifferent = false;
66 break; 66​ break;
67 } 67​ }
68 68​
69 extensions.insert(extension); 69​ extensions.insert(extension);
70 } 70​ }
71 71​
▲ Show 20 Lines • Show All 91 Lines • ▼ Show 20 Line(s)160{
163 if (m_listIterator == m_srcList.constBegin()) { // emit total 163​ if (m_listIterator == m_srcList.constBegin()) { // emit total
164 q->setTotalAmount(KJob::Files, m_srcList.count()); 164​ q->setTotalAmount(KJob::Files, m_srcList.count());
165 } 165​ }
166 166​
167 if (m_listIterator != m_srcList.constEnd()) { 167​ if (m_listIterator != m_srcList.constEnd()) {
168 QString newName = indexedName(m_newName, m_index, m_placeHolder); 168​ QString newName = indexedName(m_newName, m_index, m_placeHolder);
169 const QUrl oldUrl = *m_listIterator; 169​ const QUrl oldUrl = *m_listIterator;
170 QMimeDatabase db; 170​ QMimeDatabase db;
171 const QString extension = db.suffixForFileName(oldUrl.path().toLower()); 171​ const QString extension = db.suffixForFileName(oldUrl.path());
172 if (!extension.isEmpty()) { 172​ if (!extension.isEmpty()) {
173 newName += QLatin1Char('.') + extension; 173​ newName += QLatin1Char('.') + extension;
174 } 174​ }
175 175​
176 m_newUrl = oldUrl.adjusted(QUrl::RemoveFilename); 176​ m_newUrl = oldUrl.adjusted(QUrl::RemoveFilename);
177 m_newUrl.setPath(m_newUrl.path() + KIO::encodeFileName(newName)); 177​ m_newUrl.setPath(m_newUrl.path() + KIO::encodeFileName(newName));
178 178​
179 KIO::Job * job = KIO::moveAs(oldUrl, m_newUrl, KIO::HideProgressInfo); 179​ KIO::Job * job = KIO::moveAs(oldUrl, m_newUrl, KIO::HideProgressInfo);
Show All 33 Lines