From 1dfbe5d7a847ca7b9c0e9afaf51b71c82604031f Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Wed, 28 Dec 2011 14:36:24 -0200 Subject: [PATCH] scrapyd.webservice: relocate ListJobs resource for better consistency --- scrapyd/webservice.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/scrapyd/webservice.py b/scrapyd/webservice.py index 51febc599..7909fd0b3 100644 --- a/scrapyd/webservice.py +++ b/scrapyd/webservice.py @@ -66,6 +66,17 @@ class ListSpiders(WsResource): spiders = get_spider_list(project, runner=self.root.runner) return {"status": "ok", "spiders": spiders} +class ListJobs(WsResource): + + def render_POST(self, txrequest): + project = txrequest.args['project'][0] + spiders = self.root.launcher.processes.values() + jlist = list() + for s in spiders: + if project == s.project: + jlist.append({"job": {"id":s.job, "spider": s.spider}}) + return {"status":"ok", "jobs": jlist} + class DeleteProject(WsResource): def render_POST(self, txrequest): @@ -84,13 +95,3 @@ class DeleteVersion(DeleteProject): version = txrequest.args['version'][0] self._delete_version(project, version) return {"status": "ok"} - -class ListJobs(WsResource): - def render_POST(self, txrequest): - project = txrequest.args['project'][0] - spiders = self.root.launcher.processes.values() - jlist = list() - for s in spiders: - if project == s.project: - jlist.append({"job": {"id":s.job, "spider": s.spider}}) - return {"status":"ok", "jobs": jlist}