diff --git a/boofilsic/settings.py b/boofilsic/settings.py index 1215db03..363758cc 100644 --- a/boofilsic/settings.py +++ b/boofilsic/settings.py @@ -86,7 +86,7 @@ if DEBUG: 'NAME': 'test', 'USER': 'donotban', 'PASSWORD': 'donotbansilvousplait', - 'HOST': '192.168.13.72', + 'HOST': '192.168.13.68', 'OPTIONS': { 'client_encoding': 'UTF8', # 'isolation_level': psycopg2.extensions.ISOLATION_LEVEL_DEFAULT, @@ -173,7 +173,7 @@ CLIENT_SECRET = 'xwmEvlmudLCkBmvdzGf8m41Ug5o5di9xnDqeVLrcKSg' REPORT_MEDIA_PATH_ROOT = 'report/' MARKDOWNX_MEDIA_PATH = 'review/' BOOK_MEDIA_PATH_ROOT = 'book/' -DEFAULT_BOOK_IMAGE = os.path.join(MEDIA_ROOT, BOOK_MEDIA_PATH_ROOT, 'default.jpg') +DEFAULT_BOOK_IMAGE = os.path.join(BOOK_MEDIA_PATH_ROOT, 'default.jpg') # Mastodon domain name MASTODON_DOMAIN_NAME = 'donotban.com' @@ -183,9 +183,9 @@ MASTODON_TIMEOUT = 30 # Emoji code in mastodon # note the white spaces -STAR_SOLID = ' :star_solid: ' -STAR_HALF = ' :star_half: ' -STAR_EMPTY = ' :star_empty: ' +STAR_SOLID = ':star_solid:' +STAR_HALF = ':star_half:' +STAR_EMPTY = ':star_empty:' # Default password for each user. since assword is not used any way, # any string that is not empty is ok diff --git a/books/forms.py b/books/forms.py index 2a5d3614..aa9fed25 100644 --- a/books/forms.py +++ b/books/forms.py @@ -63,7 +63,7 @@ class BookForm(forms.ModelForm): 'author': forms.TextInput(attrs={'placeholder': _("多个作者使用英文逗号分隔")}), 'translator': forms.TextInput(attrs={'placeholder': _("多个译者使用英文逗号分隔")}), 'other_info': KeyValueInput(), - # 'cover': forms.FileInput(), + 'cover': forms.FileInput(), } def clean_isbn(self): diff --git a/books/views.py b/books/views.py index 34ca2e28..ddd0c913 100644 --- a/books/views.py +++ b/books/views.py @@ -79,7 +79,7 @@ def update(request, id): ) elif request.method == 'POST': book = get_object_or_404(Book, pk=id) - form = BookForm(request.POST, instance=book) + form = BookForm(request.POST, request.FILES, instance=book) if form.is_valid(): form.instance.last_editor = request.user form.instance.edited_time = timezone.now() diff --git a/common/mastodon/utils.py b/common/mastodon/utils.py index 1a37c0f2..7da7f94e 100644 --- a/common/mastodon/utils.py +++ b/common/mastodon/utils.py @@ -8,5 +8,7 @@ def rating_to_emoji(score): solid_stars = score // 2 half_star = int(bool(score % 2)) empty_stars = 5 - solid_stars if not half_star else 5 - solid_stars - 1 - emoji_code = STAR_SOLID * solid_stars + STAR_HALF * half_star + STAR_SOLID * empty_stars + emoji_code = STAR_SOLID * solid_stars + STAR_HALF * half_star + STAR_EMPTY * empty_stars + emoji_code = emoji_code.replace("::", ": :") + emoji_code = ' ' + emoji_code + ' ' return emoji_code \ No newline at end of file diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 00000000..2f24c2dd Binary files /dev/null and b/favicon.ico differ diff --git a/media/book/2020/05/0602f22871-766b-40ac-a2e4-902402ea5d84.jpg b/media/book/2020/05/0602f22871-766b-40ac-a2e4-902402ea5d84.jpg new file mode 100644 index 00000000..6d1a2322 Binary files /dev/null and b/media/book/2020/05/0602f22871-766b-40ac-a2e4-902402ea5d84.jpg differ diff --git a/media/book/2020/05/068d67cf4f-08a3-4a9c-a946-87c479953f81.jpg b/media/book/2020/05/068d67cf4f-08a3-4a9c-a946-87c479953f81.jpg new file mode 100644 index 00000000..6d1a2322 Binary files /dev/null and b/media/book/2020/05/068d67cf4f-08a3-4a9c-a946-87c479953f81.jpg differ