wip pre-0.7.1 side fixes

This commit is contained in:
Nick Sweeting 2023-11-14 02:04:49 -08:00
parent 2b421c56bb
commit 6761ed368c
12 changed files with 1772 additions and 13 deletions

3
.vscode/settings.json vendored Normal file
View file

@ -0,0 +1,3 @@
{
"python.formatting.provider": "black"
}

View file

@ -786,6 +786,7 @@ def find_chrome_binary() -> Optional[str]:
# Precedence: Chromium, Chrome, Beta, Canary, Unstable, Dev # Precedence: Chromium, Chrome, Beta, Canary, Unstable, Dev
# make sure data dir finding precedence order always matches binary finding order # make sure data dir finding precedence order always matches binary finding order
default_executable_paths = ( default_executable_paths = (
# '~/Library/Caches/ms-playwright/chromium-*/chrome-mac/Chromium.app/Contents/MacOS/Chromium',
'chromium-browser', 'chromium-browser',
'chromium', 'chromium',
'/Applications/Chromium.app/Contents/MacOS/Chromium', '/Applications/Chromium.app/Contents/MacOS/Chromium',

View file

@ -48,22 +48,23 @@ class TagInline(admin.TabularInline):
from django.contrib.admin.helpers import ActionForm from django.contrib.admin.helpers import ActionForm
from django.contrib.admin.widgets import AutocompleteSelectMultiple from django.contrib.admin.widgets import AutocompleteSelectMultiple
class AutocompleteTags: # class AutocompleteTags:
model = Tag # model = Tag
search_fields = ['name'] # search_fields = ['name']
# name = 'tags'
class AutocompleteTagsAdminStub: # class AutocompleteTagsAdminStub:
name = 'admin' # name = 'admin'
class SnapshotActionForm(ActionForm): class SnapshotActionForm(ActionForm):
tags = forms.ModelMultipleChoiceField( tags = forms.ModelMultipleChoiceField(
queryset=Tag.objects.all(), queryset=Tag.objects.all(),
required=False, required=False,
widget=AutocompleteSelectMultiple( # widget=AutocompleteSelectMultiple(
AutocompleteTags(), # # AutocompleteTags(),
AutocompleteTagsAdminStub(), # # AutocompleteTagsAdminStub(),
), # ),
) )
# TODO: allow selecting actions for specific extractors? is this useful? # TODO: allow selecting actions for specific extractors? is this useful?

View file

@ -3,4 +3,4 @@ from django.apps import AppConfig
class CoreConfig(AppConfig): class CoreConfig(AppConfig):
name = 'core' name = 'core'
default_auto_field = 'django.db.models.UUIDField' # default_auto_field = 'django.db.models.UUIDField'

View file

@ -268,6 +268,7 @@ AUTH_PASSWORD_VALIDATORS = [
{'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'}, {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'},
] ]
# DEFAULT_AUTO_FIELD = 'django.db.models.UUIDField'
################################################################################ ################################################################################
### Shell Settings ### Shell Settings

View file

@ -393,7 +393,11 @@ def log_link_archiving_finished(link: "Link", link_dir: str, is_new: bool, stats
else: else:
_LAST_RUN_STATS.succeeded += 1 _LAST_RUN_STATS.succeeded += 1
size = get_dir_size(link_dir) try:
size = get_dir_size(link_dir)
except FileNotFoundError:
size = (0, None, '0')
end_ts = datetime.now(timezone.utc) end_ts = datetime.now(timezone.utc)
duration = str(end_ts - start_ts).split('.')[0] duration = str(end_ts - start_ts).split('.')[0]
print(' {black}{} files ({}) in {}s {reset}'.format(size[2], printable_filesize(size[0]), duration, **ANSI)) print(' {black}{} files ({}) in {}s {reset}'.format(size[2], printable_filesize(size[0]), duration, **ANSI))

1
archivebox/static Symbolic link
View file

@ -0,0 +1 @@
templates/static

View file

@ -88,4 +88,5 @@
{% endblock %} {% endblock %}
</div> </div>
</div> </div>
<script>alert(1)</script>
{% endblock %} {% endblock %}

View file

@ -21,7 +21,6 @@ services:
# - ./etc/crontabs:/var/spool/cron/crontabs # uncomment this and archivebox_scheduler below to set up automatic recurring archive jobs # - ./etc/crontabs:/var/spool/cron/crontabs # uncomment this and archivebox_scheduler below to set up automatic recurring archive jobs
# - ./archivebox:/app/archivebox # uncomment this to mount the ArchiveBox source code at runtime (for developers working on archivebox) # - ./archivebox:/app/archivebox # uncomment this to mount the ArchiveBox source code at runtime (for developers working on archivebox)
# build: . # uncomment this to build the image from source code at buildtime (for developers working on archivebox) # build: . # uncomment this to build the image from source code at buildtime (for developers working on archivebox)
environment: environment:
- ALLOWED_HOSTS=* # restrict this to only accept incoming traffic via specific domain name - ALLOWED_HOSTS=* # restrict this to only accept incoming traffic via specific domain name
# - PUBLIC_INDEX=True # set to False to prevent anonymous users from viewing snapshot list # - PUBLIC_INDEX=True # set to False to prevent anonymous users from viewing snapshot list
@ -161,4 +160,4 @@ networks:
ipam: ipam:
driver: default driver: default
config: config:
- subnet: 172.20.0.0/24 - subnet: 172.20.0.0/24

8
etc/crontabs/archivebox Normal file
View file

@ -0,0 +1,8 @@
# DO NOT EDIT THIS FILE - edit the master and reinstall.
# (/tmp/tmpe3dawo9u installed on Tue Jun 13 23:21:48 2023)
# (Cron version -- $Id: crontab.c,v 2.13 1994/01/17 03:20:37 vixie Exp $)
@daily cd /data && /usr/local/bin/archivebox add --depth=0 "https://example.com/3" >> /data/logs/schedule.log 2>&1 # archivebox_schedule
@daily cd /data && /usr/local/bin/archivebox add --depth=0 "https://example.com/2" >> /data/logs/schedule.log 2>&1 # archivebox_schedule
@daily cd /data && /usr/local/bin/archivebox add --depth=0 "https://example.com" >> /data/logs/schedule.log 2>&1 # archivebox_schedule
@daily cd /data && /usr/local/bin/archivebox add --depth=0 "update" >> /data/logs/schedule.log 2>&1 # archivebox_schedule

1740
package-lock.json generated

File diff suppressed because it is too large Load diff

BIN
screenshot.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB