Revert transactional changes to FileHandler

Closes 957
theotherp · Jun 10, 2024 · 2fa3945 · 2fa3945
1 parent 104f451
commit 2fa3945
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/core/src/main/java/org/nzbhydra/downloading/FileHandler.java b/core/src/main/java/org/nzbhydra/downloading/FileHandler.java
@@ -2,7 +2,6 @@
 
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Sets;
-import lombok.Getter;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -83,12 +82,10 @@ public class FileHandler {
     @Autowired
     private IndexerSpecificDownloadExceptions indexerSpecificDownloadExceptions;
 
-    @Getter
     private final Set<File> temporaryZipFiles = new HashSet<>();
     @Autowired
     private TempFileProvider tempFileProvider;
 
-    @Transactional
     public DownloadResult getFileByGuid(long guid, SearchSource accessSource) throws InvalidSearchResultIdException {
         final SearchResultEntity searchResult = getResultFromGuid(guid, accessSource);
         final IndexerConfig indexerConfig = configProvider.getIndexerByName(searchResult.getIndexer().getName());
@@ -123,8 +120,7 @@ public DownloadResult getFileByResult(FileDownloadAccessType fileDownloadAccessT
         return getFileByResult(fileDownloadAccessType, accessSource, result, new HashSet<>());
     }
 
-    @Transactional
-    DownloadResult getFileByResult(FileDownloadAccessType fileDownloadAccessType, SearchSource accessSource, SearchResultEntity result, Set<SearchResultEntity> alreadyTriedDownloading) {
+    private DownloadResult getFileByResult(FileDownloadAccessType fileDownloadAccessType, SearchSource accessSource, SearchResultEntity result, Set<SearchResultEntity> alreadyTriedDownloading) {
         logger.info("{} download request for \"{}\" from indexer {}", fileDownloadAccessType, result.getTitle(), result.getIndexer().getName());
         if (fileDownloadAccessType == FileDownloadAccessType.REDIRECT) {
             return handleRedirect(accessSource, result, null);
@@ -221,7 +217,6 @@ private void publishEvents(SearchResultEntity result, FileDownloadEntity downloa
     }
 
 
-    @Transactional
     public FileZipResponse getFilesAsZip(List<Long> guids) throws Exception {
         Path tempDirectory;
         try {
@@ -244,8 +239,7 @@ public FileZipResponse getFilesAsZip(List<Long> guids) throws Exception {
         return new FileZipResponse(true, zip.getAbsolutePath(), message, nzbsDownload.successfulIds, nzbsDownload.failedIds);
     }
 
-    @Transactional
-    NzbsDownload getNzbsAsFiles(Collection<Long> guids, Path targetDirectory) {
+    private NzbsDownload getNzbsAsFiles(Collection<Long> guids, Path targetDirectory) {
         final NzbsDownload nzbsDownload;
 
         final List<File> files = new ArrayList<>();
@@ -417,7 +411,6 @@ private byte[] handleRedirect(SearchResultEntity result, Response response) thro
         throw new DownloadException(result.getLink(), 500, "Unable to handle redirect from URL " + result.getLink() + " because no redirection location is set");
     }
 
-    @Transactional
     public GenericResponse saveNzbToBlackhole(Long searchResultId) {
         if (configProvider.getBaseConfig().getDownloading().getSaveNzbsTo().isEmpty()) {
             //Shouldn't happen
@@ -431,6 +424,10 @@ public GenericResponse saveNzbToBlackhole(Long searchResultId) {
         return GenericResponse.ok();
     }
 
+    public Set<File> getTemporaryZipFiles() {
+        return temporaryZipFiles;
+    }
+
     private static class NzbsDownload {
         private final List<File> files;
         private final List<Long> successfulIds;

diff --git a/core/src/main/java/org/nzbhydra/indexers/Binsearch.java b/core/src/main/java/org/nzbhydra/indexers/Binsearch.java
@@ -6,6 +6,7 @@
 import dev.failsafe.RetryPolicy;
 import dev.failsafe.function.CheckedSupplier;
 import joptsimple.internal.Strings;
+import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -158,7 +159,7 @@ private SearchResultItem parseRow(Element row) {
         item.setTitle(title);
 
         item.setIndexerGuid(getElementOrNone(row, "input[type=checkbox]").attr("name"));
-        item.setLink("https://binsearch.info/nzb?mode=files&%s=on&name=%s".formatted(item.getIndexerGuid(), filename + ".nzb"));
+        item.setLink("https://binsearch.info/nzb?mode=files&%s=on&name=%s".formatted(item.getIndexerGuid(), StringUtils.removeEnd(filename, ".nzb") + ".nzb"));
         Element infoElement = getElementOrNone(row, "td:nth-child(3) > div:nth-child(1) > div");
         if (infoElement == null) {
             debug("Ignored entry because it has no info");

diff --git a/core/src/main/resources/changelog.yaml b/core/src/main/resources/changelog.yaml
@@ -1,4 +1,10 @@
 #@formatter:off
+-   version: "v7.2.3"
+    date: "2024-06-10"
+    changes:
+      -   type: "fix"
+          text: "Roll back changes that causes errors when downloading NZBs (which kinda sounds like I did those on purpose, but I didn't, really!) See #957"
+    final: true
 -   version: "v7.2.2"
     date: "2024-06-08"
     changes: