<%= render 'layouts/bg_progress' %>
diff --git a/app/views/seasons/show.html.erb b/app/views/seasons/show.html.erb
index 86f02089..b5fcca74 100644
--- a/app/views/seasons/show.html.erb
+++ b/app/views/seasons/show.html.erb
@@ -48,10 +48,10 @@
diff --git a/app/workers/continue_upload_worker.rb b/app/workers/continue_upload_worker.rb
index 8aeb4b66..3c8d24be 100644
--- a/app/workers/continue_upload_worker.rb
+++ b/app/workers/continue_upload_worker.rb
@@ -2,16 +2,16 @@
class ContinueUploadWorker < ApplicationWorker
def enqueue?
- pending_disk_titles.any?
+ pending_video_blobs.any?
end
def perform
- pending_disk_titles.each do |disk_title|
- UploadWorker.perform_async(disk_title_id: disk_title.id)
+ pending_video_blobs.find_each do |video_blob|
+ UploadWorker.perform_async(video_blob_id: video_blob.id)
end
end
- def pending_disk_titles
- @pending_disk_titles ||= DiskTitle.all.select(&:tmp_plex_path_exists?)
+ def pending_video_blobs
+ @pending_video_blobs ||= ::VideoBlob.where(uploaded_on: nil)
end
end
diff --git a/app/workers/rip_worker.rb b/app/workers/rip_worker.rb
index 2109d5d8..da74c0e2 100644
--- a/app/workers/rip_worker.rb
+++ b/app/workers/rip_worker.rb
@@ -8,6 +8,7 @@ class RipWorker < ApplicationWorker
option :disk_id, Types::Integer
option :disk_title_ids, Types::Array.of(Types::Integer)
+ option :extra_types, Types::Array.of(Types::String), optional: true, default: -> { [] }
def perform
if create_mkvs.all?(&:success?)
@@ -24,8 +25,9 @@ def perform
private
def create_mkvs
- disk_titles.filter_map do |disk_title|
- service = CreateMkvService.new(disk_title:)
+ disk_title_ids.zip(extra_types).filter_map do |disk_title_id, extra_type|
+ disk_title = DiskTitle.find(disk_title_id)
+ service = CreateMkvService.new(disk_title:, extra_type:)
service.subscribe(MkvProgressListener.new(job:, disk_title:))
result = service.call
job.save!
@@ -54,7 +56,7 @@ def redirect_url
end
def upload_mkv(disk_title)
- UploadWorker.perform_async(disk_title_id: disk_title.id)
+ UploadWorker.perform_async(video_blob_id: disk_title.video_blob_id)
end
def disk
diff --git a/app/workers/scan_plex_worker.rb b/app/workers/scan_plex_worker.rb
index 9503734b..85a07f78 100644
--- a/app/workers/scan_plex_worker.rb
+++ b/app/workers/scan_plex_worker.rb
@@ -6,14 +6,16 @@ def perform
plex_videos.map do |blob|
blob.video = find_or_create_video(blob)
blob.episode = search_for_episode(blob, blob.video)
+ blob.uploaded_on ||= Time.current
blob.save!
self.completed += 1
percent_completed = (completed / plex_videos.size.to_f * 100)
+ next if next_update.future?
+
broadcast_progress(
in_progress_component('Updating Database...', percent_completed)
)
end
- @next_update = Time.current
broadcast_progress(completed_component)
end
@@ -24,8 +26,6 @@ def completed
private
def broadcast_progress(component)
- return if next_update.future?
-
cable_ready[BroadcastChannel.channel_name].morph \
selector: "##{component.dom_id}",
html: render(component, layout: false)
@@ -63,14 +63,14 @@ def in_progress_component(message, completed, show_percentage: true)
end
def search_for_movie(blob)
- options = { query: blob.title, year: blob.year }.compact
+ options = { query: blob.parsed_title, year: blob.parsed_year }.compact
search = TheMovieDb::Search::Movie.new(**options) if options[:query].present?
search&.results&.dig('results', 0, 'id')
end
def search_for_tv_show(blob)
- options = { query: blob.title, year: blob.year }.compact
+ options = { query: blob.parsed_title, year: blob.parsed_year }.compact
search = TheMovieDb::Search::Tv.new(**options) if options[:query].present?
search&.results&.dig('results', 0, 'id')
@@ -79,12 +79,12 @@ def search_for_tv_show(blob)
def search_for_episode(blob, video)
return unless video.is_a?(::Tv)
- season = video.seasons.find { _1.season_number == blob.season }
+ season = video.seasons.find { _1.season_number == blob.parsed_season }
return if season.nil?
season.subscribe(TheMovieDb::EpisodesListener.new)
season.save!
- season.episodes.find { _1.episode_number == blob.episode }
+ season.episodes.find { _1.episode_number == blob.parsed_episode }
end
def find_or_create_video(blob)
@@ -95,17 +95,24 @@ def find_or_create_video(blob)
end
return if the_movie_db_id.nil?
+ find_or_initialize_video(blob, the_movie_db_id).tap do |m|
+ m.subscribe(TheMovieDb::VideoListener.new)
+ m.save!
+ end
+ end
+
+ def find_or_initialize_video(blob, the_movie_db_id)
model = if blob.tv_show?
Tv
elsif blob.movie?
Movie
- else
- return
end
- model.find_or_initialize_by(the_movie_db_id:).tap do |m|
- m.subscribe(TheMovieDb::VideoListener.new)
- m.save!
- end
+ videos.find { _1.the_movie_db_id == the_movie_db_id } ||
+ model&.new(the_movie_db_id:)&.tap { videos.push(_1) }
+ end
+
+ def videos
+ @videos ||= Video.all.to_a
end
def plex_videos
diff --git a/app/workers/upload_worker.rb b/app/workers/upload_worker.rb
index 361a5afe..60ffec5f 100644
--- a/app/workers/upload_worker.rb
+++ b/app/workers/upload_worker.rb
@@ -1,12 +1,12 @@
# frozen_string_literal: true
class UploadWorker < ApplicationWorker
- option :disk_title_id, Types::Integer
+ option :video_blob_id, Types::Integer
def perform
- disk_title = DiskTitle.find(disk_title_id)
- service = Ftp::UploadMkvService.new(disk_title:)
- service.subscribe(UploadProgressListener.new(disk_title:, file_size: disk_title.size))
+ video_blob = VideoBlob.find(video_blob_id)
+ service = Ftp::UploadMkvService.new(video_blob:)
+ service.subscribe(UploadProgressListener.new(video_blob:, file_size: video_blob.byte_size))
service.call
end
end
diff --git a/config/database.yml b/config/database.yml
index dccf173b..6573fe5a 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -6,8 +6,8 @@
#
default: &default
adapter: sqlite3
- pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i + 2 %>
- timeout: 15000
+ pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i + 4 %>
+ timeout: 5000
development:
<<: *default
diff --git a/current_version.txt b/current_version.txt
index b299be97..857572fc 100644
--- a/current_version.txt
+++ b/current_version.txt
@@ -1 +1 @@
-v3.3.0
+v4.0.0
diff --git a/db/migrate/20240714152912_add_extras_to_disk_titles.rb b/db/migrate/20240714152912_add_extras_to_disk_titles.rb
new file mode 100644
index 00000000..1c5a7d2a
--- /dev/null
+++ b/db/migrate/20240714152912_add_extras_to_disk_titles.rb
@@ -0,0 +1,5 @@
+class AddExtrasToDiskTitles < ActiveRecord::Migration[7.1]
+ def change
+ add_column :video_blobs, :extra_type, :integer, default: 0
+ end
+end
diff --git a/db/migrate/20240714182717_add_reference_to_disk_title_from_video_blob.rb b/db/migrate/20240714182717_add_reference_to_disk_title_from_video_blob.rb
new file mode 100644
index 00000000..3e50d81a
--- /dev/null
+++ b/db/migrate/20240714182717_add_reference_to_disk_title_from_video_blob.rb
@@ -0,0 +1,5 @@
+class AddReferenceToDiskTitleFromVideoBlob < ActiveRecord::Migration[7.1]
+ def change
+ add_reference :disk_titles, :video_blob
+ end
+end
diff --git a/db/migrate/20240714183648_drop_service_name_from_video_blobs.rb b/db/migrate/20240714183648_drop_service_name_from_video_blobs.rb
new file mode 100644
index 00000000..0ee9e87f
--- /dev/null
+++ b/db/migrate/20240714183648_drop_service_name_from_video_blobs.rb
@@ -0,0 +1,9 @@
+class DropServiceNameFromVideoBlobs < ActiveRecord::Migration[7.1]
+ def up
+ remove_column :video_blobs, :service_name
+ end
+
+ def down
+ add_column :video_blobs, :service_name, :string
+ end
+end
diff --git a/db/migrate/20240714200900_add_extra_type_number_to_video_blob.rb b/db/migrate/20240714200900_add_extra_type_number_to_video_blob.rb
new file mode 100644
index 00000000..89f08bf9
--- /dev/null
+++ b/db/migrate/20240714200900_add_extra_type_number_to_video_blob.rb
@@ -0,0 +1,6 @@
+class AddExtraTypeNumberToVideoBlob < ActiveRecord::Migration[7.1]
+ def change
+ VideoBlob.destroy_all
+ add_column :video_blobs, :extra_type_number, :integer
+ end
+end
diff --git a/db/migrate/20240714203719_backfill_extra_type_number.rb b/db/migrate/20240714203719_backfill_extra_type_number.rb
new file mode 100644
index 00000000..7de759cf
--- /dev/null
+++ b/db/migrate/20240714203719_backfill_extra_type_number.rb
@@ -0,0 +1,9 @@
+class BackfillExtraTypeNumber < ActiveRecord::Migration[7.1]
+ def change
+ VideoBlob.all.each do |blob|
+ blob.extra_type_number = VideoBlob.where(episode:, video:, extra_type:)
+ .pluck(:extra_type_number).max.to_i + 1
+ blob.save!
+ end
+ end
+end
diff --git a/db/migrate/20240714203948_add_null_constraint_to_extra_type_number.rb b/db/migrate/20240714203948_add_null_constraint_to_extra_type_number.rb
new file mode 100644
index 00000000..bf9f7988
--- /dev/null
+++ b/db/migrate/20240714203948_add_null_constraint_to_extra_type_number.rb
@@ -0,0 +1,5 @@
+class AddNullConstraintToExtraTypeNumber < ActiveRecord::Migration[7.1]
+ def change
+ change_column_null :video_blobs, :extra_type_number, false
+ end
+end
diff --git a/db/migrate/20240714204214_add_uniq_key_constraint.rb b/db/migrate/20240714204214_add_uniq_key_constraint.rb
new file mode 100644
index 00000000..5dc4fbe3
--- /dev/null
+++ b/db/migrate/20240714204214_add_uniq_key_constraint.rb
@@ -0,0 +1,5 @@
+class AddUniqKeyConstraint < ActiveRecord::Migration[7.1]
+ def change
+ add_index :video_blobs, :key, if_not_exists: true, unique: true
+ end
+end
diff --git a/db/migrate/20240714204402_add_uniq_key_constraint_extra_type_number.rb b/db/migrate/20240714204402_add_uniq_key_constraint_extra_type_number.rb
new file mode 100644
index 00000000..17908886
--- /dev/null
+++ b/db/migrate/20240714204402_add_uniq_key_constraint_extra_type_number.rb
@@ -0,0 +1,5 @@
+class AddUniqKeyConstraintExtraTypeNumber < ActiveRecord::Migration[7.1]
+ def change
+ add_index :video_blobs, [:extra_type_number, :video_id, :extra_type], unique: true
+ end
+end
diff --git a/db/migrate/20240714235006_remove_column_synced_on.rb b/db/migrate/20240714235006_remove_column_synced_on.rb
new file mode 100644
index 00000000..42cf755f
--- /dev/null
+++ b/db/migrate/20240714235006_remove_column_synced_on.rb
@@ -0,0 +1,5 @@
+class RemoveColumnSyncedOn < ActiveRecord::Migration[7.1]
+ def change
+ remove_column :videos, :synced_on, :datetime
+ end
+end
diff --git a/db/migrate/20240715021135_add_uploaded_to_video_blob.rb b/db/migrate/20240715021135_add_uploaded_to_video_blob.rb
new file mode 100644
index 00000000..9c94415c
--- /dev/null
+++ b/db/migrate/20240715021135_add_uploaded_to_video_blob.rb
@@ -0,0 +1,5 @@
+class AddUploadedToVideoBlob < ActiveRecord::Migration[7.1]
+ def change
+ add_column :video_blobs, :uploaded_on, :datetime
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a696af52..a24aecb9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.1].define(version: 2024_07_11_043012) do
+ActiveRecord::Schema[7.1].define(version: 2024_07_15_021135) do
create_table "configs", force: :cascade do |t|
t.string "type", default: "Config", null: false
t.text "settings"
@@ -30,9 +30,11 @@
t.integer "video_id"
t.integer "episode_id"
t.datetime "ripped_at"
+ t.integer "video_blob_id"
t.index ["disk_id"], name: "index_disk_titles_on_disk_id"
t.index ["episode_id"], name: "index_disk_titles_on_episode_id"
t.index ["mkv_progress_id"], name: "index_disk_titles_on_mkv_progress_id"
+ t.index ["video_blob_id"], name: "index_disk_titles_on_video_blob_id"
t.index ["video_id"], name: "index_disk_titles_on_video"
end
@@ -121,7 +123,6 @@
t.string "filename", null: false
t.string "content_type", null: false
t.text "metadata"
- t.string "service_name", null: false
t.bigint "byte_size", null: false
t.boolean "optimized", default: false, null: false
t.text "checksum"
@@ -129,7 +130,12 @@
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.bigint "episode_id"
- t.index ["key", "service_name"], name: "index_video_blobs_on_key_and_service_name", unique: true
+ t.integer "extra_type", default: 0
+ t.integer "extra_type_number", null: false
+ t.datetime "uploaded_on"
+ t.index ["extra_type_number", "video_id", "extra_type"], name: "idx_on_extra_type_number_video_id_extra_type_1978193db6", unique: true
+ t.index ["key"], name: "index_video_blobs_on_key", unique: true
+ t.index ["key"], name: "index_video_blobs_on_key_and_service_name", unique: true
t.index ["video_id"], name: "index_video_blobs_on_video"
end
@@ -146,7 +152,6 @@
t.float "popularity"
t.date "release_date"
t.date "episode_first_air_date"
- t.datetime "synced_on"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.integer "rating", default: 0, null: false
diff --git a/spec/factories/disk_titles.rb b/spec/factories/disk_titles.rb
index 5a42b567..87f52172 100644
--- a/spec/factories/disk_titles.rb
+++ b/spec/factories/disk_titles.rb
@@ -15,6 +15,7 @@
# episode_id :integer
# mkv_progress_id :bigint
# title_id :integer not null
+# video_blob_id :integer
# video_id :integer
#
# Indexes
@@ -23,6 +24,7 @@
# index_disk_titles_on_episode_id (episode_id)
# index_disk_titles_on_mkv_progress_id (mkv_progress_id)
# index_disk_titles_on_video (video_id)
+# index_disk_titles_on_video_blob_id (video_blob_id)
#
FactoryBot.define do
factory :disk_title do
diff --git a/spec/factories/movies.rb b/spec/factories/movies.rb
index 27ab40c8..aafaaa73 100644
--- a/spec/factories/movies.rb
+++ b/spec/factories/movies.rb
@@ -15,7 +15,6 @@
# poster_path :string
# rating :integer default("N/A"), not null
# release_date :date
-# synced_on :datetime
# title :string
# type :string
# created_at :datetime not null
diff --git a/spec/factories/tvs.rb b/spec/factories/tvs.rb
index 2686463b..8a861e67 100644
--- a/spec/factories/tvs.rb
+++ b/spec/factories/tvs.rb
@@ -15,7 +15,6 @@
# poster_path :string
# rating :integer default("N/A"), not null
# release_date :date
-# synced_on :datetime
# title :string
# type :string
# created_at :datetime not null
diff --git a/spec/factories/video_blobs.rb b/spec/factories/video_blobs.rb
index 3a9d9c46..78cd85d4 100644
--- a/spec/factories/video_blobs.rb
+++ b/spec/factories/video_blobs.rb
@@ -4,31 +4,38 @@
#
# Table name: video_blobs
#
-# id :integer not null, primary key
-# byte_size :bigint not null
-# checksum :text
-# content_type :string not null
-# filename :string not null
-# key :string not null
-# metadata :text
-# optimized :boolean default(FALSE), not null
-# service_name :string not null
-# created_at :datetime not null
-# updated_at :datetime not null
-# episode_id :bigint
-# video_id :integer
+# id :integer not null, primary key
+# byte_size :bigint not null
+# checksum :text
+# content_type :string not null
+# extra_type :integer default("feature_films")
+# extra_type_number :integer not null
+# filename :string not null
+# key :string not null
+# metadata :text
+# optimized :boolean default(FALSE), not null
+# uploaded_on :datetime
+# created_at :datetime not null
+# updated_at :datetime not null
+# episode_id :bigint
+# video_id :integer
#
# Indexes
#
-# index_video_blobs_on_key_and_service_name (key,service_name) UNIQUE
-# index_video_blobs_on_video (video_id)
+# idx_on_extra_type_number_video_id_extra_type_1978193db6 (extra_type_number,video_id,extra_type) UNIQUE
+# index_video_blobs_on_key (key) UNIQUE
+# index_video_blobs_on_key_and_service_name (key) UNIQUE
+# index_video_blobs_on_video (video_id)
#
FactoryBot.define do
factory :video_blob do
filename { 'Back to the Future Part III.mkv' }
- key { 'error-incidunt/omnis_eos/perferendis-iure/Back to the Future Part III.mkv' }
- service_name { :ftp }
+ sequence(:key) { "error-incidunt/#{_1}/perferendis-iure/Back to the Future Part III.mkv" }
content_type { 'video/x-matroska' }
byte_size { 123_456_789 }
+
+ after(:stub) do |blob, _context|
+ blob.send(:set_extra_type_number)
+ end
end
end
diff --git a/spec/factories/videos.rb b/spec/factories/videos.rb
index 9db13628..02f1d24a 100644
--- a/spec/factories/videos.rb
+++ b/spec/factories/videos.rb
@@ -15,7 +15,6 @@
# poster_path :string
# rating :integer default("N/A"), not null
# release_date :date
-# synced_on :datetime
# title :string
# type :string
# created_at :datetime not null
diff --git a/spec/listeners/the_movie_db/video_listener_spec.rb b/spec/listeners/the_movie_db/video_listener_spec.rb
index 314f07c8..e0faa98a 100644
--- a/spec/listeners/the_movie_db/video_listener_spec.rb
+++ b/spec/listeners/the_movie_db/video_listener_spec.rb
@@ -8,7 +8,7 @@
before { create(:config_the_movie_db) }
describe '#tv_saving', :vcr, freeze: Time.zone.local(1990) do
- subject(:tv_saving) { described_class.new.tv_saving(tv) }
+ subject(:tv_saving) { described_class.new.tv_validating(tv) }
let(:expected_attributes) do
{
@@ -31,7 +31,6 @@
'from Earth who explore the galaxy and defend against alien threats such ' \
"as the Goa'uld, Replicators, and the Ori.",
'type' => 'Tv',
- 'synced_on' => Time.zone.local(1990),
'updated_at' => nil,
'created_at' => nil,
'release_date' => nil
diff --git a/spec/listeners/upload_progress_listener_spec.rb b/spec/listeners/upload_progress_listener_spec.rb
index 9b314367..fb820b76 100644
--- a/spec/listeners/upload_progress_listener_spec.rb
+++ b/spec/listeners/upload_progress_listener_spec.rb
@@ -8,10 +8,10 @@
describe '#update_progress' do
subject(:update_progress) { listener.update_progress(chunk_size: 10) }
- let(:disk_title) { build_stubbed(:disk_title) }
+ let(:video_blob) { build_stubbed(:video_blob) }
let(:args) do
{
- disk_title:,
+ video_blob:,
file_size: 12
}
end
diff --git a/spec/models/disk_title_spec.rb b/spec/models/disk_title_spec.rb
index 60a41c26..841d59d5 100644
--- a/spec/models/disk_title_spec.rb
+++ b/spec/models/disk_title_spec.rb
@@ -15,6 +15,7 @@
# episode_id :integer
# mkv_progress_id :bigint
# title_id :integer not null
+# video_blob_id :integer
# video_id :integer
#
# Indexes
@@ -23,6 +24,7 @@
# index_disk_titles_on_episode_id (episode_id)
# index_disk_titles_on_mkv_progress_id (mkv_progress_id)
# index_disk_titles_on_video (video_id)
+# index_disk_titles_on_video_blob_id (video_blob_id)
#
require 'rails_helper'
@@ -31,6 +33,7 @@
it { is_expected.to belong_to(:disk).optional(true) }
it { is_expected.to belong_to(:episode).optional(true) }
it { is_expected.to belong_to(:video).optional(true) }
+ it { is_expected.to belong_to(:video_blob).optional(true) }
end
describe 'scopes' do
@@ -45,135 +48,4 @@
expect(disk_title.to_label).to eq('#1 Sample Title 1 hour')
end
end
-
- describe '#tmp_plex_path' do
- context 'when video is a TV' do
- let(:episode) { create(:episode) }
- let(:disk_title) { create(:disk_title, video: episode.tv, episode:) }
-
- it 'returns the temporary Plex path for the episode' do
- expect(disk_title.tmp_plex_path).to eq(episode.tmp_plex_path)
- end
- end
-
- context 'when video is a Movie' do
- let(:movie) { create(:movie) }
- let(:disk_title) { create(:disk_title, video: movie) }
-
- it 'returns the temporary Plex path for the movie' do
- expect(disk_title.tmp_plex_path).to eq(movie.tmp_plex_path)
- end
- end
- end
-
- describe '#plex_path' do
- before { create(:config_plex) }
-
- context 'when video is a TV' do
- let(:episode) { create(:episode) }
- let(:disk_title) { create(:disk_title, video: episode.tv, episode:) }
-
- it 'returns the Plex path for the episode' do
- expect(disk_title.plex_path).to eq(episode.plex_path)
- end
- end
-
- context 'when video is a Movie' do
- let(:movie) { create(:movie) }
- let(:disk_title) { create(:disk_title, video: movie) }
-
- it 'returns the Plex path for the movie' do
- expect(disk_title.plex_path).to eq(movie.plex_path)
- end
- end
- end
-
- describe '#plex_name' do
- context 'when video is a TV' do
- let(:episode) { create(:episode) }
- let(:disk_title) { create(:disk_title, video: episode.tv, episode:) }
-
- it 'returns the MKV file name for the episode' do
- expect(disk_title.plex_name).to eq(episode.plex_name)
- end
- end
-
- context 'when video is a Movie' do
- let(:movie) { create(:movie) }
- let(:disk_title) { create(:disk_title, video: movie) }
-
- it 'returns the MKV file name for the movie' do
- expect(disk_title.plex_name).to eq(movie.plex_name)
- end
- end
- end
-
- describe '#tmp_plex_dir' do
- context 'when video is a TV' do
- let(:episode) { create(:episode) }
- let(:disk_title) { create(:disk_title, video: episode.tv, episode:) }
-
- it 'returns the temporary Plex directory for the episode' do
- expect(disk_title.tmp_plex_dir).to eq(episode.tmp_plex_dir)
- end
- end
-
- context 'when video is a Movie' do
- let(:movie) { create(:movie) }
- let(:disk_title) { create(:disk_title, video: movie) }
-
- it 'returns the temporary Plex directory for the movie' do
- expect(disk_title.tmp_plex_dir).to eq(movie.tmp_plex_dir)
- end
- end
- end
-
- describe '#tmp_plex_path_exists?' do
- context 'when video is a TV' do
- let(:episode) { create(:episode) }
- let(:disk_title) { create(:disk_title, video: episode.tv, episode:) }
-
- it 'returns whether the temporary Plex path exists for the episode' do
- expect(disk_title.tmp_plex_path_exists?).to eq(episode.tmp_plex_path_exists?)
- end
- end
-
- context 'when video is a Movie' do
- let(:movie) { create(:movie) }
- let(:disk_title) { create(:disk_title, video: movie) }
-
- it 'returns whether the temporary Plex path exists for the movie' do
- expect(disk_title.tmp_plex_path_exists?).to eq(movie.tmp_plex_path_exists?)
- end
- end
- end
-
- describe '#require_movie_or_episode!' do
- context 'when video is a Movie' do
- let(:movie) { create(:movie) }
- let(:disk_title) { create(:disk_title, video: movie) }
-
- it 'does not raise an error' do
- expect { disk_title.require_movie_or_episode! }.not_to raise_error
- end
- end
-
- context 'when video is a TV without episode' do
- let(:tv) { create(:tv) }
- let(:disk_title) { create(:disk_title, video: tv, episode: nil) }
-
- it 'raises an error' do
- expect { disk_title.require_movie_or_episode! }.to raise_error('requires episode or movie to rip')
- end
- end
-
- context 'when video is a TV with episode' do
- let(:episode) { create(:episode) }
- let(:disk_title) { create(:disk_title, video: episode.tv, episode:) }
-
- it 'does not raise an error' do
- expect { disk_title.require_movie_or_episode! }.not_to raise_error
- end
- end
- end
end
diff --git a/spec/models/movie_spec.rb b/spec/models/movie_spec.rb
index e4b82e1b..80b668c1 100644
--- a/spec/models/movie_spec.rb
+++ b/spec/models/movie_spec.rb
@@ -15,7 +15,6 @@
# poster_path :string
# rating :integer default("N/A"), not null
# release_date :date
-# synced_on :datetime
# title :string
# type :string
# created_at :datetime not null
@@ -29,9 +28,6 @@
require 'rails_helper'
RSpec.describe Movie do
- include_examples 'IsVideo'
-
- # V
describe 'validations' do
it { is_expected.to validate_presence_of(:title) }
it { is_expected.to validate_presence_of(:original_title) }
diff --git a/spec/models/tv_spec.rb b/spec/models/tv_spec.rb
index 1db5f9fc..cd0bfaf7 100644
--- a/spec/models/tv_spec.rb
+++ b/spec/models/tv_spec.rb
@@ -15,7 +15,6 @@
# poster_path :string
# rating :integer default("N/A"), not null
# release_date :date
-# synced_on :datetime
# title :string
# type :string
# created_at :datetime not null
@@ -29,8 +28,6 @@
require 'rails_helper'
RSpec.describe Tv do
- include_context 'IsVideo'
-
describe 'validations' do
it { is_expected.to validate_presence_of(:name) }
it { is_expected.to validate_presence_of(:original_name) }
diff --git a/spec/models/video_blob_spec.rb b/spec/models/video_blob_spec.rb
index cbce124d..4460a9c6 100644
--- a/spec/models/video_blob_spec.rb
+++ b/spec/models/video_blob_spec.rb
@@ -4,33 +4,38 @@
#
# Table name: video_blobs
#
-# id :integer not null, primary key
-# byte_size :bigint not null
-# checksum :text
-# content_type :string not null
-# filename :string not null
-# key :string not null
-# metadata :text
-# optimized :boolean default(FALSE), not null
-# service_name :string not null
-# created_at :datetime not null
-# updated_at :datetime not null
-# episode_id :bigint
-# video_id :integer
+# id :integer not null, primary key
+# byte_size :bigint not null
+# checksum :text
+# content_type :string not null
+# extra_type :integer default("feature_films")
+# extra_type_number :integer not null
+# filename :string not null
+# key :string not null
+# metadata :text
+# optimized :boolean default(FALSE), not null
+# uploaded_on :datetime
+# created_at :datetime not null
+# updated_at :datetime not null
+# episode_id :bigint
+# video_id :integer
#
# Indexes
#
-# index_video_blobs_on_key_and_service_name (key,service_name) UNIQUE
-# index_video_blobs_on_video (video_id)
+# idx_on_extra_type_number_video_id_extra_type_1978193db6 (extra_type_number,video_id,extra_type) UNIQUE
+# index_video_blobs_on_key (key) UNIQUE
+# index_video_blobs_on_key_and_service_name (key) UNIQUE
+# index_video_blobs_on_video (video_id)
#
require 'rails_helper'
RSpec.describe VideoBlob do
- let(:video_blob) { build(:video_blog) }
+ subject(:video_blob) { build(:video_blob, extra_type_number: 1) }
describe 'associations' do
it { is_expected.to belong_to(:video).optional(true) }
it { is_expected.to belong_to(:episode).optional(true) }
+ it { is_expected.to have_many(:disk_titles).dependent(:nullify) }
end
describe 'scopes' do
@@ -39,16 +44,77 @@
it { is_expected.to have_scope(:missing_checksum).where(checksum: nil) }
end
- describe '#tv_show?' do
- subject(:tv_show?) { video_blob.tv_show? }
+ describe 'validations' do
+ it { is_expected.to validate_presence_of(:key) }
+ it { is_expected.to validate_uniqueness_of(:key) }
+ end
+
+ describe '#extra_type_directory' do
+ subject(:extra_type_directory) { video_blob.send(:extra_type_directory) }
+
+ let(:video_blob) { build_stubbed(:video_blob, extra_type: :behind_the_scenes) }
+
+ it { is_expected.to eq 'Behind The Scenes' }
+ end
+
+ describe '#plex_path' do
+ subject(:plex_path) { video_blob.plex_path }
before do
+ config_plex = build_stubbed(:config_plex)
allow(Config::Plex).to receive(:newest).and_return(config_plex)
end
+ context 'when feature_films extra type' do
+ let(:video_blob) { build_stubbed(:video_blob, extra_type: :feature_films, video: movie) }
+ let(:movie) { build_stubbed(:movie) }
+ let(:expected_path) do
+ plex_name = video_blob.send(:plex_name)
+ "#{Config::Plex.newest.settings_movie_path}/#{plex_name}/#{plex_name}.mkv"
+ end
+
+ it { is_expected.to eq Pathname.new(expected_path) }
+ end
+
+ context 'when not feature_films extra type' do
+ let(:video_blob) { build_stubbed(:video_blob, extra_type: :behind_the_scenes, video: movie) }
+ let(:movie) { build_stubbed(:movie) }
+ let(:expected_path) do
+ "#{Config::Plex.newest.settings_movie_path}/#{movie.plex_name}/Behind The Scenes/Behind The Scenes #1.mkv"
+ end
+
+ it { is_expected.to eq Pathname.new(expected_path) }
+ end
+
+ context 'when not feature_films extra type & tv show' do
+ let(:video_blob) { build_stubbed(:video_blob, extra_type: :behind_the_scenes, video: tv) }
+ let(:tv) { build_stubbed(:tv) }
+ let(:expected_path) do
+ "#{Config::Plex.newest.settings_tv_path}/#{tv.plex_name}/Behind The Scenes/Behind The Scenes #1.mkv"
+ end
+
+ it { is_expected.to eq Pathname.new(expected_path) }
+ end
+ end
+
+ describe '#set_extra_type_number' do
+ context 'when using movies types' do
+ let!(:video_blob_a) { create(:video_blob, video: movie, extra_type: :feature_films) }
+ let!(:video_blob_b) { create(:video_blob, video: movie, extra_type: :feature_films) }
+ let(:movie) { create(:movie) }
+
+ it { expect(video_blob_a.extra_type_number).to eq 1 }
+ it { expect(video_blob_b.extra_type_number).to eq 2 }
+ end
+ end
+
+ describe '#tv_show?' do
+ subject(:tv_show?) { video_blob.tv_show? }
+
+ before { allow(Config::Plex).to receive(:newest).and_return(config_plex) }
+
context 'when path does not start with tv show path' do
let(:config_plex) { build_stubbed(:config_plex, settings_tv_path: '/Media/Tv Show') }
-
let(:video_blob) { build_stubbed(:video_blob, key: '/Tv Show') }
it { is_expected.to be(false) }
@@ -56,7 +122,6 @@
context 'when path does start with tv show path' do
let(:config_plex) { build_stubbed(:config_plex, settings_tv_path: '/Media/Tv Show') }
-
let(:video_blob) { build_stubbed(:video_blob, key: '/Media/Tv Show') }
it { is_expected.to be(true) }
@@ -112,5 +177,21 @@
it { is_expected.to be(false) }
end
+
+ context 'when the video is tv' do
+ let(:config_plex) { build_stubbed(:config_plex, settings_movie_path: '') }
+ let(:video_blob) { build_stubbed(:video_blob, key: '/Movie', video:) }
+ let(:video) { build_stubbed(:tv) }
+
+ it { is_expected.to be(false) }
+ end
+
+ context 'when the video is movie' do
+ let(:config_plex) { build_stubbed(:config_plex, settings_movie_path: '') }
+ let(:video_blob) { build_stubbed(:video_blob, key: '/Movie', video:) }
+ let(:video) { build_stubbed(:movie) }
+
+ it { is_expected.to be(true) }
+ end
end
end
diff --git a/spec/models/video_spec.rb b/spec/models/video_spec.rb
index f92e100f..2cc5de92 100644
--- a/spec/models/video_spec.rb
+++ b/spec/models/video_spec.rb
@@ -15,7 +15,6 @@
# poster_path :string
# rating :integer default("N/A"), not null
# release_date :date
-# synced_on :datetime
# title :string
# type :string
# created_at :datetime not null
@@ -31,7 +30,7 @@
RSpec.describe Video do
describe 'associations' do
it { is_expected.to have_many(:disk_titles).dependent(:nullify) }
- it { is_expected.to have_many(:video_blobs).dependent(:destroy) }
+ it { is_expected.to have_many(:video_blobs).dependent(:nullify) }
it { is_expected.to have_many(:optimized_video_blobs).dependent(:destroy) }
end
end
diff --git a/spec/requests/movies_request_spec.rb b/spec/requests/movies_request_spec.rb
index d72d67f9..aa6aea98 100644
--- a/spec/requests/movies_request_spec.rb
+++ b/spec/requests/movies_request_spec.rb
@@ -13,9 +13,11 @@
describe '/:id/rip' do
let!(:movie) { create(:movie) }
let!(:disk_title) { create(:disk_title) }
+ let(:disk_id) { disk_title.disk.id }
it 'renders a successful response' do
- post rip_movie_url(movie, disk_title_id: disk_title.id)
+ post rip_movie_url(movie),
+ params: { disk_id:, movies: [{ extra_type: 'feature_film', disk_title_id: disk_title.id }] }
expect(Job.count).to eq 1
expect(response).to have_http_status :found
diff --git a/spec/services/create_mkv_service_spec.rb b/spec/services/create_mkv_service_spec.rb
index 2eda610d..e712d66a 100644
--- a/spec/services/create_mkv_service_spec.rb
+++ b/spec/services/create_mkv_service_spec.rb
@@ -4,7 +4,6 @@
RSpec.describe CreateMkvService do
let(:service) { described_class.new(disk_title:) }
- let(:disk_title) { build_stubbed(:disk_title) }
before { create(:config_make_mkv) }
@@ -12,12 +11,14 @@
subject(:call) { service.call }
context 'when the disk title is valid' do
- let(:disk_title) { build_stubbed(:disk_title, :with_movie) }
+ let(:disk_title) { build_stubbed(:disk_title, video: movie, video_blob:) }
+ let(:video_blob) { build_stubbed(:video_blob, video: movie) }
+ let(:movie) { build_stubbed(:movie) }
before { allow(service).to receive(:cmd).and_return('ls /not-a-real-folder') }
it 'responds with a result object' do
- expect(call).to eq(described_class::Result.new(disk_title.tmp_plex_path, false))
+ expect(call).to eq(described_class::Result.new(video_blob.tmp_plex_path, false))
end
end
end
diff --git a/spec/support/shared_example/is_video.rb b/spec/support/shared_example/is_video.rb
deleted file mode 100644
index 834304b6..00000000
--- a/spec/support/shared_example/is_video.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.shared_examples 'IsVideo' do |_parameter|
- let(:model_class) { described_class.model_name.singular.to_sym }
- let(:model) { build_stubbed(model_class) }
-
- describe '#release_or_air_date', :freeze do
- subject(:release_or_air_date) { video.release_or_air_date }
-
- let(:expected_date) { Time.zone.today }
- let(:unexpected_date) { 2.days.ago }
-
- context 'when release_date is present' do
- let(:video) { build_stubbed(model_class, release_date: expected_date, episode_first_air_date: nil) }
-
- it { is_expected.to eq expected_date }
- end
-
- context 'when episode_first_air_date is present' do
- let(:video) { build_stubbed(model_class, release_date: nil, episode_first_air_date: expected_date) }
-
- it { is_expected.to eq expected_date }
- end
-
- context 'when both release_date & episode_first_air_date is present' do
- let(:video) do
- build_stubbed(
- model_class,
- release_date: expected_date,
- episode_first_air_date: unexpected_date
- )
- end
-
- it { is_expected.to eq expected_date }
- end
- end
-end
diff --git a/spec/workers/upload_worker_spec.rb b/spec/workers/upload_worker_spec.rb
index a7a1a843..a80dac6b 100644
--- a/spec/workers/upload_worker_spec.rb
+++ b/spec/workers/upload_worker_spec.rb
@@ -3,11 +3,12 @@
require 'rails_helper'
RSpec.describe UploadWorker, type: :worker do
- subject(:worker) { described_class.new(disk_title_id:, job:) }
+ subject(:worker) { described_class.new(video_blob_id:, job:) }
- let(:disk_title) { create(:disk_title, video: movie) }
+ let(:disk_title) { create(:disk_title, video: movie, video_blob:) }
+ let(:video_blob) { create(:video_blob, video: movie) }
let(:movie) { create(:movie) }
- let(:disk_title_id) { disk_title.id }
+ let(:video_blob_id) { video_blob.id }
let(:job) { create(:job) }
let(:stub_ftp) { instance_double(Net::FTP) }
@@ -18,7 +19,7 @@
allow(stub_ftp).to receive(:mkdir)
allow(stub_ftp).to receive(:putbinaryfile)
- FileUtils.mkdir_p(disk_title.tmp_plex_path)
+ FileUtils.mkdir_p(video_blob.tmp_plex_path)
end
describe '#perform' do