correct exeption and double daeomon use

supysonic/api/__init__.py

@@ -116,4 +116,4 @@ from .playlists import *
 from .jukebox import *
 from .radio import *
 from .unsupported import *
-from .scan import *
+from .scan import *

supysonic/api/exceptions.py

@@ -122,10 +122,3 @@ class AggregateException(SubsonicAPIException):
         )
         # rv.status_code = self.code
         return rv
-
-class DaemonUnavailable(SubsonicAPIException):
-    code = 404
-    api_code = 80
-    message = (
-        "Supysonic Daemon not running on this server."
-    )

supysonic/api/scan.py

@@ -1,33 +1,42 @@
-
 from . import api
-from functools import wraps
 from flask import request
 from flask import current_app
 from .user import admin_only
-from .exceptions import Forbidden,DaemonUnavailable,ServerError
+from .exceptions import ServerError
-from ..db import Folder
 from ..daemon.client import DaemonClient
-from ..daemon.exceptions import DaemonUnavailableError
+
-from ..managers.folder import FolderManager
 
 @api.route("/startScan.view", methods=["GET", "POST"])
 @admin_only
 def startScan():
     try:
-        DaemonClient(current_app.config["DAEMON"]["socket"]).scan()
+        daeomonclient = DaemonClient(current_app.config["DAEMON"]["socket"])
-    except ValueError as e:
+        daeomonclient.scan()
-        ServerError(str(e))
+        scanned = daeomonclient.get_scanning_progress()
-    except DaemonUnavailableError:
+    except Exception as e:
-        raise DaemonUnavailable()
+        raise ServerError(str(e))
-    return getScanStatus()
+    return request.formatter(
+        "scanStatus",
+        dict(
+            scanning="true" if scanned is not None else "false",
+            count=scanned if scanned is not None else 0,
+        ),
+    )
+
 
 @api.route("/getScanStatus.view", methods=["GET", "POST"])
 @admin_only
 def getScanStatus():
     try:
-        scanned=DaemonClient(current_app.config["DAEMON"]["socket"]).get_scanning_progress()
+        scanned = DaemonClient(
-    except DaemonUnavailableError:
+            current_app.config["DAEMON"]["socket"]
-        raise DaemonUnavailable()
+        ).get_scanning_progress()
-    return request.formatter("scanStatus",
+    except Exception as e:
-        dict(scanning='true' if scanned is not None else 'false',
+        raise ServerError(str(e))
-            count= scanned if scanned is not None else 0))
+    return request.formatter(
+        "scanStatus",
+        dict(
+            scanning="true" if scanned is not None else "false",
+            count=scanned if scanned is not None else 0,
+        ),
+    )