From 3e8825efcf7345ad25ee664a8f401c6b723a1e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20S=C4=99kiewicz?= Date: Fri, 22 Sep 2023 11:58:09 +0200 Subject: [PATCH 1/2] transparent list of projects #493 --- scrapyd/website.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scrapyd/website.py b/scrapyd/website.py index 6bdfb44c..b875a104 100644 --- a/scrapyd/website.py +++ b/scrapyd/website.py @@ -71,7 +71,6 @@ def __init__(self, root, local_items): def render_GET(self, txrequest): vars = { - 'projects': ', '.join(self.root.scheduler.list_projects()), 'base_path': self.get_base_path(txrequest), } s = """ @@ -79,7 +78,6 @@ def render_GET(self, txrequest): Scrapyd

Scrapyd

-

Available projects: %(projects)s

+

Available projects:

+""" % vars + if self.root.scheduler.list_projects(): + s += '

' + else: + s += 'no projects' + s += """

How to schedule a spider?

To schedule a spider you need to use the API (this web UI is only for From 4ae46f4ba329024858a95b15215da3c5f87c2649 Mon Sep 17 00:00:00 2001 From: James McKinney <26463+jpmckinney@users.noreply.github.com> Date: Mon, 25 Sep 2023 15:17:04 -0400 Subject: [PATCH 2/2] feat: Copy-edit project listing --- scrapyd/tests/test_website.py | 4 ++-- scrapyd/website.py | 16 +++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/scrapyd/tests/test_website.py b/scrapyd/tests/test_website.py index 6f00a1a6..e1706448 100644 --- a/scrapyd/tests/test_website.py +++ b/scrapyd/tests/test_website.py @@ -24,10 +24,10 @@ def test_render_home(self, txrequest, site_no_egg): content = site_no_egg.children[b''].render_GET(txrequest) expect_headers = { b'Content-Type': [b'text/html; charset=utf-8'], - b'Content-Length': [b'704'], + b'Content-Length': [b'714'], } if site_no_egg.local_items: - expect_headers[b'Content-Length'] = [b'740'] + expect_headers[b'Content-Length'] = [b'751'] headers = dict(txrequest.responseHeaders.getAllRawHeaders()) diff --git a/scrapyd/website.py b/scrapyd/website.py index b875a104..9442fc8a 100644 --- a/scrapyd/website.py +++ b/scrapyd/website.py @@ -73,7 +73,7 @@ def render_GET(self, txrequest): vars = { 'base_path': self.get_base_path(txrequest), } - s = """ + s = """\ Scrapyd @@ -82,21 +82,19 @@ def render_GET(self, txrequest):

  • Jobs
    • """ if self.local_items: - s += '
  • Items
    • ' - s += """ + s += '
  • Items
    • \n' + s += """\
  • Logs
  • Documentation
    • - -

    Available projects:

    """ % vars if self.root.scheduler.list_projects(): - s += '

    \n' else: - s += 'no projects' + s += '

    No projects available.

    \n' s += """

    How to schedule a spider?