Differential D25010 Diff 77386 src/core/directorysizejob.cpp

Changeset View

Standalone View

View Options

src/core/directorysizejob.cpp

Show All 11 Lines1/* This file is part of the KDE libraries
12 Library General Public License for more details. 12​ Library General Public License for more details.
13 13​
14 You should have received a copy of the GNU Library General Public License 14​ You should have received a copy of the GNU Library General Public License
15 along with this library; see the file COPYING.LIB. If not, write to 15​ along with this library; see the file COPYING.LIB. If not, write to
16 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16​ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 Boston, MA 02110-1301, USA. 17​ Boston, MA 02110-1301, USA.
18*/ 18​*/
19 19​
20​#include "global.h"
20#include "directorysizejob.h" 21​#include "directorysizejob.h"
21#include "listjob.h" 22​#include "listjob.h"
22#include <kio/jobuidelegatefactory.h> 23​#include <kio/jobuidelegatefactory.h>
23#include <qdebug.h> 24​#include <qdebug.h>
24#include <QTimer> 25​#include <QTimer>
25 26​
26#include "job_p.h" 27​#include "job_p.h"
27 28​
▲ Show 20 Lines • Show All 77 Lines • ▼ Show 20 Line(s)105{
105 return d_func()->m_totalSubdirs; 106​ return d_func()->m_totalSubdirs;
106} 107​}
107 108​
108void DirectorySizeJobPrivate::processNextItem() 109​void DirectorySizeJobPrivate::processNextItem()
109{ 110​{
110 Q_Q(DirectorySizeJob); 111​ Q_Q(DirectorySizeJob);
111 while (m_currentItem < m_lstItems.count()) { 112​ while (m_currentItem < m_lstItems.count()) {
112 const KFileItem item = m_lstItems[m_currentItem++]; 113​ const KFileItem item = m_lstItems[m_currentItem++];
114​ // qDebug() << item;
113 if (!item.isLink()) { 115​ if (!item.isLink()) {
114 if (item.isDir()) { 116​ if (item.isDir()) {
115 //qDebug() << "dir -> listing"; 117​ //qDebug() << "dir -> listing";
116 startNextJob(item.url()); 118​ startNextJob(item.url());
117 return; // we'll come back later, when this one's finished 119​ return; // we'll come back later, when this one's finished
118 } else { 120​ } else {
119 m_totalSize += item.size(); 121​ m_totalSize += item.size();
120 m_totalFiles++; 122​ m_totalFiles++;
121 //qDebug() << "file -> " << m_totalSize; 123​ //qDebug() << "file -> " << m_totalSize;
122 } 124​ }
123 } else { 125​ } else {
124 m_totalFiles++; 126​ m_totalFiles++;
125 } 127​ }
126 } 128​ }
127 //qDebug() << "finished"; 129​ //qDebug() << "finished";
128 q->emitResult(); 130​ q->emitResult();
129} 131​}
130 132​
131void DirectorySizeJobPrivate::startNextJob(const QUrl &url) 133​void DirectorySizeJobPrivate::startNextJob(const QUrl &url)
132{ 134​{
133 Q_Q(DirectorySizeJob); 135​ Q_Q(DirectorySizeJob);
134 //qDebug() << url; 136​ //qDebug() << url;
135 KIO::ListJob *listJob = KIO::listRecursive(url, KIO::HideProgressInfo); 137​ KIO::ListJob *listJob = KIO::listRecursive(url, KIO::HideProgressInfo);
138​#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 69)
139​ // TODO KF6: remove legacy details code path
136 listJob->addMetaData(QStringLiteral("details"), QStringLiteral("3")); 140​ listJob->addMetaData(QStringLiteral("details"), QStringLiteral("3"));
141​#endif
142​ listJob->addMetaData(QStringLiteral("statDetails"),
dfaureUnsubmitted
Done

You want |, not & ...

dfaure: You want |, not & ...
143​ QString::number(KIO::StatDetail::Basic | KIO::StatDetail::ResolveSymlink | KIO::StatDetail::Inode));
kossebauUnsubmitted
Done

More correct would be KIOCORE_BUILD_DEPRECATED_SINCE(5, 65)., not ENABLE here and in the other cpp files.

kossebau: More correct would be KIOCORE_BUILD_DEPRECATED_SINCE(5, 65)., not ENABLE here and in the other…
dfaureUnsubmitted
Done

Now that I look at this again, we do NOT want to follow symlinks here.

This was a bug in the existing code.

In Dolphin we want to display the size of the target file (more useful information than the size of the symlink itself), but when calculating directory size, we do NOT want to follow the symlink, the target size does not count.

These new flags allow to fix this long-standing bug.

dfaure: Now that I look at this again, we do NOT want to follow symlinks here. This was a bug in the…
mevenAuthorUnsubmitted
Done

The previous code did (details of 3)

meven: The previous code did (details of 3)
dfaureUnsubmitted
Done

I'm confused by what you mean here... and I think I found more problems:

Indeed the old code used 3.
In your patch, you changed this to 2, in the legacy field for old kioslaves; any reason for that?
"3" adds UDS_DEVICE_ID/UDS_INODE which are used on lines 154/157 here. Surely we want to keep using 3.

And this means, in the new field statDetails, we want to specify KIO::Inode to get those fields.

dfaure: I'm confused by what you mean here... and I think I found more problems: Indeed the old code…
dfaureUnsubmitted
Done

This still uses ENABLED instead of BUILD, see initial comment by kossebau.

dfaure: This still uses ENABLED instead of BUILD, see initial comment by kossebau.
137 q->connect(listJob, SIGNAL(entries(KIO::Job*,KIO::UDSEntryList)), 144​ q->connect(listJob, SIGNAL(entries(KIO::Job*,KIO::UDSEntryList)),
138 SLOT(slotEntries(KIO::Job*,KIO::UDSEntryList))); 145​ SLOT(slotEntries(KIO::Job*,KIO::UDSEntryList)));
139 q->addSubjob(listJob); 146​ q->addSubjob(listJob);
140} 147​}
141 148​
142void DirectorySizeJobPrivate::slotEntries(KIO::Job *, const KIO::UDSEntryList &list) 149​void DirectorySizeJobPrivate::slotEntries(KIO::Job *, const KIO::UDSEntryList &list)
143{ 150​{
144 KIO::UDSEntryList::ConstIterator it = list.begin(); 151​ KIO::UDSEntryList::ConstIterator it = list.begin();
145 const KIO::UDSEntryList::ConstIterator end = list.end(); 152​ const KIO::UDSEntryList::ConstIterator end = list.end();
146 for (; it != end; ++it) { 153​ for (; it != end; ++it) {
147 154​
148 const KIO::UDSEntry &entry = *it; 155​ const KIO::UDSEntry &entry = *it;
156​
149 const long device = entry.numberValue(KIO::UDSEntry::UDS_DEVICE_ID, 0); 157​ const long device = entry.numberValue(KIO::UDSEntry::UDS_DEVICE_ID, 0);
150 if (device) { 158​ if (device) {
151 // Hard-link detection (#67939) 159​ // Hard-link detection (#67939)
152 const long inode = entry.numberValue(KIO::UDSEntry::UDS_INODE, 0); 160​ const long inode = entry.numberValue(KIO::UDSEntry::UDS_INODE, 0);
153 QSet<long> &visitedInodes = m_visitedInodes[device]; // find or insert 161​ QSet<long> &visitedInodes = m_visitedInodes[device]; // find or insert
154 if (visitedInodes.contains(inode)) { 162​ if (visitedInodes.contains(inode)) {
155 continue; 163​ continue;
156 } 164​ }
▲ Show 20 Lines • Show All 50 Lines • Show Last 20 Lines