commit 59a14853ba375e11cc7004b8a53f62c2e985c5d2
parent 0558ba7bc6139caa1fa2b94f9a93dc5c00dff347
Author: Natalie Pendragon <natpen@natpen.net>
Date: Sun, 6 Dec 2020 11:28:56 -0500
Refactor change frequency constants
Put the increments in the constants file, and standardize naming.
Diffstat:
2 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/gus/constants.py b/gus/constants.py
@@ -8,11 +8,26 @@ MAXIMUM_REDIRECT_CHAIN_LENGTH = 5
MAXIMUM_TEXT_PAGE_SIZE = 100000 # 100KB, in bytes
# default change frequencies (in hours)
-DEFAULT_ROOT_CHANGE_FREQUENCY = 3
-DEFAULT_NON_ROOT_CHANGE_FREQUENCY = 24 * 7
-DEFAULT_REDIRECT_CHANGE_FREQUENCY = 24 * 7
-DEFAULT_BINARY_CHANGE_FREQUENCY = 24 * 30
-DEFAULT_PROMPT_CHANGE_FREQUENCY = 24 * 30
-DEFAULT_PIKKULOG_CHANGE_FREQUENCY = 3
-DEFAULT_TEMP_ERROR_CHANGE_FREQUENCY = 24
-DEFAULT_PERM_ERROR_CHANGE_FREQUENCY = 24 * 30 * 3
+ROOT_CHANGE_FREQUENCY_DEFAULT = 3
+ROOT_CHANGE_FREQUENCY_INCREMENT = 1
+
+NON_ROOT_CHANGE_FREQUENCY_DEFAULT = 24 * 7
+NON_ROOT_CHANGE_FREQUENCY_INCREMENT = 24 * 3
+
+REDIRECT_CHANGE_FREQUENCY_DEFAULT = 24 * 7
+REDIRECT_CHANGE_FREQUENCY_INCREMENT = 24 * 2
+
+BINARY_CHANGE_FREQUENCY_DEFAULT = 24 * 30
+BINARY_CHANGE_FREQUENCY_INCREMENT = 24 * 7
+
+PROMPT_CHANGE_FREQUENCY_DEFAULT = 24 * 30
+PROMPT_CHANGE_FREQUENCY_INCREMENT = 24 * 7
+
+PIKKULOG_CHANGE_FREQUENCY_DEFAULT = 3
+PIKKULOG_CHANGE_FREQUENCY_INCREMENT = 6
+
+TEMP_ERROR_CHANGE_FREQUENCY_DEFAULT = 24
+TEMP_ERROR_CHANGE_FREQUENCY_INCREMENT = 24 * 3
+
+PERM_ERROR_CHANGE_FREQUENCY_DEFAULT = 24 * 30 * 3
+PERM_ERROR_CHANGE_FREQUENCY_INCREMENT = 24 * 30
diff --git a/gus/lib/gemini.py b/gus/lib/gemini.py
@@ -317,21 +317,21 @@ class GeminiResource:
if self._default_change_frequency is None:
if category == "content":
if self.is_root_like or self.is_log_root_like:
- change_frequency = constants.DEFAULT_ROOT_CHANGE_FREQUENCY
+ change_frequency = constants.ROOT_CHANGE_FREQUENCY_DEFAULT
elif self.is_pikkulog_like:
- change_frequency = constants.DEFAULT_PIKKULOG_CHANGE_FREQUENCY
+ change_frequency = constants.PIKKULOG_CHANGE_FREQUENCY_DEFAULT
else:
- change_frequency = constants.DEFAULT_NON_ROOT_CHANGE_FREQUENCY
+ change_frequency = constants.NON_ROOT_CHANGE_FREQUENCY_DEFAULT
elif category == "binary":
- change_frequency = constants.DEFAULT_BINARY_CHANGE_FREQUENCY
+ change_frequency = constants.BINARY_CHANGE_FREQUENCY_DEFAULT
elif category == "redirect":
- change_frequency = constants.DEFAULT_REDIRECT_CHANGE_FREQUENCY
+ change_frequency = constants.REDIRECT_CHANGE_FREQUENCY_DEFAULT
elif category == "temp_error":
- change_frequency = constants.DEFAULT_TEMP_ERROR_CHANGE_FREQUENCY
+ change_frequency = constants.TEMP_ERROR_CHANGE_FREQUENCY_DEFAULT
elif category == "perm_error":
- change_frequency = constants.DEFAULT_PERM_ERROR_CHANGE_FREQUENCY
+ change_frequency = constants.PERM_ERROR_CHANGE_FREQUENCY_DEFAULT
elif category == "prompt":
- change_frequency = constants.DEFAULT_PROMPT_CHANGE_FREQUENCY
+ change_frequency = constants.PROMPT_CHANGE_FREQUENCY_DEFAULT
else:
raise Exception.NameError("Unrecognized resource category")
@@ -341,21 +341,21 @@ class GeminiResource:
def increment_change_frequency(self, existing_change_frequency, category):
if category == "content":
if self.is_root_like or self.is_log_root_like:
- return existing_change_frequency
+ return existing_change_frequency + constants.ROOT_CHANGE_FREQUENCY_INCREMENT
elif self.is_pikkulog_like:
- return existing_change_frequency + 6
+ return existing_change_frequency + constants.PIKKULOG_CHANGE_FREQUENCY_INCREMENT
else:
- return existing_change_frequency + 24 * 3
+ return existing_change_frequency + constants.NON_ROOT_CHANGE_FREQUENCY_INCREMENT
elif category == "binary":
- return existing_change_frequency + 24 * 7
+ return existing_change_frequency + constants.BINARY_CHANGE_FREQUENCY_INCREMENT
elif category == "redirect":
- return existing_change_frequency + 24 * 2
+ return existing_change_frequency + constants.REDIRECT_CHANGE_FREQUENCY_INCREMENT
elif category == "temp_error":
- return existing_change_frequency + 24 * 3
+ return existing_change_frequency + constants.TEMP_ERROR_CHANGE_FREQUENCY_INCREMENT
elif category == "perm_error":
- return existing_change_frequency + 24 * 30
+ return existing_change_frequency + constants.PERM_ERROR_CHANGE_FREQUENCY_INCREMENT
elif category == "prompt":
- return existing_change_frequency + 24 * 7
+ return existing_change_frequency + constants.PROMPT_CHANGE_FREQUENCY_INCREMENT
else:
raise Exception.NameError("Unrecognized resource category")