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

List:       kde-commits
Subject:    [amarok] src/core-impl/collections/umscollection: UmsCollection: More unique collectionId()
From:       Matěj_Laitl <matej () laitl ! cz>
Date:       2012-11-21 23:18:52
Message-ID: 20121121231852.3C73CA610C () git ! kde ! org
[Download RAW message or body]

Git commit 446fd71065d33219d63e4e28f864206a96d4b5f6 by Matěj Laitl.
Committed on 01/08/2012 at 17:28.
Pushed by laitl into branch 'master'.

UmsCollection: More unique collectionId()

useful for StatSyncing

M  +9    -1    src/core-impl/collections/umscollection/UmsCollection.cpp
M  +2    -1    src/core-impl/collections/umscollection/UmsCollection.h

http://commits.kde.org/amarok/446fd71065d33219d63e4e28f864206a96d4b5f6

diff --git a/src/core-impl/collections/umscollection/UmsCollection.cpp \
b/src/core-impl/collections/umscollection/UmsCollection.cpp index f9f1985..8892cd3 \
                100644
--- a/src/core-impl/collections/umscollection/UmsCollection.cpp
+++ b/src/core-impl/collections/umscollection/UmsCollection.cpp
@@ -264,7 +264,9 @@ UmsCollection::init()
 {
     Solid::StorageAccess *storageAccess = m_device.as<Solid::StorageAccess>();
     m_mountPoint = storageAccess->filePath();
-    debug() << "Mounted at: " << m_mountPoint;
+    Solid::StorageVolume *ssv = m_device.as<Solid::StorageVolume>();
+    m_collectionId = ssv ? ssv->uuid() : m_device.udi();
+    debug() << "Mounted at: " << m_mountPoint << "collection id:" << m_collectionId;
 
     // read .is_audio_player from filesystem
     KConfig config( m_mountPoint + "/" + s_settingsFileName, KConfig::SimpleConfig \
); @@ -352,6 +354,12 @@ UmsCollection::uidUrlProtocol() const
 }
 
 QString
+UmsCollection::collectionId() const
+{
+    return m_collectionId;
+}
+
+QString
 UmsCollection::prettyName() const
 {
     QString actualName;
diff --git a/src/core-impl/collections/umscollection/UmsCollection.h \
b/src/core-impl/collections/umscollection/UmsCollection.h index cc11b09..1e2db98 \
                100644
--- a/src/core-impl/collections/umscollection/UmsCollection.h
+++ b/src/core-impl/collections/umscollection/UmsCollection.h
@@ -113,7 +113,7 @@ class UmsCollection : public Collection, public Meta::Observer
         virtual bool isDirInCollection( const QString &path );
         virtual QString uidUrlProtocol() const;
 
-        virtual QString collectionId() const { return m_device.udi(); }
+        virtual QString collectionId() const;
         virtual QString prettyName() const;
         virtual KIcon icon() const;
 
@@ -225,6 +225,7 @@ class UmsCollection : public Collection, public Meta::Observer
         QString m_regexText;
         QString m_replaceText;
         QString m_collectionName;
+        QString m_collectionId;
 
         GenericScanManager *m_scanManager;
         KDirWatch m_watcher;


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