diff options
author | Lars-Dominik Braun <lars@6xq.net> | 2018-05-04 15:35:44 +0200 |
---|---|---|
committer | Lars-Dominik Braun <lars@6xq.net> | 2018-05-04 16:00:05 +0200 |
commit | b6d198aed3fa17ac28aa62c9679ec2c33dc0a3da (patch) | |
tree | f8c5a2cf8293dea0f4314b7929e8b277b795947e /crocoite/task.py | |
parent | 2f5cc22dc3277de7a22b9839ff3c42ed40ff50b0 (diff) | |
download | crocoite-b6d198aed3fa17ac28aa62c9679ec2c33dc0a3da.tar.gz crocoite-b6d198aed3fa17ac28aa62c9679ec2c33dc0a3da.tar.bz2 crocoite-b6d198aed3fa17ac28aa62c9679ec2c33dc0a3da.zip |
Share recursive argument parser
Diffstat (limited to 'crocoite/task.py')
-rw-r--r-- | crocoite/task.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/crocoite/task.py b/crocoite/task.py index 52d3b26..e93cfde 100644 --- a/crocoite/task.py +++ b/crocoite/task.py @@ -41,6 +41,7 @@ from celery.utils.log import get_task_logger from .browser import ChromeService from .controller import SinglePageController, ControllerSettings, RecursiveController, defaultSettings, DepthLimit, PrefixLimit from . import behavior +from .cli import parseRecursive app = Celery ('crocoite.distributed') app.config_from_object('celeryconfig') @@ -109,13 +110,7 @@ class DistributedRecursiveController (RecursiveController): def controller (self, url, settings, enabledBehaviorNames, recursive, concurrency): """ Recursive controller """ - if recursive is None: - recursionPolicy = DepthLimit (0) - elif recursive.isdigit (): - recursionPolicy = DepthLimit (int (recursive)) - elif recursive == 'prefix': - recursionPolicy = PrefixLimit (url) - + recursionPolicy = parseRecursive (recursive, url) enabledBehavior = list (filter (lambda x: x.name in enabledBehaviorNames, behavior.available)) settings = ControllerSettings (**settings) controller = DistributedRecursiveController (url, None, behavior=enabledBehavior, |