[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Amarok]  Fix lfranchi's regression where a folder that had
From:       Jeff Mitchell <mitchell () kde ! org>
Date:       2009-10-06 17:09:10
Message-ID: 200910061709.n96H9AQg012264 () Wurst ! kollide ! net
[Download RAW message or body]

commit 8abeb428b872436702ae487f179a41f4a7a16461
Author:     Jeff Mitchell <mitchell@kde.org>
AuthorDate: Tue Oct 6 13:10:08 2009 -0400
Commit:     Jeff Mitchell <mitchell@kde.org>
CommitDate: Tue Oct 6 13:10:08 2009 -0400

    Fix lfranchi's regression where a folder that had non-read permissions for the \
user could not get picked up during an incremental scan.

diff --git a/ChangeLog b/ChangeLog
index 6be1b84..0050dfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,9 +38,12 @@ VERSION 2.2.1
       the lyrics applet.
 
   BUGFIXES:
-    * When using a MySQL server, very long periods of idle Amarok could allow
-      the server to close the local connection. This is now detected and
-      should be worked around.
+    * Fix rare regression where inaccessible subfolders (due to permissions)
+      in the collection could not be picked up by an incremental scan when
+      permissions were fixed and their mtime updated, requiring a full rescan.
+    * When using a MySQL server with "Watch Folders For Changes" disabled,
+      very long periods of idle Amarok could allow the server to close the
+      local connection. This is now detected and should be worked around. 
     * Correctly set the lyrics applet's title when displaying HTML formatted lyrics
     * Track selection is now correctly preserved when using Dynamic Playlists.
       Patch by John Atkinson <john@fauxnetic.co.uk>. (BR 208349)
diff --git a/utilities/collectionscanner/CollectionScanner.cpp \
b/utilities/collectionscanner/CollectionScanner.cpp index 965b53d..7845bab 100644
--- a/utilities/collectionscanner/CollectionScanner.cpp
+++ b/utilities/collectionscanner/CollectionScanner.cpp
@@ -362,7 +362,7 @@ CollectionScanner::readDir( const QString& dir, QStringList& \
entries )  else
         attributes["path"] = dir;
     writeElement( "folder", attributes );
-    d.setFilter( QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::Readable );
+    d.setFilter( QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files );
     QFileInfoList list = d.entryInfoList();
 
     QStringList recurseDirs;


[prev in list] [next in list] [prev in thread] [next in thread]