Move submission_url into the simple definition

Allows you to view files of scrapers that were removed
Earlopain · Oct 11, 2023 · c505ed3 · c505ed3
1 parent 84ee8dc
commit c505ed3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/app/logical/sites/scraper_definition.rb b/app/logical/sites/scraper_definition.rb
@@ -2,23 +2,11 @@
 
 module Sites
   class ScraperDefinition < SimpleDefinition
-    attr_reader :submission_template
-
     def initialize(definition_data)
       super
-      @submission_template = Addressable::Template.new(definition_data["submission_template"])
-      @image_domains = definition_data["image_domains"] || []
-      @download_headers = definition_data["download_headers"] || {}
       @scraper = "Scraper::#{site_type.camelize}".constantize
     end
 
-    def submission_url(submission)
-      submission_template.expand(
-        site_artist_identifier: submission.artist_url.url_identifier,
-        site_submission_identifier: submission.identifier_on_site,
-      ).to_s
-    end
-
     def missing_config_keys
       @scraper.required_config_keys.select { |key| Config.send(key).blank? }
     end

diff --git a/app/logical/sites/simple_definition.rb b/app/logical/sites/simple_definition.rb
@@ -10,8 +10,9 @@ def initialize(definition_data)
       @homepage = definition_data["homepage"]
       @gallery_templates = definition_data["gallery_templates"].map { |t| Addressable::Template.new("{prefix}#{t}{/remaining}{?remaining}{#remaining}") }
       @username_identifier_regex = Regexp.new("^#{definition_data['username_identifier_regex']}$")
-      @image_domains = []
-      @download_headers = {}
+      @submission_template = Addressable::Template.new(definition_data["submission_template"]) if definition_data["submission_template"]
+      @image_domains = definition_data["image_domains"] || []
+      @download_headers = definition_data["download_headers"] || {}
     end
 
     def match_for_gallery(uri)
@@ -35,6 +36,13 @@ def gallery_url(identifier)
       "https://#{gallery_templates.first.expand(site_artist_identifier: identifier)}"
     end
 
+    def submission_url(submission)
+      @submission_template.expand(
+        site_artist_identifier: submission.artist_url.url_identifier,
+        site_submission_identifier: submission.identifier_on_site,
+      ).to_s
+    end
+
     def missing_config_keys
       []
     end