From f5b6203194f17ec3a65417ea00e17c17bb2dbb41 Mon Sep 17 00:00:00 2001 From: ShyPike Date: Wed, 14 Nov 2012 20:57:02 +0100 Subject: [PATCH] Make check for running SABnzbd instance more robust. Cancel bad side-effect of removing the version check. Under some circumstances SABnzbd can draw the unjustified conclusion that another instance is running. Now check for a proper version pattern in the received output. --- SABnzbd.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SABnzbd.py b/SABnzbd.py index 400f5f5..e1f8059 100755 --- a/SABnzbd.py +++ b/SABnzbd.py @@ -28,6 +28,7 @@ import signal import socket import platform import time +import re try: import Cheetah @@ -691,7 +692,7 @@ def is_sabnzbd_running(url): try: url = '%s&mode=version' % (url) ver = sabnzbd.newsunpack.get_from_url(url) - return True + return bool(ver and re.search(r'\d+\.\d+\.', ver)) except: return False