Ticket #12424: 0008-RemoteFile-CopyFile-Don-t-overwrite-existing-files-b.patch

mythplugins/mythmusic/mythmusic/cdrip.cpp

@@ -394 +394 @@
                 destFile = gCoreContext->GenMythURL(url.host(), 0, destFile, "Music");
 
                 QApplication::postEvent(m_parent, new RipStatusEvent(RipStatusEvent::kCopyStartEvent, 0));
-                RemoteFile::CopyFile(saveDir + outfile, destFile);
+                RemoteFile::CopyFile(saveDir + outfile, destFile, true);
                 QApplication::postEvent(m_parent, new RipStatusEvent(RipStatusEvent::kCopyEndEvent, 0));
             }
         }

mythplugins/mythmusic/mythmusic/editmetadata.cpp

@@ -860 +860 @@
                     return;
                 }
 
-                RemoteFile::CopyFile(oldFilename, newFilename);
+                RemoteFile::CopyFile(oldFilename, newFilename, true);
                 QFile::remove(oldFilename);
 
                 if (m_searchType == "album")
@@ -1373 +1373 @@
                                                     QString("AlbumArt/") + fi.fileName(),
                                                     "MusicArt");
 
-    RemoteFile::CopyFile(image->filename, saveFilename);
+    RemoteFile::CopyFile(image->filename, saveFilename, true);
 
     // ask the backend to add the image to the tracks tag
     QStringList strList("MUSIC_TAG_ADDIMAGE");

mythplugins/mythmusic/mythmusic/importmusic.cpp

@@ -53 +53 @@
 void FileCopyThread::run()
 {
     RunProlog();
-    m_result = RemoteFile::CopyFile(m_srcFile, m_dstFile);
+    m_result = RemoteFile::CopyFile(m_srcFile, m_dstFile, true);
     RunEpilog();
 }
 
@@ -438 +438 @@
 
         m_somethingWasImported = true;
 
-        m_tracks->at(m_currentTrack)->isNewTune = 
+        m_tracks->at(m_currentTrack)->isNewTune =
                 isNewTune(meta->Artist(), meta->Album(), meta->Title());
 
         // update the UI
@@ -543 +543 @@
         location.append('/');
 
     MythScreenStack *popupStack = GetMythMainWindow()->GetStack("popup stack");
-    MythUIBusyDialog *busy = 
+    MythUIBusyDialog *busy =
             new MythUIBusyDialog(tr("Searching for music files"),
                                      popupStack,
                                      "scanbusydialog");
@@ -814 +814 @@
     MusicMetadata *data = m_tracks->at(m_currentTrack)->metadata;
     data->setAlbum(m_defaultAlbum);
 
-    m_tracks->at(m_currentTrack)->isNewTune = 
+    m_tracks->at(m_currentTrack)->isNewTune =
             isNewTune(data->Artist(), data->Album(), data->Title());
 
     fillWidgets();
@@ -1075 +1075 @@
 {
     if (m_filelist.size() > 0)
     {
-        if (!RemoteFile::CopyFile(m_filelist[m_currentFile], m_saveFilename))
+        if (!RemoteFile::CopyFile(m_filelist[m_currentFile], m_saveFilename, true))
         {
             //: %1 is the filename
             ShowOkPopup(tr("Copy CoverArt Failed.\nCopying to %1").arg(m_saveFilename));

mythtv/libs/libmythbase/remotefile.cpp

@@ -558 +558 @@
     return result;
 }
 
-bool RemoteFile::CopyFile (const QString& src, const QString& dst)
+bool RemoteFile::CopyFile (const QString& src, const QString& dst,
+                           bool overwrite, bool verify)
 {
-    LOG(VB_FILE, LOG_INFO, QString("RemoteFile::CopyFile: Copying file from '%1' to '%2'").arg(src).arg(dst));
+    LOG(VB_FILE, LOG_INFO,
+        QString("RemoteFile::CopyFile: Copying file from '%1' to '%2'").arg(src).arg(dst));
 
     // sanity check
     if (src == dst)
@@ -586 +588 @@
          return false;
     }
 
+    if (overwrite)
+    {
+        DeleteFile(dst);
+    }
+    else if (Exists(dst))
+    {
+        LOG(VB_GENERAL, LOG_ERR, "RemoteFile::CopyFile: File already exists");
+        return false;
+    }
+
     RemoteFile dstFile(dst, true);
     if (!dstFile.isOpen())
     {
@@ -596 +608 @@
          return false;
     }
 
+    dstFile.SetBlocking(true);
+
+    bool success = true;
     int srcLen, dstLen;
 
     while ((srcLen = srcFile.Read(buf, readSize)) > 0)
@@ -605 +620 @@
         if (dstLen == -1 || srcLen != dstLen)
         {
             LOG(VB_GENERAL, LOG_ERR,
-                "RemoteFile::CopyFile:: Error while trying to write to destination file.");
-            srcFile.Close();
-            dstFile.Close();
-            delete[] buf;
-            return false;
+                "RemoteFile::CopyFile: Error while trying to write to destination file.");
+            success = false;
         }
     }
 
@@ -617 +629 @@
     dstFile.Close();
     delete[] buf;
 
-    return true;
+    if (success && verify)
+    {
+        // Check written file is correct size
+        struct stat fileinfo;
+        long long dstSize = Exists(dst, &fileinfo) ? fileinfo.st_size : -1;
+        long long srcSize = srcFile.GetFileSize();
+        if (dstSize != srcSize)
+        {
+            LOG(VB_GENERAL, LOG_ERR,
+                QString("RemoteFile::CopyFile: Copied file is wrong size (%1 rather than %2)")
+                    .arg(dstSize).arg(srcSize));
+            success = false;
+            DeleteFile(dst);
+        }
+    }
+
+    return success;
 }
 
 void RemoteFile::Reset(void)

mythtv/libs/libmythbase/remotefile.h

@@ -41 +41 @@
     static QStringList FindFileList(const QString &filename, const QString &host,
                                     const QString &storageGroup, bool useRegex = false,
                                     bool allowFallback = false);
-    static bool CopyFile(const QString &src, const QString &dest);
+    static bool CopyFile(const QString &src, const QString &dest,
+                         bool overwrite = false, bool verify = false);
 
     int Write(const void *data, int size);
     int Read(void *data, int size);