mirror of
https://github.com/zulip/zulip.git
synced 2025-11-04 14:03:30 +00:00
69730a78cc
Automatically generated by the following script, based on the output
of lint with flake8-comma:
import re
import sys
last_filename = None
last_row = None
lines = []
for msg in sys.stdin:
m = re.match(
r"\x1b\[35mflake8 \|\x1b\[0m \x1b\[1;31m(.+):(\d+):(\d+): (\w+)", msg
)
if m:
filename, row_str, col_str, err = m.groups()
row, col = int(row_str), int(col_str)
if filename == last_filename:
assert last_row != row
else:
if last_filename is not None:
with open(last_filename, "w") as f:
f.writelines(lines)
with open(filename) as f:
lines = f.readlines()
last_filename = filename
last_row = row
line = lines[row - 1]
if err in ["C812", "C815"]:
lines[row - 1] = line[: col - 1] + "," + line[col - 1 :]
elif err in ["C819"]:
assert line[col - 2] == ","
lines[row - 1] = line[: col - 2] + line[col - 1 :].lstrip(" ")
if last_filename is not None:
with open(last_filename, "w") as f:
f.writelines(lines)
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
92 lines
3.6 KiB
Python
92 lines
3.6 KiB
Python
import os
|
|
import logging
|
|
|
|
from django.conf import settings
|
|
from django.db import connection
|
|
from mimetypes import guess_type
|
|
|
|
from zerver.models import UserProfile, Attachment, RealmEmoji
|
|
from zerver.lib.avatar_hash import user_avatar_path
|
|
from zerver.lib.upload import S3UploadBackend, upload_image_to_s3
|
|
from zerver.lib.parallel import run_parallel
|
|
|
|
s3backend = S3UploadBackend()
|
|
|
|
def transfer_uploads_to_s3(processes: int) -> None:
|
|
# TODO: Eventually, we'll want to add realm icon and logo
|
|
transfer_avatars_to_s3(processes)
|
|
transfer_message_files_to_s3(processes)
|
|
transfer_emoji_to_s3(processes)
|
|
|
|
def transfer_avatars_to_s3(processes: int) -> None:
|
|
def _transfer_avatar_to_s3(user: UserProfile) -> int:
|
|
avatar_path = user_avatar_path(user)
|
|
file_path = os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars", avatar_path) + ".original"
|
|
try:
|
|
with open(file_path, 'rb') as f:
|
|
s3backend.upload_avatar_image(f, user, user)
|
|
logging.info("Uploaded avatar for %s in realm %s", user.id, user.realm.name)
|
|
except FileNotFoundError:
|
|
pass
|
|
return 0
|
|
|
|
users = list(UserProfile.objects.all())
|
|
if processes == 1:
|
|
for user in users:
|
|
_transfer_avatar_to_s3(user)
|
|
else: # nocoverage
|
|
output = []
|
|
connection.close()
|
|
for (status, job) in run_parallel(_transfer_avatar_to_s3, users, processes):
|
|
output.append(job)
|
|
|
|
def transfer_message_files_to_s3(processes: int) -> None:
|
|
def _transfer_message_files_to_s3(attachment: Attachment) -> int:
|
|
file_path = os.path.join(settings.LOCAL_UPLOADS_DIR, "files", attachment.path_id)
|
|
try:
|
|
with open(file_path, 'rb') as f:
|
|
bucket_name = settings.S3_AUTH_UPLOADS_BUCKET
|
|
guessed_type = guess_type(attachment.file_name)[0]
|
|
upload_image_to_s3(bucket_name, attachment.path_id, guessed_type, attachment.owner, f.read())
|
|
logging.info("Uploaded message file in path %s", file_path)
|
|
except FileNotFoundError: # nocoverage
|
|
pass
|
|
return 0
|
|
|
|
attachments = list(Attachment.objects.all())
|
|
if processes == 1:
|
|
for attachment in attachments:
|
|
_transfer_message_files_to_s3(attachment)
|
|
else: # nocoverage
|
|
output = []
|
|
connection.close()
|
|
for status, job in run_parallel(_transfer_message_files_to_s3, attachments, processes):
|
|
output.append(job)
|
|
|
|
def transfer_emoji_to_s3(processes: int) -> None:
|
|
def _transfer_emoji_to_s3(realm_emoji: RealmEmoji) -> int:
|
|
if not realm_emoji.file_name or not realm_emoji.author:
|
|
return 0 # nocoverage
|
|
emoji_path = RealmEmoji.PATH_ID_TEMPLATE.format(
|
|
realm_id=realm_emoji.realm.id,
|
|
emoji_file_name=realm_emoji.file_name,
|
|
)
|
|
emoji_path = os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars", emoji_path) + ".original"
|
|
try:
|
|
with open(emoji_path, 'rb') as f:
|
|
s3backend.upload_emoji_image(f, realm_emoji.file_name, realm_emoji.author)
|
|
logging.info("Uploaded emoji file in path %s", emoji_path)
|
|
except FileNotFoundError: # nocoverage
|
|
pass
|
|
return 0
|
|
|
|
realm_emojis = list(RealmEmoji.objects.filter())
|
|
if processes == 1:
|
|
for realm_emoji in realm_emojis:
|
|
_transfer_emoji_to_s3(realm_emoji)
|
|
else: # nocoverage
|
|
output = []
|
|
connection.close()
|
|
for status, job in run_parallel(_transfer_emoji_to_s3, realm_emojis, processes):
|
|
output.append(job)
|