Disallow deleting media from its path.

Only use a Media instance & expose media deletion methods internally
only

include/IMediaLibrary.h

@@ -97,8 +97,6 @@ class IMediaLibrary
         /// \return The newly created file, or nullptr in case of error
         ///
         virtual MediaPtr file( const std::string& path ) = 0;
-        virtual bool deleteFile( const std::string& mrl ) = 0;
-        virtual bool deleteFile( MediaPtr file ) = 0;
 
         /// Adds a folder and all the files it contains
         virtual FolderPtr folder( const std::string& path ) = 0;

src/MediaLibrary.cpp

@@ -243,14 +243,9 @@ FolderPtr MediaLibrary::folder( const std::string& path )
     return Folder::fetch( m_dbConnection.get(), path );
 }
 
-bool MediaLibrary::deleteFile( const std::string& mrl )
+bool MediaLibrary::deleteFile( const Media* file )
 {
-    return Media::destroy( m_dbConnection.get(), mrl );
-}
-
-bool MediaLibrary::deleteFile( MediaPtr file )
-{
-    return Media::destroy( m_dbConnection.get(), file.get() );
+    return Media::destroy( m_dbConnection.get(), file );
 }
 
 bool MediaLibrary::deleteFolder( FolderPtr folder )

src/MediaLibrary.h

@@ -52,8 +52,7 @@ class MediaLibrary : public IMediaLibrary
         virtual std::vector<MediaPtr> videoFiles() override;
         virtual MediaPtr file( const std::string& path ) override;
         std::shared_ptr<Media> addFile(const std::string& path , FolderPtr parentFolder);
-        virtual bool deleteFile( const std::string& mrl ) override;
-        virtual bool deleteFile( MediaPtr file ) override;
+        virtual bool deleteFile(const Media* file );
 
         virtual FolderPtr folder( const std::string& path ) override;
         virtual bool deleteFolder( FolderPtr folder ) override;

src/discoverer/FsDiscoverer.cpp

@@ -174,13 +174,13 @@ void FsDiscoverer::checkFiles( fs::IDirectory* folder, FolderPtr parentFolder )
             continue;
         }
         LOG_INFO( "Forcing file refresh ", filePath );
-        m_ml->deleteFile( filePath );
+        m_ml->deleteFile( (*it).get() );
         m_ml->addFile( filePath, parentFolder );
         files.erase( it );
     }
     for ( auto file : files )
     {
         LOG_INFO( "File ", file->mrl(), " not found on filesystem, deleting it" );
-        m_ml->deleteFile( file );
+        m_ml->deleteFile( file.get() );
     }
 }

test/unittest/MediaTests.cpp

@@ -77,7 +77,7 @@ TEST_F( Medias, Delete )
 
     ASSERT_EQ( f, f2 );
 
-    ml->deleteFile( f );
+    ml->deleteFile( f.get() );
     f2 = ml->file( "media.avi" );
     ASSERT_EQ( f2, nullptr );
 }