コミットを比較
2 コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
| d6670bb65e | |||
| 776dea87d9 |
@@ -245,10 +245,7 @@ class TagsController < ApplicationController
|
|||||||
return render_unprocessable_entity('カテゴリは必須です.', field: :category) if category.blank?
|
return render_unprocessable_entity('カテゴリは必須です.', field: :category) if category.blank?
|
||||||
return render_unprocessable_entity '廃止状態は必須です.', field: :deprecated unless params.key?(:deprecated)
|
return render_unprocessable_entity '廃止状態は必須です.', field: :deprecated unless params.key?(:deprecated)
|
||||||
|
|
||||||
if (name != tag.name &&
|
return unless validate_tag_rename(tag, name)
|
||||||
tag.in?([Tag.tagme, Tag.bot, Tag.no_deerjikist, Tag.video, Tag.niconico]))
|
|
||||||
return render_unprocessable_entity 'システム・タグの名称は変更できません.', field: :name
|
|
||||||
end
|
|
||||||
|
|
||||||
alias_names = params[:aliases].to_s.split.uniq
|
alias_names = params[:aliases].to_s.split.uniq
|
||||||
parent_names = params[:parent_tags].to_s.split.uniq
|
parent_names = params[:parent_tags].to_s.split.uniq
|
||||||
@@ -274,7 +271,7 @@ class TagsController < ApplicationController
|
|||||||
else
|
else
|
||||||
tag.update!(category:, deprecated_at: deprecated ? Time.current : nil)
|
tag.update!(category:, deprecated_at: deprecated ? Time.current : nil)
|
||||||
end
|
end
|
||||||
tag.tag_name.update!(name:)
|
rename_tag_name!(tag, name) if name_changed
|
||||||
|
|
||||||
alias_names << old_name if name_changed
|
alias_names << old_name if name_changed
|
||||||
alias_names.delete(name)
|
alias_names.delete(name)
|
||||||
@@ -310,6 +307,8 @@ class TagsController < ApplicationController
|
|||||||
return render_unprocessable_entity 'ニコタグは廃止できません.', field: :deprecated
|
return render_unprocessable_entity 'ニコタグは廃止できません.', field: :deprecated
|
||||||
end
|
end
|
||||||
|
|
||||||
|
return unless validate_tag_rename(tag, name)
|
||||||
|
|
||||||
if tag.nico? || (category.present? && category == 'nico')
|
if tag.nico? || (category.present? && category == 'nico')
|
||||||
return render_unprocessable_entity 'ニコタグは変更できません.', field: :category
|
return render_unprocessable_entity 'ニコタグは変更できません.', field: :category
|
||||||
end
|
end
|
||||||
@@ -321,7 +320,7 @@ class TagsController < ApplicationController
|
|||||||
name_changed = name.present? && name != old_name
|
name_changed = name.present? && name != old_name
|
||||||
wiki_page = tag.tag_name.wiki_page if name_changed
|
wiki_page = tag.tag_name.wiki_page if name_changed
|
||||||
|
|
||||||
tag.tag_name.update!(name:) if name.present?
|
rename_tag_name!(tag, name) if name_changed
|
||||||
tag.update!(category:) if category.present?
|
tag.update!(category:) if category.present?
|
||||||
if deprecated_given && tag.deprecated? != deprecated
|
if deprecated_given && tag.deprecated? != deprecated
|
||||||
tag.update!(deprecated_at: deprecated ? Time.current : nil)
|
tag.update!(deprecated_at: deprecated ? Time.current : nil)
|
||||||
@@ -535,6 +534,67 @@ class TagsController < ApplicationController
|
|||||||
created_by_user:)
|
created_by_user:)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def validate_tag_rename tag, name
|
||||||
|
return true if name.blank? || name == tag.name
|
||||||
|
|
||||||
|
if tag.in?([Tag.tagme, Tag.bot, Tag.no_deerjikist, Tag.video, Tag.niconico])
|
||||||
|
render_unprocessable_entity 'システム・タグの名称は変更できません.', field: :name
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
target_tag_name = TagName.with_discarded.find_by(name:)
|
||||||
|
return true if target_tag_name.nil?
|
||||||
|
return true if target_tag_name.canonical_id?
|
||||||
|
|
||||||
|
render_unprocessable_entity 'その名前は既に使はれてゐます.', field: :name
|
||||||
|
false
|
||||||
|
end
|
||||||
|
|
||||||
|
def rename_tag_name! tag, name
|
||||||
|
return if name == tag.name
|
||||||
|
|
||||||
|
current_tag_name = tag.tag_name
|
||||||
|
target_tag_name = TagName.with_discarded.find_by(name:)
|
||||||
|
|
||||||
|
if target_tag_name.nil?
|
||||||
|
current_tag_name.update!(name:)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
promote_tag_alias!(
|
||||||
|
tag,
|
||||||
|
current_tag_name:,
|
||||||
|
promoted_tag_name: target_tag_name)
|
||||||
|
end
|
||||||
|
|
||||||
|
def promote_tag_alias! tag, current_tag_name:, promoted_tag_name:
|
||||||
|
old_owner_tag = promoted_tag_name.canonical&.tag
|
||||||
|
|
||||||
|
if old_owner_tag && old_owner_tag != tag
|
||||||
|
TagVersioning.ensure_snapshot!(old_owner_tag, created_by_user: current_user)
|
||||||
|
end
|
||||||
|
|
||||||
|
promoted_tag_name.undiscard! if promoted_tag_name.discarded?
|
||||||
|
promoted_tag_name.update!(canonical: nil)
|
||||||
|
|
||||||
|
TagName.with_discarded
|
||||||
|
.where(canonical_id: current_tag_name.id)
|
||||||
|
.where.not(id: promoted_tag_name.id)
|
||||||
|
.find_each do |alias_tag_name|
|
||||||
|
alias_tag_name.update!(canonical: promoted_tag_name)
|
||||||
|
end
|
||||||
|
|
||||||
|
current_tag_name.wiki_page&.update!(tag_name: promoted_tag_name)
|
||||||
|
tag.update!(tag_name: promoted_tag_name)
|
||||||
|
current_tag_name.association(:wiki_page).reset
|
||||||
|
current_tag_name.association(:tag).reset
|
||||||
|
current_tag_name.reload.update!(canonical: promoted_tag_name)
|
||||||
|
|
||||||
|
return unless old_owner_tag && old_owner_tag != tag
|
||||||
|
|
||||||
|
record_tag_version!(old_owner_tag.reload, event_type: :update, created_by_user: current_user)
|
||||||
|
end
|
||||||
|
|
||||||
def update_aliases! tag, alias_names
|
def update_aliases! tag, alias_names
|
||||||
alias_names = alias_names.uniq
|
alias_names = alias_names.uniq
|
||||||
|
|
||||||
|
|||||||
@@ -26,13 +26,19 @@ module GoogleDrive
|
|||||||
|
|
||||||
def list_material_files_under_folder folder_id
|
def list_material_files_under_folder folder_id
|
||||||
files = []
|
files = []
|
||||||
|
each_material_file_under_folder(folder_id) { |entry| files << entry }
|
||||||
|
files
|
||||||
|
end
|
||||||
|
|
||||||
|
def each_material_file_under_folder folder_id
|
||||||
|
return enum_for(__method__, folder_id) unless block_given?
|
||||||
|
|
||||||
walk_folder(folder_id, nil) do |entry, relative_path|
|
walk_folder(folder_id, nil) do |entry, relative_path|
|
||||||
next if entry['mimeType'] == FOLDER_MIME_TYPE
|
next if entry['mimeType'] == FOLDER_MIME_TYPE
|
||||||
next if native_file?(entry['mimeType'])
|
next if native_file?(entry['mimeType'])
|
||||||
|
|
||||||
files << build_file_entry(entry, relative_path)
|
yield build_file_entry(entry, relative_path)
|
||||||
end
|
end
|
||||||
files
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def fetch_material_file file_id
|
def fetch_material_file file_id
|
||||||
@@ -44,9 +50,10 @@ module GoogleDrive
|
|||||||
|
|
||||||
def download_to_tempfile file_id, filename:
|
def download_to_tempfile file_id, filename:
|
||||||
tempfile = Tempfile.new(['material-sync', File.extname(filename.to_s)])
|
tempfile = Tempfile.new(['material-sync', File.extname(filename.to_s)])
|
||||||
|
tempfile.binmode
|
||||||
request_binary("/files/#{ file_id }",
|
request_binary("/files/#{ file_id }",
|
||||||
{ alt: 'media', supportsAllDrives: true }) do |chunk|
|
{ alt: 'media', supportsAllDrives: true }) do |chunk|
|
||||||
tempfile.write(chunk)
|
tempfile.write(chunk.b)
|
||||||
end
|
end
|
||||||
tempfile.rewind
|
tempfile.rewind
|
||||||
tempfile
|
tempfile
|
||||||
@@ -139,7 +146,7 @@ module GoogleDrive
|
|||||||
end
|
end
|
||||||
|
|
||||||
response.read_body do |chunk|
|
response.read_body do |chunk|
|
||||||
yield chunk
|
yield chunk.b
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -21,10 +21,14 @@ class MaterialSyncRunner
|
|||||||
result = Result.new(imported: 0, updated: 0, unchanged: 0,
|
result = Result.new(imported: 0, updated: 0, unchanged: 0,
|
||||||
suppressed: 0, failed: 0, errors: [])
|
suppressed: 0, failed: 0, errors: [])
|
||||||
|
|
||||||
candidates.each do |candidate|
|
if @source.source_kind == 'google_drive_path'
|
||||||
next if candidate.blank?
|
sync_google_drive_path!(result)
|
||||||
|
else
|
||||||
|
candidates.each do |candidate|
|
||||||
|
next if candidate.blank?
|
||||||
|
|
||||||
sync_candidate!(candidate, result)
|
sync_candidate!(candidate, result)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@source.update!(last_synced_at: Time.current)
|
@source.update!(last_synced_at: Time.current)
|
||||||
@@ -43,8 +47,6 @@ class MaterialSyncRunner
|
|||||||
case @source.source_kind
|
case @source.source_kind
|
||||||
when 'uri'
|
when 'uri'
|
||||||
[uri_candidate]
|
[uri_candidate]
|
||||||
when 'google_drive_path'
|
|
||||||
google_drive_path_candidates
|
|
||||||
when 'google_drive_file'
|
when 'google_drive_file'
|
||||||
[google_drive_file_candidate]
|
[google_drive_file_candidate]
|
||||||
when 'legacy_drive_path'
|
when 'legacy_drive_path'
|
||||||
@@ -104,12 +106,25 @@ class MaterialSyncRunner
|
|||||||
def google_drive_path_candidates
|
def google_drive_path_candidates
|
||||||
folder_id = google_drive_folder_id
|
folder_id = google_drive_folder_id
|
||||||
Enumerator.new do |entries|
|
Enumerator.new do |entries|
|
||||||
drive_client.list_material_files_under_folder(folder_id).each do |entry|
|
drive_client.each_material_file_under_folder(folder_id).each do |entry|
|
||||||
entries << build_google_drive_candidate(entry)
|
entries << build_google_drive_candidate(entry)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def sync_google_drive_path! result
|
||||||
|
folder_id = google_drive_folder_id
|
||||||
|
scanned_count = 0
|
||||||
|
|
||||||
|
drive_client.each_material_file_under_folder(folder_id) do |entry|
|
||||||
|
scanned_count += 1
|
||||||
|
sync_candidate!(build_google_drive_candidate(entry), result)
|
||||||
|
log_google_drive_progress(folder_id, scanned_count, result) if progress_log_scan_count?(scanned_count)
|
||||||
|
end
|
||||||
|
|
||||||
|
log_google_drive_progress(folder_id, scanned_count, result, summary: true)
|
||||||
|
end
|
||||||
|
|
||||||
def google_drive_file_candidate
|
def google_drive_file_candidate
|
||||||
entry = drive_client.fetch_material_file(google_drive_file_id)
|
entry = drive_client.fetch_material_file(google_drive_file_id)
|
||||||
return nil unless entry
|
return nil unless entry
|
||||||
@@ -213,6 +228,22 @@ class MaterialSyncRunner
|
|||||||
failed: result.failed))
|
failed: result.failed))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def progress_log_scan_count? scanned_count
|
||||||
|
scanned_count == 1 || (scanned_count % 50).zero?
|
||||||
|
end
|
||||||
|
|
||||||
|
def log_google_drive_progress folder_id, scanned_count, result, summary: false
|
||||||
|
Rails.logger.info(
|
||||||
|
material_sync_log(folder_id:,
|
||||||
|
scanned_count:,
|
||||||
|
imported: result.imported,
|
||||||
|
updated: result.updated,
|
||||||
|
unchanged: result.unchanged,
|
||||||
|
suppressed: result.suppressed,
|
||||||
|
failed: result.failed,
|
||||||
|
progress: summary ? 'summary' : 'scan'))
|
||||||
|
end
|
||||||
|
|
||||||
def material_sync_log fields
|
def material_sync_log fields
|
||||||
{ material_sync_source_id: @source.id,
|
{ material_sync_source_id: @source.id,
|
||||||
material_sync_source_name: @source.name }.merge(fields).to_json
|
material_sync_source_name: @source.name }.merge(fields).to_json
|
||||||
|
|||||||
@@ -581,6 +581,58 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(wiki_page.reload.wiki_versions.count).to eq(before_wiki_version_count)
|
expect(wiki_page.reload.wiki_versions.count).to eq(before_wiki_version_count)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'full update で旧名 alias が残った tag を PATCH で旧名へ戻せる' do
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'patch_roundtrip_target',
|
||||||
|
category: 'general',
|
||||||
|
aliases: 'unko',
|
||||||
|
parent_tags: '',
|
||||||
|
deprecated: '0',
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
expect(TagName.find_by!(name: 'spec_tag').canonical).to eq(tag.reload.tag_name)
|
||||||
|
|
||||||
|
patch "/tags/#{ tag.id }", params: { name: 'spec_tag' }
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
tag.reload
|
||||||
|
|
||||||
|
expect(tag.name).to eq('spec_tag')
|
||||||
|
expect(tag.tag_name.canonical_id).to be_nil
|
||||||
|
expect(TagName.find_by!(name: 'patch_roundtrip_target').canonical).to eq(tag.tag_name)
|
||||||
|
end
|
||||||
|
|
||||||
|
it '別 tag の正規名には変更できない' do
|
||||||
|
wiki_page =
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: tag.tag_name,
|
||||||
|
body: 'patch collision wiki',
|
||||||
|
created_by_user: member_user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
patch "/tags/#{ tag.id }", params: { name: 'unknown' }
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(json.fetch('errors')).to include(
|
||||||
|
'name' => ['その名前は既に使はれてゐます.']
|
||||||
|
)
|
||||||
|
|
||||||
|
expect(tag.reload.name).to eq('spec_tag')
|
||||||
|
expect(tag.tag_name.aliases.map(&:name)).to contain_exactly('unko')
|
||||||
|
expect(wiki_page.reload.tag_name).to eq(tag.tag_name)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'system tag の name は変更できない' do
|
||||||
|
system_tag = Tag.bot
|
||||||
|
|
||||||
|
patch "/tags/#{ system_tag.id }", params: { name: 'patch_system_tag_renamed' }
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:unprocessable_entity)
|
||||||
|
expect(system_tag.reload.name).to eq('bot操作')
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -1029,6 +1081,42 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
expect(versions.second.created_by_user_id).to eq(member_user.id)
|
expect(versions.second.created_by_user_id).to eq(member_user.id)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it '同じ tag の旧 alias へ戻しても rename できる' do
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'put_roundtrip_b',
|
||||||
|
category: 'general',
|
||||||
|
aliases: 'unko',
|
||||||
|
parent_tags: '',
|
||||||
|
deprecated: '0',
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'spec_tag',
|
||||||
|
category: 'general',
|
||||||
|
aliases: 'unko',
|
||||||
|
parent_tags: '',
|
||||||
|
deprecated: '0',
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
tag.reload
|
||||||
|
|
||||||
|
expect(tag.name).to eq('spec_tag')
|
||||||
|
expect(TagName.find_by!(name: 'put_roundtrip_b').canonical).to eq(tag.tag_name)
|
||||||
|
expect(tag.tag_name.aliases.map(&:name)).to contain_exactly('put_roundtrip_b', 'unko')
|
||||||
|
expect(tag.tag_name.aliases.map(&:name)).not_to include('spec_tag')
|
||||||
|
expect(alias_tn.reload.canonical).to eq(tag.tag_name)
|
||||||
|
|
||||||
|
version = tag.tag_versions.order(:version_no).last
|
||||||
|
|
||||||
|
expect(version.event_type).to eq('update')
|
||||||
|
expect(version.name).to eq('spec_tag')
|
||||||
|
expect(version.aliases.split).to contain_exactly('put_roundtrip_b', 'unko')
|
||||||
|
end
|
||||||
|
|
||||||
it 'parent tag の snapshot も作成する' do
|
it 'parent tag の snapshot も作成する' do
|
||||||
old_parent = Tag.create!(
|
old_parent = Tag.create!(
|
||||||
tag_name: TagName.create!(name: 'put_snapshot_old_parent'),
|
tag_name: TagName.create!(name: 'put_snapshot_old_parent'),
|
||||||
@@ -1153,6 +1241,48 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'wiki を持つ tag を旧 alias へ戻しても wiki を新 canonical へ移す' do
|
||||||
|
wiki_page =
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: tag.tag_name,
|
||||||
|
body: 'wiki body before',
|
||||||
|
created_by_user: member_user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
expect {
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'put_wiki_roundtrip_b',
|
||||||
|
category: 'general',
|
||||||
|
aliases: 'unko',
|
||||||
|
parent_tags: '',
|
||||||
|
deprecated: '0',
|
||||||
|
}
|
||||||
|
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'spec_tag',
|
||||||
|
category: 'general',
|
||||||
|
aliases: 'unko',
|
||||||
|
parent_tags: '',
|
||||||
|
deprecated: '0',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.to change(TagVersion, :count).by(3)
|
||||||
|
.and change(WikiVersion, :count).by(2)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
tag.reload
|
||||||
|
|
||||||
|
expect(wiki_page.reload.tag_name).to eq(tag.tag_name)
|
||||||
|
expect(TagName.find_by!(name: 'put_wiki_roundtrip_b').wiki_page).to be_nil
|
||||||
|
expect(TagName.find_by!(name: 'put_wiki_roundtrip_b').canonical).to eq(tag.tag_name)
|
||||||
|
|
||||||
|
versions = wiki_page.wiki_versions.order(:version_no).last(2)
|
||||||
|
|
||||||
|
expect(versions.map(&:event_type)).to eq(['update', 'update'])
|
||||||
|
expect(versions.map(&:title)).to eq(['put_wiki_roundtrip_b', 'spec_tag'])
|
||||||
|
end
|
||||||
|
|
||||||
it '別名を他 tag から奪った場合、奪はれた側の tag version も作成する' do
|
it '別名を他 tag から奪った場合、奪はれた側の tag version も作成する' do
|
||||||
old_owner = Tag.create!(
|
old_owner = Tag.create!(
|
||||||
tag_name: TagName.create!(name: 'put_alias_old_owner'),
|
tag_name: TagName.create!(name: 'put_alias_old_owner'),
|
||||||
@@ -1191,6 +1321,48 @@ RSpec.describe 'Tags API', type: :request do
|
|||||||
expect(old_owner_versions.second.aliases.split).not_to include('put_stolen_alias')
|
expect(old_owner_versions.second.aliases.split).not_to include('put_stolen_alias')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it '別 tag の alias 名を rename で奪へる' do
|
||||||
|
old_owner = Tag.create!(
|
||||||
|
tag_name: TagName.create!(name: 'put_alias_collision_owner'),
|
||||||
|
category: :general
|
||||||
|
)
|
||||||
|
stolen_alias = TagName.create!(
|
||||||
|
name: 'put_alias_collision_name',
|
||||||
|
canonical: old_owner.tag_name
|
||||||
|
)
|
||||||
|
wiki_page =
|
||||||
|
Wiki::Commit.create_content!(
|
||||||
|
tag_name: tag.tag_name,
|
||||||
|
body: 'put collision wiki',
|
||||||
|
created_by_user: member_user,
|
||||||
|
message: 'init')
|
||||||
|
|
||||||
|
put "/tags/#{ tag.id }", params: {
|
||||||
|
name: 'put_alias_collision_name',
|
||||||
|
category: 'general',
|
||||||
|
aliases: 'unko',
|
||||||
|
parent_tags: '',
|
||||||
|
deprecated: '0',
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(response).to have_http_status(:ok)
|
||||||
|
|
||||||
|
tag.reload
|
||||||
|
old_owner.reload
|
||||||
|
stolen_alias.reload
|
||||||
|
|
||||||
|
expect(tag.name).to eq('put_alias_collision_name')
|
||||||
|
expect(stolen_alias.canonical_id).to be_nil
|
||||||
|
expect(TagName.find_by!(name: 'spec_tag').canonical).to eq(tag.tag_name)
|
||||||
|
expect(old_owner.tag_name.aliases.map(&:name)).not_to include('put_alias_collision_name')
|
||||||
|
|
||||||
|
old_owner_versions = old_owner.tag_versions.order(:version_no)
|
||||||
|
|
||||||
|
expect(old_owner_versions.last.event_type).to eq('update')
|
||||||
|
expect(old_owner_versions.last.aliases.split).not_to include('put_alias_collision_name')
|
||||||
|
expect(wiki_page.reload.tag_name).to eq(tag.tag_name)
|
||||||
|
end
|
||||||
|
|
||||||
it 'parent_tags に指定すると循環する tag は 422 にする' do
|
it 'parent_tags に指定すると循環する tag は 422 にする' do
|
||||||
pending '#332 で対応予定'
|
pending '#332 で対応予定'
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,89 @@
|
|||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe MaterialSyncRunner do
|
||||||
|
let(:user) { create(:user, :member) }
|
||||||
|
let(:source) do
|
||||||
|
MaterialSyncSource.create!(
|
||||||
|
name: 'Drive source',
|
||||||
|
source_kind: 'google_drive_path',
|
||||||
|
source_file_id: 'folder-123',
|
||||||
|
profile: 'legacy_drive',
|
||||||
|
created_by_user: user,
|
||||||
|
updated_by_user: user)
|
||||||
|
end
|
||||||
|
let(:drive_client) { instance_double(GoogleDrive::ApiClient) }
|
||||||
|
|
||||||
|
describe '#sync!' do
|
||||||
|
it 'imports google drive path candidates as they are yielded' do
|
||||||
|
first_entry = { id: 'file-1',
|
||||||
|
name: 'a.png',
|
||||||
|
mime_type: 'image/png',
|
||||||
|
relative_path: '素材/a.png',
|
||||||
|
sha256_checksum: 'sha-a',
|
||||||
|
web_view_link: 'https://drive.google.com/file/d/file-1/view',
|
||||||
|
web_content_link: nil }
|
||||||
|
second_entry = { id: 'file-2',
|
||||||
|
name: 'b.png',
|
||||||
|
mime_type: 'image/png',
|
||||||
|
relative_path: '素材/b.png',
|
||||||
|
sha256_checksum: 'sha-b',
|
||||||
|
web_view_link: 'https://drive.google.com/file/d/file-2/view',
|
||||||
|
web_content_link: nil }
|
||||||
|
yielded = []
|
||||||
|
|
||||||
|
allow(GoogleDrive::ApiClient).to receive(:new).and_return(drive_client)
|
||||||
|
allow(drive_client).to receive(:each_material_file_under_folder) do |folder_id, &block|
|
||||||
|
expect(folder_id).to eq('folder-123')
|
||||||
|
block.call(first_entry)
|
||||||
|
expect(yielded).to eq(['素材/a.png'])
|
||||||
|
block.call(second_entry)
|
||||||
|
end
|
||||||
|
allow(MaterialSyncImporter).to receive(:import!) do |candidate|
|
||||||
|
yielded << candidate.fetch(:source_path)
|
||||||
|
instance_double(MaterialSyncImporter::Result,
|
||||||
|
action: yielded.last == '素材/a.png' ? :imported : :updated)
|
||||||
|
end
|
||||||
|
|
||||||
|
result = described_class.new(source).sync!
|
||||||
|
|
||||||
|
expect(yielded).to eq(['素材/a.png', '素材/b.png'])
|
||||||
|
expect(result.imported).to eq(1)
|
||||||
|
expect(result.updated).to eq(1)
|
||||||
|
expect(result.unchanged).to eq(0)
|
||||||
|
expect(source.reload.last_synced_at).to be_present
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'logs google drive path progress at first item and summary' do
|
||||||
|
entry = { id: 'file-1',
|
||||||
|
name: 'a.png',
|
||||||
|
mime_type: 'image/png',
|
||||||
|
relative_path: '素材/a.png',
|
||||||
|
sha256_checksum: 'sha-a',
|
||||||
|
web_view_link: 'https://drive.google.com/file/d/file-1/view',
|
||||||
|
web_content_link: nil }
|
||||||
|
logged = []
|
||||||
|
|
||||||
|
allow(GoogleDrive::ApiClient).to receive(:new).and_return(drive_client)
|
||||||
|
allow(drive_client).to receive(:each_material_file_under_folder) do |_folder_id, &block|
|
||||||
|
block.call(entry)
|
||||||
|
end
|
||||||
|
allow(MaterialSyncImporter).to receive(:import!)
|
||||||
|
.and_return(instance_double(MaterialSyncImporter::Result, action: :imported))
|
||||||
|
allow(Rails.logger).to receive(:info) { |message| logged << JSON.parse(message) }
|
||||||
|
|
||||||
|
described_class.new(source).sync!
|
||||||
|
|
||||||
|
progress_logs = logged.select { |row| row['folder_id'] == 'folder-123' }
|
||||||
|
expect(progress_logs.map { |row| row['progress'] }).to eq(['scan', 'summary'])
|
||||||
|
expect(progress_logs.last).to include(
|
||||||
|
'material_sync_source_id' => source.id,
|
||||||
|
'material_sync_source_name' => 'Drive source',
|
||||||
|
'scanned_count' => 1,
|
||||||
|
'imported' => 1,
|
||||||
|
'updated' => 0,
|
||||||
|
'unchanged' => 0,
|
||||||
|
'suppressed' => 0,
|
||||||
|
'failed' => 0)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -55,15 +55,16 @@ export const menuOutline = (
|
|||||||
visible: tagFlg },
|
visible: tagFlg },
|
||||||
{ name: '履歴', to: `/tags/changes?id=${ tag?.id }`,
|
{ name: '履歴', to: `/tags/changes?id=${ tag?.id }`,
|
||||||
visible: tagFlg && tag?.category !== 'nico' }] },
|
visible: tagFlg && tag?.category !== 'nico' }] },
|
||||||
{ name: '素材', to: '/materials', visible: false, subMenu: [
|
{ name: '素材', to: '/materials', visible: true, subMenu: [
|
||||||
{ name: '一覧', to: '/materials' },
|
{ name: '一覧', to: '/materials' },
|
||||||
{ name: '追加', to: '/materials/new' },
|
{ name: '追加', to: '/materials/new' },
|
||||||
|
{ name: '抑止', to: '/materials/suppressions' },
|
||||||
{ name: '全体履歴', to: '/materials/changes' },
|
{ name: '全体履歴', to: '/materials/changes' },
|
||||||
{ name: 'ヘルプ', to: '/wiki/ヘルプ:素材管理' },
|
{ name: 'ヘルプ', to: '/wiki/ヘルプ:素材管理' },
|
||||||
{ component: <Separator/>, visible: materialFlg },
|
{ component: <Separator/>, visible: materialFlg },
|
||||||
{ name: `広場 (${ postCount || 0 })`,
|
{ name: `広場 (${ postCount || 0 })`,
|
||||||
to: `/posts?tags=${ encodeURIComponent (material?.tag?.name ?? '') }`,
|
to: `/posts?tags=${ encodeURIComponent (material?.tag?.name ?? '') }`,
|
||||||
visible: materialFlg },
|
visible: materialFlg && Boolean (material?.tag) },
|
||||||
{ name: '履歴', to: `/materials/changes?material_id=${ material?.id }`,
|
{ name: '履歴', to: `/materials/changes?material_id=${ material?.id }`,
|
||||||
visible: materialFlg }] },
|
visible: materialFlg }] },
|
||||||
{ name: 'Wiki', to: '/wiki/ヘルプ:ホーム', base: '/wiki', subMenu: [
|
{ name: 'Wiki', to: '/wiki/ヘルプ:ホーム', base: '/wiki', subMenu: [
|
||||||
|
|||||||
@@ -127,17 +127,12 @@ const MaterialDetailPage: FC = () => {
|
|||||||
<audio src={material.file} controls/>)))}
|
<audio src={material.file} controls/>)))}
|
||||||
|
|
||||||
<TabGroup>
|
<TabGroup>
|
||||||
<Tab name="Wiki">
|
{material.tag && (
|
||||||
{material.tag
|
<Tab name="Wiki">
|
||||||
? (
|
|
||||||
<WikiBody
|
<WikiBody
|
||||||
title={material.tag.name}
|
title={material.tag.name}
|
||||||
body={material.wikiPageBody ?? undefined}/>)
|
body={material.wikiPageBody ?? undefined}/>
|
||||||
: (
|
</Tab>)}
|
||||||
<p className="text-stone-700 dark:text-stone-300">
|
|
||||||
タグ未設定の素材です.
|
|
||||||
</p>)}
|
|
||||||
</Tab>
|
|
||||||
|
|
||||||
<Tab name="編輯">
|
<Tab name="編輯">
|
||||||
<div className="max-w-wl space-y-4 pt-2">
|
<div className="max-w-wl space-y-4 pt-2">
|
||||||
|
|||||||
@@ -34,10 +34,6 @@ describe ('MaterialListPage', () => {
|
|||||||
)
|
)
|
||||||
})
|
})
|
||||||
expect (await screen.findByText ('素材はありません。')).toBeInTheDocument ()
|
expect (await screen.findByText ('素材はありません。')).toBeInTheDocument ()
|
||||||
expect (screen.getByRole ('link', { name: '新規素材を追加' })).toHaveAttribute (
|
|
||||||
'href',
|
|
||||||
'/materials/new',
|
|
||||||
)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('shows materials in the default card view', async () => {
|
it ('shows materials in the default card view', async () => {
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import FormField from '@/components/common/FormField'
|
|||||||
import PageTitle from '@/components/common/PageTitle'
|
import PageTitle from '@/components/common/PageTitle'
|
||||||
import Pagination from '@/components/common/Pagination'
|
import Pagination from '@/components/common/Pagination'
|
||||||
import MainArea from '@/components/layout/MainArea'
|
import MainArea from '@/components/layout/MainArea'
|
||||||
import { API_BASE_URL, SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { fetchMaterials, parseMaterialFilter } from '@/lib/materials'
|
import { fetchMaterials, parseMaterialFilter } from '@/lib/materials'
|
||||||
import { materialsKeys } from '@/lib/queryKeys'
|
import { materialsKeys } from '@/lib/queryKeys'
|
||||||
import { dateString, inputClass } from '@/lib/utils'
|
import { dateString, inputClass } from '@/lib/utils'
|
||||||
@@ -41,16 +41,16 @@ const MEDIA_FILTER_LABELS: Record<MaterialIndexMediaKind, string> = {
|
|||||||
video: '動画',
|
video: '動画',
|
||||||
audio: '音声',
|
audio: '音声',
|
||||||
file_other: 'その他ファイル',
|
file_other: 'その他ファイル',
|
||||||
url_only: 'URL のみ'}
|
url_only: '外部リンクのみ'}
|
||||||
|
|
||||||
const SORT_LABELS: Record<MaterialIndexSort, string> = {
|
const SORT_LABELS: Record<MaterialIndexSort, string> = {
|
||||||
created_at: '作成日時',
|
created_at: '作成日時',
|
||||||
updated_at: '更新日時',
|
updated_at: '更新日時',
|
||||||
tag_name: 'タグ名',
|
tag_name: 'タグ名',
|
||||||
media_kind: '種類',
|
media_kind: '種類',
|
||||||
file_byte_size: 'ファイルサイズ',
|
file_byte_size: '容量',
|
||||||
version_no: 'バージョン',
|
version_no: '版',
|
||||||
id: 'ID'}
|
id: 'Id.'}
|
||||||
|
|
||||||
|
|
||||||
const setIf = (qs: URLSearchParams, key: string, value: string | null) => {
|
const setIf = (qs: URLSearchParams, key: string, value: string | null) => {
|
||||||
@@ -118,7 +118,7 @@ const MaterialThumb: FC<{ material: Material }> = ({ material }) => (
|
|||||||
text-stone-900 shadow-sm dark:border-stone-700 dark:bg-stone-900
|
text-stone-900 shadow-sm dark:border-stone-700 dark:bg-stone-900
|
||||||
dark:text-stone-100`}>
|
dark:text-stone-100`}>
|
||||||
{material.thumbnail
|
{material.thumbnail
|
||||||
? <img src={material.thumbnail} alt="" className="h-full w-full object-contain"/>
|
? <img src={material.thumbnail} alt="" className="block h-full w-full object-cover"/>
|
||||||
: (
|
: (
|
||||||
<span
|
<span
|
||||||
className="px-2 text-2xl leading-tight"
|
className="px-2 text-2xl leading-tight"
|
||||||
@@ -409,21 +409,8 @@ const MaterialListPage: FC = () => {
|
|||||||
<div className="flex flex-wrap items-center justify-between gap-3">
|
<div className="flex flex-wrap items-center justify-between gap-3">
|
||||||
<PageTitle className="my-auto">素材管理</PageTitle>
|
<PageTitle className="my-auto">素材管理</PageTitle>
|
||||||
<div className="flex flex-wrap gap-2">
|
<div className="flex flex-wrap gap-2">
|
||||||
<PrefetchLink
|
{/* TODO: 局所出力を可能にする */}
|
||||||
to="/materials/new"
|
{/* <a
|
||||||
className="rounded-full border border-stone-300 bg-white px-4 py-2 text-sm
|
|
||||||
text-stone-900 hover:bg-stone-100 dark:border-stone-700
|
|
||||||
dark:bg-stone-900 dark:text-stone-100 dark:hover:bg-stone-800">
|
|
||||||
新規素材を追加
|
|
||||||
</PrefetchLink>
|
|
||||||
<PrefetchLink
|
|
||||||
to="/materials/suppressions"
|
|
||||||
className="rounded-full border border-stone-300 bg-white px-4 py-2 text-sm
|
|
||||||
text-stone-900 hover:bg-stone-100 dark:border-stone-700
|
|
||||||
dark:bg-stone-900 dark:text-stone-100 dark:hover:bg-stone-800">
|
|
||||||
同期元抑止
|
|
||||||
</PrefetchLink>
|
|
||||||
<a
|
|
||||||
href={`${ API_BASE_URL }/materials/download.zip?profile=legacy_drive`}
|
href={`${ API_BASE_URL }/materials/download.zip?profile=legacy_drive`}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
@@ -431,7 +418,7 @@ const MaterialListPage: FC = () => {
|
|||||||
text-stone-900 hover:bg-stone-100 dark:border-stone-700
|
text-stone-900 hover:bg-stone-100 dark:border-stone-700
|
||||||
dark:bg-stone-900 dark:text-stone-100 dark:hover:bg-stone-800">
|
dark:bg-stone-900 dark:text-stone-100 dark:hover:bg-stone-800">
|
||||||
ZIP をダウンロード
|
ZIP をダウンロード
|
||||||
</a>
|
</a> */}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -2,17 +2,13 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
|
|||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
import { Helmet } from 'react-helmet-async'
|
import { Helmet } from 'react-helmet-async'
|
||||||
|
|
||||||
import PrefetchLink from '@/components/PrefetchLink'
|
|
||||||
import FormField from '@/components/common/FormField'
|
import FormField from '@/components/common/FormField'
|
||||||
import PageTitle from '@/components/common/PageTitle'
|
import PageTitle from '@/components/common/PageTitle'
|
||||||
import MainArea from '@/components/layout/MainArea'
|
import MainArea from '@/components/layout/MainArea'
|
||||||
import { Button } from '@/components/ui/button'
|
import { Button } from '@/components/ui/button'
|
||||||
import { toast } from '@/components/ui/use-toast'
|
import { toast } from '@/components/ui/use-toast'
|
||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import {
|
import { createMaterialSyncSuppression, fetchMaterialSyncSuppressions } from '@/lib/materials'
|
||||||
createMaterialSyncSuppression,
|
|
||||||
fetchMaterialSyncSuppressions,
|
|
||||||
} from '@/lib/materials'
|
|
||||||
import { materialsKeys } from '@/lib/queryKeys'
|
import { materialsKeys } from '@/lib/queryKeys'
|
||||||
import { dateString, inputClass } from '@/lib/utils'
|
import { dateString, inputClass } from '@/lib/utils'
|
||||||
|
|
||||||
@@ -22,11 +18,11 @@ import type { MaterialSyncSuppressionSourceKind } from '@/types'
|
|||||||
|
|
||||||
const SOURCE_KIND_LABELS: Record<MaterialSyncSuppressionSourceKind, string> = {
|
const SOURCE_KIND_LABELS: Record<MaterialSyncSuppressionSourceKind, string> = {
|
||||||
uri: 'URI',
|
uri: 'URI',
|
||||||
google_drive_path: 'Google Drive path',
|
google_drive_path: 'Google Drive ファイル',
|
||||||
google_drive_path_prefix: 'Google Drive path prefix',
|
google_drive_path_prefix: 'Google Drive フォルダ',
|
||||||
google_drive_file: 'Google Drive file ID',
|
google_drive_file: 'Google Drive ファイル Id.',
|
||||||
legacy_drive_path: 'Legacy Drive path',
|
legacy_drive_path: '汎用ファイル',
|
||||||
legacy_drive_path_prefix: 'Legacy Drive path prefix'}
|
legacy_drive_path_prefix: '汎用フォルダ' }
|
||||||
|
|
||||||
const REASONS = [
|
const REASONS = [
|
||||||
'copyright_high_risk',
|
'copyright_high_risk',
|
||||||
@@ -36,7 +32,23 @@ const REASONS = [
|
|||||||
'malware_or_dangerous_file',
|
'malware_or_dangerous_file',
|
||||||
'duplicate_or_low_quality',
|
'duplicate_or_low_quality',
|
||||||
'source_owner_request',
|
'source_owner_request',
|
||||||
'other']
|
'other'] as const
|
||||||
|
|
||||||
|
type MaterialSyncSuppressionReason = typeof REASONS[number]
|
||||||
|
|
||||||
|
const REASON_NAMES: Record<MaterialSyncSuppressionReason, string> = {
|
||||||
|
['copyright_high_risk']: '著作権への懸念',
|
||||||
|
['copyright_takedown']: '著作者からの申出',
|
||||||
|
['adult_or_sensitive']: '成人向け',
|
||||||
|
['personal_information']: '個人情報',
|
||||||
|
['malware_or_dangerous_file']: '危険なソフトウェア',
|
||||||
|
['duplicate_or_low_quality']: '重複',
|
||||||
|
['source_owner_request']: '同期元管理者からの申出',
|
||||||
|
['other']: 'その他' } as const
|
||||||
|
|
||||||
|
|
||||||
|
const reasonName = (reason: string): string =>
|
||||||
|
REASON_NAMES[reason as MaterialSyncSuppressionReason] ?? reason
|
||||||
|
|
||||||
|
|
||||||
const MaterialSyncSuppressionsPage: FC = () => {
|
const MaterialSyncSuppressionsPage: FC = () => {
|
||||||
@@ -46,7 +58,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
|
|||||||
const [sourceUri, setSourceUri] = useState ('')
|
const [sourceUri, setSourceUri] = useState ('')
|
||||||
const [drivePath, setDrivePath] = useState ('')
|
const [drivePath, setDrivePath] = useState ('')
|
||||||
const [driveFileId, setDriveFileId] = useState ('')
|
const [driveFileId, setDriveFileId] = useState ('')
|
||||||
const [reason, setReason] = useState (REASONS[0])
|
const [reason, setReason] = useState<MaterialSyncSuppressionReason> (REASONS[0])
|
||||||
|
|
||||||
const { data, isError, isLoading } = useQuery ({
|
const { data, isError, isLoading } = useQuery ({
|
||||||
queryKey: materialsKeys.suppressions (),
|
queryKey: materialsKeys.suppressions (),
|
||||||
@@ -82,18 +94,11 @@ const MaterialSyncSuppressionsPage: FC = () => {
|
|||||||
return (
|
return (
|
||||||
<MainArea>
|
<MainArea>
|
||||||
<Helmet>
|
<Helmet>
|
||||||
<title>{`同期元抑止 | ${ SITE_TITLE }`}</title>
|
<title>{`素材同期抑止 | ${ SITE_TITLE }`}</title>
|
||||||
</Helmet>
|
</Helmet>
|
||||||
|
|
||||||
<div className="space-y-5">
|
<div className="space-y-5">
|
||||||
<div className="flex flex-wrap items-center justify-between gap-3">
|
<PageTitle>同期抑止</PageTitle>
|
||||||
<PageTitle>同期元抑止</PageTitle>
|
|
||||||
<PrefetchLink
|
|
||||||
to="/materials"
|
|
||||||
className="text-sm text-sky-700 underline underline-offset-2 dark:text-sky-300">
|
|
||||||
素材一覧へ戻る
|
|
||||||
</PrefetchLink>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<form
|
<form
|
||||||
onSubmit={handleSubmit}
|
onSubmit={handleSubmit}
|
||||||
@@ -115,7 +120,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
|
|||||||
</select>)}
|
</select>)}
|
||||||
</FormField>
|
</FormField>
|
||||||
|
|
||||||
<FormField label="Source URI">
|
<FormField label="同期元 URI">
|
||||||
{({ invalid }) => (
|
{({ invalid }) => (
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
@@ -124,7 +129,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
|
|||||||
className={inputClass (invalid)}/>)}
|
className={inputClass (invalid)}/>)}
|
||||||
</FormField>
|
</FormField>
|
||||||
|
|
||||||
<FormField label="Drive path">
|
<FormField label="Google Drive パス">
|
||||||
{({ invalid }) => (
|
{({ invalid }) => (
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
@@ -133,7 +138,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
|
|||||||
className={inputClass (invalid)}/>)}
|
className={inputClass (invalid)}/>)}
|
||||||
</FormField>
|
</FormField>
|
||||||
|
|
||||||
<FormField label="Drive file ID">
|
<FormField label="Google Drive ファイル Id.">
|
||||||
{({ invalid }) => (
|
{({ invalid }) => (
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
@@ -142,15 +147,15 @@ const MaterialSyncSuppressionsPage: FC = () => {
|
|||||||
className={inputClass (invalid)}/>)}
|
className={inputClass (invalid)}/>)}
|
||||||
</FormField>
|
</FormField>
|
||||||
|
|
||||||
<FormField label="理由">
|
<FormField label="事由">
|
||||||
{({ invalid }) => (
|
{({ invalid }) => (
|
||||||
<select
|
<select
|
||||||
value={reason}
|
value={reason}
|
||||||
onChange={e => setReason (e.target.value)}
|
onChange={e => setReason (e.target.value as MaterialSyncSuppressionReason)}
|
||||||
className={inputClass (invalid)}>
|
className={inputClass (invalid)}>
|
||||||
{REASONS.map (value => (
|
{REASONS.map (value => (
|
||||||
<option key={value} value={value}>
|
<option key={value} value={value}>
|
||||||
{value}
|
{REASON_NAMES[value]}
|
||||||
</option>))}
|
</option>))}
|
||||||
</select>)}
|
</select>)}
|
||||||
</FormField>
|
</FormField>
|
||||||
@@ -185,7 +190,8 @@ const MaterialSyncSuppressionsPage: FC = () => {
|
|||||||
{suppression.normalizedSourceKey}
|
{suppression.normalizedSourceKey}
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-2 text-sm text-stone-600 dark:text-stone-400">
|
<div className="mt-2 text-sm text-stone-600 dark:text-stone-400">
|
||||||
理由: {suppression.reason} / 登録: {dateString (suppression.createdAt)}
|
事由: {reasonName (suppression.reason)} /
|
||||||
|
登録: {dateString (suppression.createdAt)}
|
||||||
</div>
|
</div>
|
||||||
</article>))}
|
</article>))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
新しい課題から参照
ユーザをブロックする