From c8de6643e857e3f0685b9e29e88235893d851fc2 Mon Sep 17 00:00:00 2001 From: Rob Watson Date: Mon, 13 Dec 2021 04:28:14 +0100 Subject: [PATCH] Remove S3 bucket columns from media_sets table Re: #5 --- backend/generated/store/models.go | 4 - backend/generated/store/queries.sql.go | 80 +++++-------------- backend/media/get_audio.go | 12 ++- backend/media/get_video.go | 19 +++-- backend/media/service.go | 1 - ...13031230_remove_s3_bucket_columns.down.sql | 4 + ...1213031230_remove_s3_bucket_columns.up.sql | 4 + backend/sql/queries.sql | 8 +- 8 files changed, 47 insertions(+), 85 deletions(-) create mode 100644 backend/sql/migrations/20211213031230_remove_s3_bucket_columns.down.sql create mode 100644 backend/sql/migrations/20211213031230_remove_s3_bucket_columns.up.sql diff --git a/backend/generated/store/models.go b/backend/generated/store/models.go index 3b00e42..21a5425 100644 --- a/backend/generated/store/models.go +++ b/backend/generated/store/models.go @@ -17,17 +17,14 @@ type MediaSet struct { AudioFramesApprox int64 AudioFrames sql.NullInt64 AudioSampleRate int32 - AudioRawS3Bucket sql.NullString AudioRawS3Key sql.NullString AudioRawS3UploadedAt sql.NullTime AudioEncodedMimeType string VideoYoutubeItag int32 - VideoS3Bucket sql.NullString VideoS3Key sql.NullString VideoS3UploadedAt sql.NullTime VideoMimeType string VideoDurationNanos int64 - VideoThumbnailS3Bucket sql.NullString VideoThumbnailS3Key sql.NullString VideoThumbnailS3UploadedAt sql.NullTime VideoThumbnailMimeType sql.NullString @@ -37,7 +34,6 @@ type MediaSet struct { UpdatedAt time.Time AudioContentLength int64 VideoContentLength int64 - AudioEncodedS3Bucket sql.NullString AudioEncodedS3Key sql.NullString AudioEncodedS3UploadedAt sql.NullTime } diff --git a/backend/generated/store/queries.sql.go b/backend/generated/store/queries.sql.go index ea3729a..270eeac 100644 --- a/backend/generated/store/queries.sql.go +++ b/backend/generated/store/queries.sql.go @@ -13,7 +13,7 @@ import ( const createMediaSet = `-- name: CreateMediaSet :one INSERT INTO media_sets (youtube_id, audio_youtube_itag, audio_channels, audio_frames_approx, audio_sample_rate, audio_content_length, audio_encoded_mime_type, video_youtube_itag, video_content_length, video_mime_type, video_duration_nanos, created_at, updated_at) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, NOW(), NOW()) - RETURNING id, youtube_id, audio_youtube_itag, audio_channels, audio_frames_approx, audio_frames, audio_sample_rate, audio_raw_s3_bucket, audio_raw_s3_key, audio_raw_s3_uploaded_at, audio_encoded_mime_type, video_youtube_itag, video_s3_bucket, video_s3_key, video_s3_uploaded_at, video_mime_type, video_duration_nanos, video_thumbnail_s3_bucket, video_thumbnail_s3_key, video_thumbnail_s3_uploaded_at, video_thumbnail_mime_type, video_thumbnail_width, video_thumbnail_height, created_at, updated_at, audio_content_length, video_content_length, audio_encoded_s3_bucket, audio_encoded_s3_key, audio_encoded_s3_uploaded_at + RETURNING id, youtube_id, audio_youtube_itag, audio_channels, audio_frames_approx, audio_frames, audio_sample_rate, audio_raw_s3_key, audio_raw_s3_uploaded_at, audio_encoded_mime_type, video_youtube_itag, video_s3_key, video_s3_uploaded_at, video_mime_type, video_duration_nanos, video_thumbnail_s3_key, video_thumbnail_s3_uploaded_at, video_thumbnail_mime_type, video_thumbnail_width, video_thumbnail_height, created_at, updated_at, audio_content_length, video_content_length, audio_encoded_s3_key, audio_encoded_s3_uploaded_at ` type CreateMediaSetParams struct { @@ -53,17 +53,14 @@ func (q *Queries) CreateMediaSet(ctx context.Context, arg CreateMediaSetParams) &i.AudioFramesApprox, &i.AudioFrames, &i.AudioSampleRate, - &i.AudioRawS3Bucket, &i.AudioRawS3Key, &i.AudioRawS3UploadedAt, &i.AudioEncodedMimeType, &i.VideoYoutubeItag, - &i.VideoS3Bucket, &i.VideoS3Key, &i.VideoS3UploadedAt, &i.VideoMimeType, &i.VideoDurationNanos, - &i.VideoThumbnailS3Bucket, &i.VideoThumbnailS3Key, &i.VideoThumbnailS3UploadedAt, &i.VideoThumbnailMimeType, @@ -73,7 +70,6 @@ func (q *Queries) CreateMediaSet(ctx context.Context, arg CreateMediaSetParams) &i.UpdatedAt, &i.AudioContentLength, &i.VideoContentLength, - &i.AudioEncodedS3Bucket, &i.AudioEncodedS3Key, &i.AudioEncodedS3UploadedAt, ) @@ -81,7 +77,7 @@ func (q *Queries) CreateMediaSet(ctx context.Context, arg CreateMediaSetParams) } const getMediaSet = `-- name: GetMediaSet :one -SELECT id, youtube_id, audio_youtube_itag, audio_channels, audio_frames_approx, audio_frames, audio_sample_rate, audio_raw_s3_bucket, audio_raw_s3_key, audio_raw_s3_uploaded_at, audio_encoded_mime_type, video_youtube_itag, video_s3_bucket, video_s3_key, video_s3_uploaded_at, video_mime_type, video_duration_nanos, video_thumbnail_s3_bucket, video_thumbnail_s3_key, video_thumbnail_s3_uploaded_at, video_thumbnail_mime_type, video_thumbnail_width, video_thumbnail_height, created_at, updated_at, audio_content_length, video_content_length, audio_encoded_s3_bucket, audio_encoded_s3_key, audio_encoded_s3_uploaded_at FROM media_sets WHERE id = $1 +SELECT id, youtube_id, audio_youtube_itag, audio_channels, audio_frames_approx, audio_frames, audio_sample_rate, audio_raw_s3_key, audio_raw_s3_uploaded_at, audio_encoded_mime_type, video_youtube_itag, video_s3_key, video_s3_uploaded_at, video_mime_type, video_duration_nanos, video_thumbnail_s3_key, video_thumbnail_s3_uploaded_at, video_thumbnail_mime_type, video_thumbnail_width, video_thumbnail_height, created_at, updated_at, audio_content_length, video_content_length, audio_encoded_s3_key, audio_encoded_s3_uploaded_at FROM media_sets WHERE id = $1 ` func (q *Queries) GetMediaSet(ctx context.Context, id uuid.UUID) (MediaSet, error) { @@ -95,17 +91,14 @@ func (q *Queries) GetMediaSet(ctx context.Context, id uuid.UUID) (MediaSet, erro &i.AudioFramesApprox, &i.AudioFrames, &i.AudioSampleRate, - &i.AudioRawS3Bucket, &i.AudioRawS3Key, &i.AudioRawS3UploadedAt, &i.AudioEncodedMimeType, &i.VideoYoutubeItag, - &i.VideoS3Bucket, &i.VideoS3Key, &i.VideoS3UploadedAt, &i.VideoMimeType, &i.VideoDurationNanos, - &i.VideoThumbnailS3Bucket, &i.VideoThumbnailS3Key, &i.VideoThumbnailS3UploadedAt, &i.VideoThumbnailMimeType, @@ -115,7 +108,6 @@ func (q *Queries) GetMediaSet(ctx context.Context, id uuid.UUID) (MediaSet, erro &i.UpdatedAt, &i.AudioContentLength, &i.VideoContentLength, - &i.AudioEncodedS3Bucket, &i.AudioEncodedS3Key, &i.AudioEncodedS3UploadedAt, ) @@ -123,7 +115,7 @@ func (q *Queries) GetMediaSet(ctx context.Context, id uuid.UUID) (MediaSet, erro } const getMediaSetByYoutubeID = `-- name: GetMediaSetByYoutubeID :one -SELECT id, youtube_id, audio_youtube_itag, audio_channels, audio_frames_approx, audio_frames, audio_sample_rate, audio_raw_s3_bucket, audio_raw_s3_key, audio_raw_s3_uploaded_at, audio_encoded_mime_type, video_youtube_itag, video_s3_bucket, video_s3_key, video_s3_uploaded_at, video_mime_type, video_duration_nanos, video_thumbnail_s3_bucket, video_thumbnail_s3_key, video_thumbnail_s3_uploaded_at, video_thumbnail_mime_type, video_thumbnail_width, video_thumbnail_height, created_at, updated_at, audio_content_length, video_content_length, audio_encoded_s3_bucket, audio_encoded_s3_key, audio_encoded_s3_uploaded_at FROM media_sets WHERE youtube_id = $1 +SELECT id, youtube_id, audio_youtube_itag, audio_channels, audio_frames_approx, audio_frames, audio_sample_rate, audio_raw_s3_key, audio_raw_s3_uploaded_at, audio_encoded_mime_type, video_youtube_itag, video_s3_key, video_s3_uploaded_at, video_mime_type, video_duration_nanos, video_thumbnail_s3_key, video_thumbnail_s3_uploaded_at, video_thumbnail_mime_type, video_thumbnail_width, video_thumbnail_height, created_at, updated_at, audio_content_length, video_content_length, audio_encoded_s3_key, audio_encoded_s3_uploaded_at FROM media_sets WHERE youtube_id = $1 ` func (q *Queries) GetMediaSetByYoutubeID(ctx context.Context, youtubeID string) (MediaSet, error) { @@ -137,17 +129,14 @@ func (q *Queries) GetMediaSetByYoutubeID(ctx context.Context, youtubeID string) &i.AudioFramesApprox, &i.AudioFrames, &i.AudioSampleRate, - &i.AudioRawS3Bucket, &i.AudioRawS3Key, &i.AudioRawS3UploadedAt, &i.AudioEncodedMimeType, &i.VideoYoutubeItag, - &i.VideoS3Bucket, &i.VideoS3Key, &i.VideoS3UploadedAt, &i.VideoMimeType, &i.VideoDurationNanos, - &i.VideoThumbnailS3Bucket, &i.VideoThumbnailS3Key, &i.VideoThumbnailS3UploadedAt, &i.VideoThumbnailMimeType, @@ -157,7 +146,6 @@ func (q *Queries) GetMediaSetByYoutubeID(ctx context.Context, youtubeID string) &i.UpdatedAt, &i.AudioContentLength, &i.VideoContentLength, - &i.AudioEncodedS3Bucket, &i.AudioEncodedS3Key, &i.AudioEncodedS3UploadedAt, ) @@ -166,19 +154,18 @@ func (q *Queries) GetMediaSetByYoutubeID(ctx context.Context, youtubeID string) const setEncodedAudioUploaded = `-- name: SetEncodedAudioUploaded :one UPDATE media_sets - SET audio_encoded_s3_bucket = $2, audio_encoded_s3_key = $3, audio_encoded_s3_uploaded_at = NOW(), updated_at = NOW() + SET audio_encoded_s3_key = $2, audio_encoded_s3_uploaded_at = NOW(), updated_at = NOW() WHERE id = $1 - RETURNING id, youtube_id, audio_youtube_itag, audio_channels, audio_frames_approx, audio_frames, audio_sample_rate, audio_raw_s3_bucket, audio_raw_s3_key, audio_raw_s3_uploaded_at, audio_encoded_mime_type, video_youtube_itag, video_s3_bucket, video_s3_key, video_s3_uploaded_at, video_mime_type, video_duration_nanos, video_thumbnail_s3_bucket, video_thumbnail_s3_key, video_thumbnail_s3_uploaded_at, video_thumbnail_mime_type, video_thumbnail_width, video_thumbnail_height, created_at, updated_at, audio_content_length, video_content_length, audio_encoded_s3_bucket, audio_encoded_s3_key, audio_encoded_s3_uploaded_at + RETURNING id, youtube_id, audio_youtube_itag, audio_channels, audio_frames_approx, audio_frames, audio_sample_rate, audio_raw_s3_key, audio_raw_s3_uploaded_at, audio_encoded_mime_type, video_youtube_itag, video_s3_key, video_s3_uploaded_at, video_mime_type, video_duration_nanos, video_thumbnail_s3_key, video_thumbnail_s3_uploaded_at, video_thumbnail_mime_type, video_thumbnail_width, video_thumbnail_height, created_at, updated_at, audio_content_length, video_content_length, audio_encoded_s3_key, audio_encoded_s3_uploaded_at ` type SetEncodedAudioUploadedParams struct { - ID uuid.UUID - AudioEncodedS3Bucket sql.NullString - AudioEncodedS3Key sql.NullString + ID uuid.UUID + AudioEncodedS3Key sql.NullString } func (q *Queries) SetEncodedAudioUploaded(ctx context.Context, arg SetEncodedAudioUploadedParams) (MediaSet, error) { - row := q.db.QueryRow(ctx, setEncodedAudioUploaded, arg.ID, arg.AudioEncodedS3Bucket, arg.AudioEncodedS3Key) + row := q.db.QueryRow(ctx, setEncodedAudioUploaded, arg.ID, arg.AudioEncodedS3Key) var i MediaSet err := row.Scan( &i.ID, @@ -188,17 +175,14 @@ func (q *Queries) SetEncodedAudioUploaded(ctx context.Context, arg SetEncodedAud &i.AudioFramesApprox, &i.AudioFrames, &i.AudioSampleRate, - &i.AudioRawS3Bucket, &i.AudioRawS3Key, &i.AudioRawS3UploadedAt, &i.AudioEncodedMimeType, &i.VideoYoutubeItag, - &i.VideoS3Bucket, &i.VideoS3Key, &i.VideoS3UploadedAt, &i.VideoMimeType, &i.VideoDurationNanos, - &i.VideoThumbnailS3Bucket, &i.VideoThumbnailS3Key, &i.VideoThumbnailS3UploadedAt, &i.VideoThumbnailMimeType, @@ -208,7 +192,6 @@ func (q *Queries) SetEncodedAudioUploaded(ctx context.Context, arg SetEncodedAud &i.UpdatedAt, &i.AudioContentLength, &i.VideoContentLength, - &i.AudioEncodedS3Bucket, &i.AudioEncodedS3Key, &i.AudioEncodedS3UploadedAt, ) @@ -217,25 +200,19 @@ func (q *Queries) SetEncodedAudioUploaded(ctx context.Context, arg SetEncodedAud const setRawAudioUploaded = `-- name: SetRawAudioUploaded :one UPDATE media_sets - SET audio_raw_s3_bucket = $2, audio_raw_s3_key = $3, audio_frames = $4, audio_raw_s3_uploaded_at = NOW(), updated_at = NOW() + SET audio_raw_s3_key = $2, audio_frames = $3, audio_raw_s3_uploaded_at = NOW(), updated_at = NOW() WHERE id = $1 - RETURNING id, youtube_id, audio_youtube_itag, audio_channels, audio_frames_approx, audio_frames, audio_sample_rate, audio_raw_s3_bucket, audio_raw_s3_key, audio_raw_s3_uploaded_at, audio_encoded_mime_type, video_youtube_itag, video_s3_bucket, video_s3_key, video_s3_uploaded_at, video_mime_type, video_duration_nanos, video_thumbnail_s3_bucket, video_thumbnail_s3_key, video_thumbnail_s3_uploaded_at, video_thumbnail_mime_type, video_thumbnail_width, video_thumbnail_height, created_at, updated_at, audio_content_length, video_content_length, audio_encoded_s3_bucket, audio_encoded_s3_key, audio_encoded_s3_uploaded_at + RETURNING id, youtube_id, audio_youtube_itag, audio_channels, audio_frames_approx, audio_frames, audio_sample_rate, audio_raw_s3_key, audio_raw_s3_uploaded_at, audio_encoded_mime_type, video_youtube_itag, video_s3_key, video_s3_uploaded_at, video_mime_type, video_duration_nanos, video_thumbnail_s3_key, video_thumbnail_s3_uploaded_at, video_thumbnail_mime_type, video_thumbnail_width, video_thumbnail_height, created_at, updated_at, audio_content_length, video_content_length, audio_encoded_s3_key, audio_encoded_s3_uploaded_at ` type SetRawAudioUploadedParams struct { - ID uuid.UUID - AudioRawS3Bucket sql.NullString - AudioRawS3Key sql.NullString - AudioFrames sql.NullInt64 + ID uuid.UUID + AudioRawS3Key sql.NullString + AudioFrames sql.NullInt64 } func (q *Queries) SetRawAudioUploaded(ctx context.Context, arg SetRawAudioUploadedParams) (MediaSet, error) { - row := q.db.QueryRow(ctx, setRawAudioUploaded, - arg.ID, - arg.AudioRawS3Bucket, - arg.AudioRawS3Key, - arg.AudioFrames, - ) + row := q.db.QueryRow(ctx, setRawAudioUploaded, arg.ID, arg.AudioRawS3Key, arg.AudioFrames) var i MediaSet err := row.Scan( &i.ID, @@ -245,17 +222,14 @@ func (q *Queries) SetRawAudioUploaded(ctx context.Context, arg SetRawAudioUpload &i.AudioFramesApprox, &i.AudioFrames, &i.AudioSampleRate, - &i.AudioRawS3Bucket, &i.AudioRawS3Key, &i.AudioRawS3UploadedAt, &i.AudioEncodedMimeType, &i.VideoYoutubeItag, - &i.VideoS3Bucket, &i.VideoS3Key, &i.VideoS3UploadedAt, &i.VideoMimeType, &i.VideoDurationNanos, - &i.VideoThumbnailS3Bucket, &i.VideoThumbnailS3Key, &i.VideoThumbnailS3UploadedAt, &i.VideoThumbnailMimeType, @@ -265,7 +239,6 @@ func (q *Queries) SetRawAudioUploaded(ctx context.Context, arg SetRawAudioUpload &i.UpdatedAt, &i.AudioContentLength, &i.VideoContentLength, - &i.AudioEncodedS3Bucket, &i.AudioEncodedS3Key, &i.AudioEncodedS3UploadedAt, ) @@ -274,9 +247,9 @@ func (q *Queries) SetRawAudioUploaded(ctx context.Context, arg SetRawAudioUpload const setVideoThumbnailUploaded = `-- name: SetVideoThumbnailUploaded :one UPDATE media_sets -SET video_thumbnail_width = $2, video_thumbnail_height = $3, video_thumbnail_mime_type = $4, video_thumbnail_s3_bucket = $5, video_thumbnail_s3_key = $6, video_thumbnail_s3_uploaded_at = NOW(), updated_at = NOW() +SET video_thumbnail_width = $2, video_thumbnail_height = $3, video_thumbnail_mime_type = $4, video_thumbnail_s3_key = $5, video_thumbnail_s3_uploaded_at = NOW(), updated_at = NOW() WHERE id = $1 -RETURNING id, youtube_id, audio_youtube_itag, audio_channels, audio_frames_approx, audio_frames, audio_sample_rate, audio_raw_s3_bucket, audio_raw_s3_key, audio_raw_s3_uploaded_at, audio_encoded_mime_type, video_youtube_itag, video_s3_bucket, video_s3_key, video_s3_uploaded_at, video_mime_type, video_duration_nanos, video_thumbnail_s3_bucket, video_thumbnail_s3_key, video_thumbnail_s3_uploaded_at, video_thumbnail_mime_type, video_thumbnail_width, video_thumbnail_height, created_at, updated_at, audio_content_length, video_content_length, audio_encoded_s3_bucket, audio_encoded_s3_key, audio_encoded_s3_uploaded_at +RETURNING id, youtube_id, audio_youtube_itag, audio_channels, audio_frames_approx, audio_frames, audio_sample_rate, audio_raw_s3_key, audio_raw_s3_uploaded_at, audio_encoded_mime_type, video_youtube_itag, video_s3_key, video_s3_uploaded_at, video_mime_type, video_duration_nanos, video_thumbnail_s3_key, video_thumbnail_s3_uploaded_at, video_thumbnail_mime_type, video_thumbnail_width, video_thumbnail_height, created_at, updated_at, audio_content_length, video_content_length, audio_encoded_s3_key, audio_encoded_s3_uploaded_at ` type SetVideoThumbnailUploadedParams struct { @@ -284,7 +257,6 @@ type SetVideoThumbnailUploadedParams struct { VideoThumbnailWidth sql.NullInt32 VideoThumbnailHeight sql.NullInt32 VideoThumbnailMimeType sql.NullString - VideoThumbnailS3Bucket sql.NullString VideoThumbnailS3Key sql.NullString } @@ -294,7 +266,6 @@ func (q *Queries) SetVideoThumbnailUploaded(ctx context.Context, arg SetVideoThu arg.VideoThumbnailWidth, arg.VideoThumbnailHeight, arg.VideoThumbnailMimeType, - arg.VideoThumbnailS3Bucket, arg.VideoThumbnailS3Key, ) var i MediaSet @@ -306,17 +277,14 @@ func (q *Queries) SetVideoThumbnailUploaded(ctx context.Context, arg SetVideoThu &i.AudioFramesApprox, &i.AudioFrames, &i.AudioSampleRate, - &i.AudioRawS3Bucket, &i.AudioRawS3Key, &i.AudioRawS3UploadedAt, &i.AudioEncodedMimeType, &i.VideoYoutubeItag, - &i.VideoS3Bucket, &i.VideoS3Key, &i.VideoS3UploadedAt, &i.VideoMimeType, &i.VideoDurationNanos, - &i.VideoThumbnailS3Bucket, &i.VideoThumbnailS3Key, &i.VideoThumbnailS3UploadedAt, &i.VideoThumbnailMimeType, @@ -326,7 +294,6 @@ func (q *Queries) SetVideoThumbnailUploaded(ctx context.Context, arg SetVideoThu &i.UpdatedAt, &i.AudioContentLength, &i.VideoContentLength, - &i.AudioEncodedS3Bucket, &i.AudioEncodedS3Key, &i.AudioEncodedS3UploadedAt, ) @@ -335,19 +302,18 @@ func (q *Queries) SetVideoThumbnailUploaded(ctx context.Context, arg SetVideoThu const setVideoUploaded = `-- name: SetVideoUploaded :one UPDATE media_sets - SET video_s3_bucket = $2, video_s3_key = $3, video_s3_uploaded_at = NOW(), updated_at = NOW() + SET video_s3_key = $2, video_s3_uploaded_at = NOW(), updated_at = NOW() WHERE id = $1 - RETURNING id, youtube_id, audio_youtube_itag, audio_channels, audio_frames_approx, audio_frames, audio_sample_rate, audio_raw_s3_bucket, audio_raw_s3_key, audio_raw_s3_uploaded_at, audio_encoded_mime_type, video_youtube_itag, video_s3_bucket, video_s3_key, video_s3_uploaded_at, video_mime_type, video_duration_nanos, video_thumbnail_s3_bucket, video_thumbnail_s3_key, video_thumbnail_s3_uploaded_at, video_thumbnail_mime_type, video_thumbnail_width, video_thumbnail_height, created_at, updated_at, audio_content_length, video_content_length, audio_encoded_s3_bucket, audio_encoded_s3_key, audio_encoded_s3_uploaded_at + RETURNING id, youtube_id, audio_youtube_itag, audio_channels, audio_frames_approx, audio_frames, audio_sample_rate, audio_raw_s3_key, audio_raw_s3_uploaded_at, audio_encoded_mime_type, video_youtube_itag, video_s3_key, video_s3_uploaded_at, video_mime_type, video_duration_nanos, video_thumbnail_s3_key, video_thumbnail_s3_uploaded_at, video_thumbnail_mime_type, video_thumbnail_width, video_thumbnail_height, created_at, updated_at, audio_content_length, video_content_length, audio_encoded_s3_key, audio_encoded_s3_uploaded_at ` type SetVideoUploadedParams struct { - ID uuid.UUID - VideoS3Bucket sql.NullString - VideoS3Key sql.NullString + ID uuid.UUID + VideoS3Key sql.NullString } func (q *Queries) SetVideoUploaded(ctx context.Context, arg SetVideoUploadedParams) (MediaSet, error) { - row := q.db.QueryRow(ctx, setVideoUploaded, arg.ID, arg.VideoS3Bucket, arg.VideoS3Key) + row := q.db.QueryRow(ctx, setVideoUploaded, arg.ID, arg.VideoS3Key) var i MediaSet err := row.Scan( &i.ID, @@ -357,17 +323,14 @@ func (q *Queries) SetVideoUploaded(ctx context.Context, arg SetVideoUploadedPara &i.AudioFramesApprox, &i.AudioFrames, &i.AudioSampleRate, - &i.AudioRawS3Bucket, &i.AudioRawS3Key, &i.AudioRawS3UploadedAt, &i.AudioEncodedMimeType, &i.VideoYoutubeItag, - &i.VideoS3Bucket, &i.VideoS3Key, &i.VideoS3UploadedAt, &i.VideoMimeType, &i.VideoDurationNanos, - &i.VideoThumbnailS3Bucket, &i.VideoThumbnailS3Key, &i.VideoThumbnailS3UploadedAt, &i.VideoThumbnailMimeType, @@ -377,7 +340,6 @@ func (q *Queries) SetVideoUploaded(ctx context.Context, arg SetVideoUploadedPara &i.UpdatedAt, &i.AudioContentLength, &i.VideoContentLength, - &i.AudioEncodedS3Bucket, &i.AudioEncodedS3Key, &i.AudioEncodedS3UploadedAt, ) diff --git a/backend/media/get_audio.go b/backend/media/get_audio.go index 7f5ff36..42f312a 100644 --- a/backend/media/get_audio.go +++ b/backend/media/get_audio.go @@ -131,9 +131,8 @@ func (s *audioGetterState) getAudio(ctx context.Context, r io.ReadCloser, mediaS } if _, err = s.store.SetEncodedAudioUploaded(ctx, store.SetEncodedAudioUploadedParams{ - ID: mediaSet.ID, - AudioEncodedS3Bucket: sqlString(s.config.S3Bucket), - AudioEncodedS3Key: sqlString(key), + ID: mediaSet.ID, + AudioEncodedS3Key: sqlString(key), }); err != nil { s.CloseWithError(fmt.Errorf("error setting encoded audio uploaded: %v", err)) } @@ -154,10 +153,9 @@ func (s *audioGetterState) getAudio(ctx context.Context, r io.ReadCloser, mediaS } if _, err = s.store.SetRawAudioUploaded(ctx, store.SetRawAudioUploadedParams{ - ID: mediaSet.ID, - AudioRawS3Bucket: sqlString(s.config.S3Bucket), - AudioRawS3Key: sqlString(key), - AudioFrames: sqlInt64(bytesUploaded / SizeOfInt16 / int64(mediaSet.AudioChannels)), + ID: mediaSet.ID, + AudioRawS3Key: sqlString(key), + AudioFrames: sqlInt64(bytesUploaded / SizeOfInt16 / int64(mediaSet.AudioChannels)), }); err != nil { s.CloseWithError(fmt.Errorf("error setting raw audio uploaded: %v", err)) } diff --git a/backend/media/get_video.go b/backend/media/get_video.go index 9fb7ff2..8f9fd60 100644 --- a/backend/media/get_video.go +++ b/backend/media/get_video.go @@ -30,13 +30,13 @@ type videoGetter struct { type videoGetterState struct { *videoGetter - r io.Reader - count, exp int64 - mediaSetID uuid.UUID - bucket, key, contentType string - url string - progressChan chan GetVideoProgress - errorChan chan error + r io.Reader + count, exp int64 + mediaSetID uuid.UUID + key, contentType string + url string + progressChan chan GetVideoProgress + errorChan chan error } func newVideoGetter(store Store, fileStore FileStore, logger *zap.SugaredLogger) *videoGetter { @@ -89,9 +89,8 @@ func (s *videoGetterState) getVideo(ctx context.Context) { } storeParams := store.SetVideoUploadedParams{ - ID: s.mediaSetID, - VideoS3Bucket: sqlString(s.bucket), - VideoS3Key: sqlString(s.key), + ID: s.mediaSetID, + VideoS3Key: sqlString(s.key), } _, err = s.store.SetVideoUploaded(ctx, storeParams) if err != nil { diff --git a/backend/media/service.go b/backend/media/service.go index c746399..5ccf839 100644 --- a/backend/media/service.go +++ b/backend/media/service.go @@ -563,7 +563,6 @@ func (s *MediaSetService) getThumbnailFromYoutube(ctx context.Context, mediaSet storeParams := store.SetVideoThumbnailUploadedParams{ ID: mediaSet.ID, VideoThumbnailMimeType: sqlString(mimeType), - VideoThumbnailS3Bucket: sqlString(s.config.S3Bucket), VideoThumbnailS3Key: sqlString(thumbnailKey), VideoThumbnailWidth: sqlInt32(int32(thumbnail.Width)), VideoThumbnailHeight: sqlInt32(int32(thumbnail.Height)), diff --git a/backend/sql/migrations/20211213031230_remove_s3_bucket_columns.down.sql b/backend/sql/migrations/20211213031230_remove_s3_bucket_columns.down.sql new file mode 100644 index 0000000..478bca1 --- /dev/null +++ b/backend/sql/migrations/20211213031230_remove_s3_bucket_columns.down.sql @@ -0,0 +1,4 @@ +ALTER TABLE media_sets ADD COLUMN video_thumbnail_s3_bucket CHARACTER VARYING(256); +ALTER TABLE media_sets ADD COLUMN video_s3_bucket CHARACTER VARYING(256); +ALTER TABLE media_sets ADD COLUMN audio_encoded_s3_bucket CHARACTER VARYING(256); +ALTER TABLE media_sets ADD COLUMN audio_raw_s3_bucket CHARACTER VARYING(256); diff --git a/backend/sql/migrations/20211213031230_remove_s3_bucket_columns.up.sql b/backend/sql/migrations/20211213031230_remove_s3_bucket_columns.up.sql new file mode 100644 index 0000000..1949352 --- /dev/null +++ b/backend/sql/migrations/20211213031230_remove_s3_bucket_columns.up.sql @@ -0,0 +1,4 @@ +ALTER TABLE media_sets DROP COLUMN audio_raw_s3_bucket; +ALTER TABLE media_sets DROP COLUMN audio_encoded_s3_bucket; +ALTER TABLE media_sets DROP COLUMN video_s3_bucket; +ALTER TABLE media_sets DROP COLUMN video_thumbnail_s3_bucket; diff --git a/backend/sql/queries.sql b/backend/sql/queries.sql index 340e152..9b6b9b1 100644 --- a/backend/sql/queries.sql +++ b/backend/sql/queries.sql @@ -11,24 +11,24 @@ INSERT INTO media_sets (youtube_id, audio_youtube_itag, audio_channels, audio_fr -- name: SetRawAudioUploaded :one UPDATE media_sets - SET audio_raw_s3_bucket = $2, audio_raw_s3_key = $3, audio_frames = $4, audio_raw_s3_uploaded_at = NOW(), updated_at = NOW() + SET audio_raw_s3_key = $2, audio_frames = $3, audio_raw_s3_uploaded_at = NOW(), updated_at = NOW() WHERE id = $1 RETURNING *; -- name: SetEncodedAudioUploaded :one UPDATE media_sets - SET audio_encoded_s3_bucket = $2, audio_encoded_s3_key = $3, audio_encoded_s3_uploaded_at = NOW(), updated_at = NOW() + SET audio_encoded_s3_key = $2, audio_encoded_s3_uploaded_at = NOW(), updated_at = NOW() WHERE id = $1 RETURNING *; -- name: SetVideoUploaded :one UPDATE media_sets - SET video_s3_bucket = $2, video_s3_key = $3, video_s3_uploaded_at = NOW(), updated_at = NOW() + SET video_s3_key = $2, video_s3_uploaded_at = NOW(), updated_at = NOW() WHERE id = $1 RETURNING *; -- name: SetVideoThumbnailUploaded :one UPDATE media_sets -SET video_thumbnail_width = $2, video_thumbnail_height = $3, video_thumbnail_mime_type = $4, video_thumbnail_s3_bucket = $5, video_thumbnail_s3_key = $6, video_thumbnail_s3_uploaded_at = NOW(), updated_at = NOW() +SET video_thumbnail_width = $2, video_thumbnail_height = $3, video_thumbnail_mime_type = $4, video_thumbnail_s3_key = $5, video_thumbnail_s3_uploaded_at = NOW(), updated_at = NOW() WHERE id = $1 RETURNING *;