forks/archivebox
1
0
Fork 0
Code Releases Activity

add form parser option

Browse source
This commit is contained in:
Nick Sweeting 2021-04-01 02:34:16 -04:00
parent 59d5423483
commit 5d7ad9b1b4
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
archivebox/core/forms.py
View file

@ -3,9 +3,14 @@ __package__ = 'archivebox.core'
from django import forms from django import forms
from ..util import URL_REGEX from ..util import URL_REGEX
from ..parsers import PARSERS
from ..vendor.taggit_utils import edit_string_for_tags, parse_tags from ..vendor.taggit_utils import edit_string_for_tags, parse_tags
CHOICES = ( PARSER_CHOICES = [
(parser_key, parser[0])
for parser_key, parser in PARSERS.items()
]
DEPTH_CHOICES = (
('0', 'depth = 0 (archive just these URLs)'), ('0', 'depth = 0 (archive just these URLs)'),
('1', 'depth = 1 (archive these URLs and all URLs one hop away)'), ('1', 'depth = 1 (archive these URLs and all URLs one hop away)'),
) )
@ -20,8 +25,9 @@ ARCHIVE_METHODS = [
class AddLinkForm(forms.Form): class AddLinkForm(forms.Form):
url = forms.RegexField(label="URLs (one per line)", regex=URL_REGEX, min_length='6', strip=True, widget=forms.Textarea, required=True) url = forms.RegexField(label="URLs (one per line)", regex=URL_REGEX, min_length='6', strip=True, widget=forms.Textarea, required=True)
parser = forms.ChoiceField(label="URLs format", choices=[('auto', 'Auto-detect parser'), *PARSER_CHOICES], initial='auto')
tag = forms.CharField(label="Tags (comma separated tag1,tag2,tag3)", strip=True, required=False) tag = forms.CharField(label="Tags (comma separated tag1,tag2,tag3)", strip=True, required=False)
depth = forms.ChoiceField(label="Archive depth", choices=CHOICES, initial='0', widget=forms.RadioSelect(attrs={"class": "depth-selection"})) depth = forms.ChoiceField(label="Archive depth", choices=DEPTH_CHOICES, initial='0', widget=forms.RadioSelect(attrs={"class": "depth-selection"}))
archive_methods = forms.MultipleChoiceField( archive_methods = forms.MultipleChoiceField(
label="Archive methods (select at least 1, otherwise all will be used by default)", label="Archive methods (select at least 1, otherwise all will be used by default)",
required=False, required=False,

2
archivebox/core/views.py
View file

@ -263,6 +263,7 @@ class AddView(UserPassesTestMixin, FormView):
def form_valid(self, form): def form_valid(self, form):
url = form.cleaned_data["url"] url = form.cleaned_data["url"]
print(f'[+] Adding URL: {url}') print(f'[+] Adding URL: {url}')
parser = form.cleaned_data["parser"]
tag = form.cleaned_data["tag"] tag = form.cleaned_data["tag"]
depth = 0 if form.cleaned_data["depth"] == "0" else 1 depth = 0 if form.cleaned_data["depth"] == "0" else 1
extractors = ','.join(form.cleaned_data["archive_methods"]) extractors = ','.join(form.cleaned_data["archive_methods"])
@ -270,6 +271,7 @@ class AddView(UserPassesTestMixin, FormView):
"urls": url, "urls": url,
"tag": tag, "tag": tag,
"depth": depth, "depth": depth,
"parser": parser,
"update_all": False, "update_all": False,
"out_dir": OUTPUT_DIR, "out_dir": OUTPUT_DIR,
} }