Merge pull request #850 from egbertbouman/checkpoint_recovery

Checkpoint recovery fixes

Tribler/Core/APIImplementation/LaunchManyCore.py

@@ -550,7 +550,7 @@ def resume_download(self, filename, initialdlstatus=None, initialdlstatus_dict={
                     save_name = sdef.get_roothash_as_hex()
                     torrentfile = os.path.join(torrent_dir, save_name)
 
-                if torrentfile and os.path.isfile(torrentfile):
+                if torrentfile and not os.path.isfile(torrentfile):
                     # normal torrentfile is not present, see if readable torrent is there
                     save_name = get_readable_torrent_name(infohash, torrent['name'])
                     torrentfile = os.path.join(torrent_dir, save_name)

Tribler/Core/Libtorrent/LibtorrentDownloadImpl.py

@@ -299,9 +299,10 @@ def network_create_engine_wrapper(self, lm_network_engine_wrapper_created_callba
                     self.orig_files[i] = filename_new
 
             atp["ti"] = torrentinfo
-            if resume_data:
+            has_resume_data = resume_data and isinstance(resume_data, dict)
+            if has_resume_data:
                 atp["resume_data"] = lt.bencode(resume_data)
-            self._logger.info("%s %s", self.tdef.get_name_as_unicode(), dict((k, v) for k, v in resume_data.iteritems() if k not in ['pieces', 'piece_priority', 'peers']) if resume_data else None)
+            self._logger.info("%s %s", self.tdef.get_name_as_unicode(), dict((k, v) for k, v in resume_data.iteritems() if k not in ['pieces', 'piece_priority', 'peers']) if has_resume_data else None)
         else:
             if self.tdef.get_url():
                 # We prefer to use an url, since it may contain trackers