[Kpod-devel] ipodslave/src/libqtpod itunesdb.cpp,1.10,1.11 itunesdb.h,1.8,1.9 trackdatastore.cpp,1.1,NONE trackdatastore.h,1.1,NONE trackmetadataprovider.h,1.1,NONE

[Michael S. <fr...@us...>]

Update of /cvsroot/kpod/ipodslave/src/libqtpod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3918/src/libqtpod

Modified Files:
	itunesdb.cpp itunesdb.h 
Removed Files:
	trackdatastore.cpp trackdatastore.h trackmetadataprovider.h 
Log Message:
dirty flag handling reimplemented

--- trackdatastore.h DELETED ---

--- trackdatastore.cpp DELETED ---

Index: itunesdb.cpp
===================================================================
RCS file: /cvsroot/kpod/ipodslave/src/libqtpod/itunesdb.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** itunesdb.cpp	18 Feb 2006 21:24:54 -0000	1.10
--- itunesdb.cpp	21 Feb 2006 00:20:59 -0000	1.11
***************
*** 274,278 ****
  
      void writeFinished() {
!         m_itunesdb.changed = false;    // container is in sync with the database now
      }
  
--- 274,278 ----
  
      void writeFinished() {
!         m_itunesdb.setDirty( false );    // container is in sync with the database now
      }
  
***************
*** 402,406 ****
              if( track == NULL) {    // track couldn't be found
                  (*playlist)->removeTrackAt( track_iter);
-                 changed= true;
              }
          }
--- 402,405 ----
***************
*** 425,429 ****
      }
  
!     changed= false;
  
      return true;
--- 424,428 ----
      }
  
!     setDirty( false );
  
      return true;
***************
*** 456,460 ****
  }
  
! bool ITunesDB::dbFileChanged() {
      return !itunesdbfile.exists() || QFileInfo(itunesdbfile.name()).lastModified() != timestamp;
  }
--- 455,459 ----
  }
  
! bool ITunesDB::dbFileChanged() const {
      return !itunesdbfile.exists() || QFileInfo(itunesdbfile.name()).lastModified() != timestamp;
  }
***************
*** 499,503 ****
      }
  
!     changed = true;
  }
  
--- 498,502 ----
      }
  
!     setDirty();
  }
  
***************
*** 509,512 ****
--- 508,513 ----
  
      playlists->append( pTrackList );
+     setDirty();
+ 
      return true;
  }
***************
*** 561,565 ****
      \fn ITunesDB::getArtists( QStringList &buffer)
   */
! QStringList* ITunesDB::getArtists( QStringList &buffer) const
  {
      TrackMap::const_iterator trackIter = trackmap.begin();
--- 562,566 ----
      \fn ITunesDB::getArtists( QStringList &buffer)
   */
! QStringList* ITunesDB::getArtists( QStringList &buffer ) const
  {
      TrackMap::const_iterator trackIter = trackmap.begin();
***************
*** 605,610 ****
  bool ITunesDB::containsArtist( const QString& artistname ) const {
      TracksByArtistFinder tracksByArtistFinder( artistname );
!     FilteredIterator<TrackMap::const_iterator, TracksByArtistFinder> filteredIter( trackmap.begin(), trackmap.end(), tracksByArtistFinder );
!     return filteredIter.hasNext();
  }
  
--- 606,610 ----
  bool ITunesDB::containsArtist( const QString& artistname ) const {
      TracksByArtistFinder tracksByArtistFinder( artistname );
!     return findFirstTrackBy( tracksByArtistFinder ) != NULL;
  }
  
***************
*** 627,630 ****
--- 627,631 ----
          trackmap.remove( (*trackiter)->getID() );
      }
+     setDirty();
      return true;
  }
***************
*** 736,739 ****
--- 737,741 ----
      maxTrackDBID = 0;
      mainlist = itunesdb::Playlist();
+     setDirty( false );
  }
  
***************
*** 760,764 ****
      }
  
!     changed = true;
  
      return true;
--- 762,766 ----
      }
  
!     setDirty();
  
      return true;
***************
*** 788,791 ****
--- 790,795 ----
      }
  
+     setDirty();
+ 
      return trackid;
  }
***************
*** 796,799 ****
--- 800,806 ----
          return false;   // doesn't make sense
      }
+     if ( containsAlbum( newartist, newtitle ) ) {
+         return false;
+     }
      // update track info
      FilteredIterator<TrackMap::const_iterator, AlbumFinder>
***************
*** 815,827 ****
      }
  
      return true;
  }
  
! 
! /*!
!     \fn ITunesDB::isChanged()
!  */
! bool ITunesDB::isChanged() {
!     return changed;
  }
  
--- 822,833 ----
      }
  
+     setDirty();
+ 
      return true;
  }
  
! void ITunesDB::setMainListTitle( const QString& title ) {
!     mainlist.setTitle( title );
!     setDirty();
  }
  
***************
*** 833,836 ****
--- 839,849 ----
   ***************************************************************************/
  
+ /*!
+     \fn ITunesDB::isChanged()
+  */
+ bool ITunesDB::isDirty() const {
+     return m_dirty;
+ }
+ 
  
  void ITunesDB::removeFromAllPlaylists( Q_UINT32 trackid ) {
***************
*** 881,890 ****
      \fn getNumTracks()
   */
! Q_UINT32 ITunesDB::getNumTracks() {
      return trackmap.count();
  }
  
  
! Q_UINT32 ITunesDB::getNumPlaylists() {
      return playlists->count();
  }
--- 894,903 ----
      \fn getNumTracks()
   */
! Q_UINT32 ITunesDB::getNumTracks() const {
      return trackmap.count();
  }
  
  
! Q_UINT32 ITunesDB::getNumPlaylists() const {
      return playlists->count();
  }

--- trackmetadataprovider.h DELETED ---

Index: itunesdb.h
===================================================================
RCS file: /cvsroot/kpod/ipodslave/src/libqtpod/itunesdb.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** itunesdb.h	18 Feb 2006 21:24:54 -0000	1.8
--- itunesdb.h	21 Feb 2006 00:20:59 -0000	1.9
***************
*** 81,87 ****
       * Returns true if the itunesdb file has been changed thus needs to be reloaded or does not exist anymore
       */
!     bool dbFileChanged();
      
!     QString getFilename() { return itunesdbfile.name(); }
  
      /**
--- 81,87 ----
       * Returns true if the itunesdb file has been changed thus needs to be reloaded or does not exist anymore
       */
!     bool dbFileChanged() const;
      
!     QString getFilename() const { return itunesdbfile.name(); }
  
      /**
***************
*** 204,225 ****
       * a change to a Playlist or a Track for example will not set the change flag yet.
       */
!     bool isChanged();
  
      /**
       * Returns the max track ID found
       */
!     Q_UINT32 getMaxTrackID() { return maxtrackid; }
  
      /**
       * Returns the number of tracks
       */
!     Q_UINT32 getNumTracks();
  
      /**
       * returns the number of playlists
       */
!     Q_UINT32 getNumPlaylists();
  
!     Q_UINT64 getMaxTrackDBID() { return maxTrackDBID; }
      /**
       * Lock control functions to prevent concurrent access to the Database from different slaves
--- 204,225 ----
       * a change to a Playlist or a Track for example will not set the change flag yet.
       */
!     bool isDirty() const;
  
      /**
       * Returns the max track ID found
       */
!     Q_UINT32 getMaxTrackID() const { return maxtrackid; }
  
      /**
       * Returns the number of tracks
       */
!     Q_UINT32 getNumTracks() const;
  
      /**
       * returns the number of playlists
       */
!     Q_UINT32 getNumPlaylists() const;
  
!     Q_UINT64 getMaxTrackDBID() const { return maxTrackDBID; }
      /**
       * Lock control functions to prevent concurrent access to the Database from different slaves
***************
*** 233,237 ****
       * sets the title of the mainlist
       */
!     void setMainListTitle( const QString& title ) { mainlist.setTitle( title ); }
  
      /**
--- 233,237 ----
       * sets the title of the mainlist
       */
!     void setMainListTitle( const QString& title );
  
      /**
***************
*** 247,251 ****
      class PlaylistContainer;
      PlaylistContainer * playlists;
!     bool changed;
      Q_UINT32 maxtrackid;
      Q_UINT64 maxTrackDBID;
--- 247,252 ----
      class PlaylistContainer;
      PlaylistContainer * playlists;
!     bool m_dirty;
!     void setDirty( bool dirtyFlag = true ) { m_dirty = dirtyFlag; }
      Q_UINT32 maxtrackid;
      Q_UINT64 maxTrackDBID;