FIX:(#869) Unable to clear Failed downloads that have no ID value pre…

…sent
mylar3 · Aug 29, 2021 · 5d095b8 · 5d095b8
1 parent 56f4f50
commit 5d095b8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/data/interfaces/default/managefailed.html b/data/interfaces/default/managefailed.html
@@ -42,8 +42,13 @@ <h1 class="clearfix">Manage Failed Downloads</h1>
 		</thead>
 		<tbody>
 		%for f in failed:
+                        <%
+                            f_id = f['ID']
+                            if any([f_id is None, f_id == '']):
+                                f_id = '%s##%s##%s##%s' % (f['IssueID'],f['Provider'],f['FileName'],f['DateFailed'])
+                        %>
 			<tr>
-				<td id="select"><input type="checkbox" name="${f['ID']}" class="checkbox" /></td>
+				<td id="select"><input type="checkbox" name="${f_id}" class="checkbox" /></td>
 				<td id="series"><a href="comicDetails?ComicID=${f['ComicID']}">${f['Series']}</td>
 				<td id="issue">${f['Issue_Number']}</td>
 				<td id="site">${f['Provider']}</td>

diff --git a/mylar/webserve.py b/mylar/webserve.py
@@ -1344,11 +1344,14 @@ def markentries(self, action=None, **args):
         myDB = db.DBConnection()
         cnt = 0
         for ID in args:
-            logger.info(ID)
             if any([ID is None, 'manage_failed_length' in ID]):
                 continue
             else:
-                myDB.action("DELETE FROM Failed WHERE ID=?", [ID])
+                if '##' in ID:
+                    f = ID.split('##')
+                    myDB.action("DELETE FROM Failed WHERE IssueID=? AND Provider=? AND NZBName=? AND DateFailed=?", [f[0],f[1],f[2],f[3]])
+                else:
+                    myDB.action("DELETE FROM Failed WHERE ID=?", [ID])
                 cnt+=1
         logger.info('[DB FAILED CLEANSING] Cleared ' + str(cnt) + ' entries from the Failed DB so they will now be downloaded if available/working.')
     markentries.exposed = True
@@ -2999,6 +3002,7 @@ def manageFailed(self):
 
             results.append({"Series":        f['ComicName'],
                             "ComicID":       f['ComicID'],
+                            "IssueID":       f['IssueID'],
                             "Issue_Number":  f['Issue_Number'],
                             "Provider":      f['Provider'],
                             "Link":          link,