Merge branch 'develop' of github.com:RuudBurger/CouchPotatoServer into develop

couchpotato/core/downloaders/rtorrent/main.py

@@ -172,9 +172,16 @@ class rTorrent(Downloader):
 
             for torrent in torrents:
                 if torrent.info_hash in ids:
+                    torrent_directory = os.path.normpath(torrent.directory)
                     torrent_files = []
-                    for file_item in torrent.get_files():
-                        torrent_files.append(sp(os.path.join(torrent.directory, file_item.path)))
+
+                    for file in torrent.get_files():
+                        if not os.path.normpath(file.path).startswith(torrent_directory):
+                            file_path = os.path.join(torrent_directory, file.path.lstrip('/'))
+                        else:
+                            file_path = file.path
+
+                        torrent_files.append(sp(file_path))
 
                     status = 'busy'
                     if torrent.complete:

couchpotato/core/providers/torrent/iptorrents/main.py

@@ -99,7 +99,8 @@ class IPTorrents(TorrentProvider):
         result = {}
 
         for x, col in enumerate(entries[0].find_all('th')):
-            key = toSafeString(col.text).strip().lower()
+            name = col.text or col.find('img')['title']
+            key = toSafeString(name).strip().lower()
 
             if not key:
                 continue