#399

backend/app/services/post_creator.rb

@@ -73,11 +73,15 @@ class PostCreator
 
     sections.each_value do |ranges|
       ranges.each do |begin_ms, end_ms|
-        next if begin_ms < video_ms && (!end_ms || end_ms <= video_ms)
-
         post = Post.new
-        post.errors.add :video_ms, 'タグ区間が動画時間の範囲外です．'
-        raise ActiveRecord::RecordInvalid, post
+        if begin_ms >= video_ms
+          post.errors.add :video_ms, 'タグ区間の開始が動画時間以上です．'
+          raise ActiveRecord::RecordInvalid, post
+        end
+        if end_ms && end_ms > video_ms
+          post.errors.add :video_ms, 'タグ区間の終端が動画時間を超えてゐます．'
+          raise ActiveRecord::RecordInvalid, post
+        end
       end
     end
   end

backend/app/services/post_import_previewer.rb

@@ -16,8 +16,14 @@ class PostImportPreviewer
 
   def preview_rows rows:, fetch_metadata: true, metadata_cache: { }
     urls = {}
-    rows.map { |row|
-      preview_row(row, urls:, fetch_metadata:, metadata_cache:)
+    prepared_rows = rows.map { prepare_row(_1) }
+    existing_posts =
+        Post.where(url: prepared_rows.map { _1[:normal_url] }.compact.uniq).index_by(&:url)
+    prepared_rows.map { |row|
+      preview_row(row, urls:,
+                  fetch_metadata:,
+                  metadata_cache:,
+                  existing_posts:)
     }
   end
 
@@ -27,22 +33,30 @@ class PostImportPreviewer
 
   private
 
-  def preview_row row, urls:, fetch_metadata:, metadata_cache:
-    row = row.symbolize_keys
+  def prepare_row row
+    source = row.symbolize_keys
+    url = source[:url].to_s.strip
+    normal_url = normalised_url(url)
+    source.merge(url_text: url, normal_url:)
+  end
+
+  def preview_row row, urls:, fetch_metadata:, metadata_cache:, existing_posts:
     attributes = initial_attributes(row)
     provenance = initial_provenance(row)
     tag_sources = initial_tag_sources(row, attributes, provenance)
     field_warnings = initial_field_warnings(row)
     base_warnings = initial_base_warnings(row)
-    url = row[:url].to_s.strip
+    url = row[:url_text]
     provenance['url'] = 'manual'
-    normal_url = normalised_url(url)
+    normal_url = row[:normal_url]
     url_for_metadata = normal_url || url
-    existing_post = normal_url.present? ? Post.find_by(url: normal_url) : nil
+    existing_post = normal_url.present? ? existing_posts[normal_url] : nil
 
     validation_errors = {}
     validation_errors[:url] = ['URL が不正です．'] if normal_url.blank?
-    validation_errors[:url] = ['URL が重複しています．'] if normal_url.present? && urls.key?(normal_url)
+    if normal_url.present? && urls.key?(normal_url)
+      validation_errors[:url] = ['URL が重複しています．']
+    end
     urls[normal_url] = true if normal_url.present?
 
     if row[:metadata_url].present? && row[:metadata_url] != url_for_metadata
@@ -50,7 +64,7 @@ class PostImportPreviewer
       clear_fetch_warnings!(field_warnings)
     end
 
-    if normal_url.present? && existing_post
+    if validation_errors.blank? && normal_url.present? && existing_post
       add_field_warning!(field_warnings, 'url', EXISTING_SKIP_WARNING)
       attributes['tags'] = merged_tags(tag_sources, provenance['tags'])
       warnings_present = field_warnings.values.any?(&:present?) || base_warnings.present?
@@ -267,9 +281,14 @@ class PostImportPreviewer
     ids = raw.to_s.split.map { Integer(_1, exception: false) }
     return if ids.compact.empty? && raw.to_s.blank?
 
-    errors[:parent_post_ids] = ['親投稿 Id. が不正です．'] and return if ids.any? { _1.nil? || _1 <= 0 }
+    if ids.any? { _1.nil? || _1 <= 0 }
+      errors[:parent_post_ids] = ['親投稿 Id. が不正です．']
+      return
+    end
     if Post.where(id: ids).count != ids.uniq.length
       errors[:parent_post_ids] = ['存在しない親投稿 Id. があります．']
     end
   end
+
+  private :prepare_row
 end

backend/app/services/post_import_url_list_parser.rb

@@ -11,7 +11,9 @@ class PostImportUrlListParser
       url = line.strip
       next if url.blank?
 
-      raise ArgumentError, "#{ index + 1 } 行目: URL が長すぎます．" if url.bytesize > MAX_URL_BYTES
+      if url.bytesize > MAX_URL_BYTES
+        raise ArgumentError, "#{ index + 1 } 行目: URL が長すぎます．"
+      end
 
       { source_row: index + 1, url: }
     }

backend/app/services/post_metadata_fetcher.rb

@@ -1,4 +1,9 @@
 class PostMetadataFetcher
+  TIMESTAMP_PATTERN =
+      /\A(\d{4})-(\d{2})-(\d{2})T(\d{2})/ \
+      /(?::(\d{2})(?::(\d{2})(?:\.(\d+))?)?)?/ \
+      /(Z|[+-]\d{2}:?\d{2})?\z/
+
   def self.fetch raw_url
     uri, = Preview::UrlSafety.validate(raw_url)
     response = Preview::HttpFetcher.fetch(
@@ -37,25 +42,76 @@ class PostMetadataFetcher
     return nil if value.blank?
 
     raw = value.to_s.strip
-    from = Time.zone.parse(raw)
-    zone = '(?:Z|[+-]\d{2}:?\d{2})?'
-    before =
-      case raw
-      when /\A\d{4}\z/ then from + 1.year
-      when /\A\d{4}-\d{2}\z/ then from + 1.month
-      when /\A\d{4}-\d{2}-\d{2}\z/ then from + 1.day
-      when /\A\d{4}-\d{2}-\d{2}T\d{2}#{ zone }\z/ then from + 1.hour
-      when /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}#{ zone }\z/ then from + 1.minute
-      when /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}#{ zone }\z/ then from + 1.second
-      when /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.(\d+)#{ zone }\z/
-        from + (10**(-Regexp.last_match(1).length))
-      else
-        return nil
-      end
+    from, before =
+        case raw
+        when /\A(\d{4})\z/
+          year = Regexp.last_match(1).to_i
+          from = Time.zone.local(year, 1, 1)
+          [from, from + 1.year]
+        when /\A(\d{4})-(\d{2})\z/
+          year = Regexp.last_match(1).to_i
+          month = Regexp.last_match(2).to_i
+          from = Time.zone.local(year, month, 1)
+          [from, from + 1.month]
+        when /\A(\d{4})-(\d{2})-(\d{2})\z/
+          year = Regexp.last_match(1).to_i
+          month = Regexp.last_match(2).to_i
+          day = Regexp.last_match(3).to_i
+          from = Time.zone.local(year, month, day)
+          [from, from + 1.day]
+        else
+          parse_timestamp_range(raw)
+        end
+    return nil if from.nil? || before.nil?
+
     [from, before]
   rescue ArgumentError, TypeError
     nil
   end
 
-  private_class_method :platform_tags, :original_created_range
+  def self.parse_timestamp_range raw
+    match = raw.match(TIMESTAMP_PATTERN)
+    return nil unless match
+
+    year = match[1].to_i
+    month = match[2].to_i
+    day = match[3].to_i
+    hour = match[4].to_i
+    minute = match[5]&.to_i || 0
+    second = match[6]&.to_i || 0
+    fraction = match[7]
+    offset = parse_offset(match[8])
+    from = Time.new(year, month, day, hour, minute, second + fractional_seconds(fraction), offset)
+              .in_time_zone
+    before =
+        if fraction.present?
+          from + (10**(-fraction.length))
+        elsif match[6].present?
+          from + 1.second
+        elsif match[5].present?
+          from + 1.minute
+        else
+          from + 1.hour
+        end
+    [from, before]
+  end
+
+  def self.parse_offset value
+    return Time.zone.formatted_offset if value.blank?
+    return '+00:00' if value == 'Z'
+
+    value.match?(/\A[+-]\d{2}:\d{2}\z/) ? value : "#{ value[0, 3] }:#{ value[3, 2] }"
+  end
+
+  def self.fractional_seconds value
+    return 0 if value.blank?
+
+    Rational(value.to_i, 10**value.length)
+  end
+
+  private_class_method :platform_tags,
+                       :original_created_range,
+                       :parse_timestamp_range,
+                       :parse_offset,
+                       :fractional_seconds
 end

backend/app/services/preview/http_fetcher.rb

@@ -14,12 +14,8 @@ module Preview
 
     def self.fetch(raw_url,
                    max_bytes: DEFAULT_MAX_BYTES,
-                   redirects: MAX_REDIRECTS,
-                   allowed_hosts: nil)
+                   redirects: MAX_REDIRECTS)
       uri, addresses = UrlSafety.validate(raw_url)
-      if allowed_hosts && !allowed_hosts.include?(uri.host.downcase)
-        raise FetchFailed, '許可されてゐない redirect 先です．'
-      end
       response = request(uri, addresses.first, max_bytes)
 
       if response.is_a?(Net::HTTPRedirection)
@@ -56,7 +52,7 @@ module Preview
               raise FetchFailed, 'redirect 先が不正です．'
             end
 
-        return fetch(redirect_url, max_bytes:, redirects: redirects - 1, allowed_hosts:)
+        return fetch(redirect_url, max_bytes:, redirects: redirects - 1)
       end
 
       unless response.is_a?(Net::HTTPSuccess)