fix NZB archives containing their own NZB file (with the same name) hanging

hellanzb
fixes #425

Author: pjenvey

CHANGELOG

@@ -1,5 +1,8 @@
 v0.14:
 
+o Fix NZB archives containing their own NZB file (with the same name)
+  hanging hellanzb
+
 o Quiet warnings on Python 2.6.
 
 o Now strips whitespace from NZB data, fixes slow downloads on some
@@ -19,7 +22,7 @@ o Fixed defunct post processor processes on Solaris (Thanks andy at
   stormsail)
 
 o Fixed a stall towards the end of a download situation when using
-multiple servers pools:
+  multiple servers pools:
 
 When one server pool couldn't establish any connections to the server
 and had queued segments particular to that pool (either during

Hellanzb/Daemon.py

@@ -353,9 +353,13 @@ def handleNZBDone(nzb):
     move(Hellanzb.WORKING_DIR, processingDir)
     nzb.destDir = processingDir
     nzb.archiveDir = processingDir
-    
-    move(nzb.nzbFileName, processingDir)
-    nzb.nzbFileName = os.path.join(processingDir, nzb.nzbFileName)
+
+    nzbFileName = os.path.join(processingDir, os.path.basename(nzb.nzbFileName))
+    # We may have downloaded an NZB file of the same name:
+    # http://hellanzb.com/trac/hellanzb/ticket/425
+    hellaRename(nzbFileName)
+    move(nzb.nzbFileName, nzbFileName)
+    nzb.nzbFileName = nzbFileName
 
     os.mkdir(Hellanzb.WORKING_DIR)