Attachment 666898 Details for Bug 889311 – Patch resolving the issue for me

[patch] Patch resolving the issue for me

amarok-skip-existing-files.patch (text/plain), 2.09 KB, created by Dmitry Torokhov on 2012-12-20 18:46:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Torokhov

Created: 2012-12-20 18:46:25 UTC

Size: 2.09 KB

patch

obsolete

>Amarok: to not stop tranefers when some files are already at destination
>
>This happens when you want to import a bit tree of tracks at once and some
>tracks are already present in the destination collection.
>
>Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
>---
>
>diff -ru amarok-2.6.0-orig/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp amarok-2.6.0/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp
>--- amarok-2.6.0-orig/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp	2012-08-11 02:09:36.000000000 -0700
>+++ amarok-2.6.0/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp	2012-12-20 10:07:55.439616597 -0800
>@@ -383,7 +383,7 @@
>     DEBUG_BLOCK
> 
>     Meta::TrackPtr track = m_jobs.value( job );
>-    if( job->error() )
>+    if( job->error()  && job->error() != KIO::ERR_FILE_ALREADY_EXIST )
>     {
>         //TODO: proper error handling
>         warning() << "An error occurred when copying a file: " << job->errorString();
>@@ -701,6 +701,15 @@
>     emit infoMessage( this, message );
> }
> 
>+void TransferJob::slotResult( KJob *job )
>+{
>+    // When copying without overwriting some files might already be
>+    // there and it is not a reason for stopping entire transfer.
>+    if ( job->error() == KIO::ERR_FILE_ALREADY_EXIST )
>+        removeSubjob( job );
>+    else
>+        KCompositeJob::slotResult( job );
>+}
> 
> void TransferJob::start()
> {
>Only in amarok-2.6.0/src/core-impl/collections/db/sql/: SqlCollectionLocation.cpp.skip-existing
>diff -ru amarok-2.6.0-orig/src/core-impl/collections/db/sql/SqlCollectionLocation.h amarok-2.6.0/src/core-impl/collections/db/sql/SqlCollectionLocation.h
>--- amarok-2.6.0-orig/src/core-impl/collections/db/sql/SqlCollectionLocation.h	2012-08-11 02:09:36.000000000 -0700
>+++ amarok-2.6.0/src/core-impl/collections/db/sql/SqlCollectionLocation.h	2012-12-19 23:43:40.589722810 -0800
>@@ -59,6 +59,7 @@
>          */
>         void slotJobFinished( KJob *job );
>     protected slots:
>+        void slotResult( KJob *job );
>         void doWork();
>         void propagateProcessedAmount( KJob *job, KJob::Unit unit, qulonglong amount);
>     protected:

Actions: View | Diff

Attachments on bug 889311: 666898