From e220b395ea459756dd6b6f74dd3c214ee0ce6291 Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Thu, 29 Nov 2012 14:18:30 +0100
Subject: [PATCH] More gracefully deal with files that failed to tag in Ubuntu
 One.

---
 src/internet/ubuntuoneservice.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/internet/ubuntuoneservice.cpp b/src/internet/ubuntuoneservice.cpp
index 3e82e1d7d..6af3b2fe6 100644
--- a/src/internet/ubuntuoneservice.cpp
+++ b/src/internet/ubuntuoneservice.cpp
@@ -175,6 +175,15 @@ void UbuntuOneService::MaybeAddFileToDatabase(const QVariantMap& file) {
 void UbuntuOneService::ReadTagsFinished(
     TagReaderClient::ReplyType* reply, const QVariantMap& file, const QUrl& url) {
   qLog(Debug) << reply->message().DebugString().c_str();
+
+  const auto& message = reply->message().read_cloud_file_response();
+
+  if (!message.has_metadata() ||
+      !message.metadata().filesize()) {
+    qLog(Debug) << "Failed to tag:" << url;
+    return;
+  }
+
   Song song;
   song.InitFromProtobuf(reply->message().read_cloud_file_response().metadata());
   song.set_directory_id(0);