Issue 2378 lang level feed config #2400

SumDonkuS · 2024-01-04T05:19:58Z

Sanity check:

Have you checked to ensure there aren't other open Pull Requests for the same update/change?

Code changes

Looking at issue 2378 and the related issue 2360, found that there were a few places that needed to check the LangaugeOptions. To handle the change for detecting the settings for feed_filename, the code has been switched to having this config be optional. This also allowed for switching back to the first implementation of the merge_field macro. generate_feed checks both the section for the default language as well as the global area for its config. If it exists in both places an error is thrown for the collision.

Are you doing the PR on the next branch?
Have you created/updated the relevant documentation page(s)?

No documentation change for this bug fix.

This is my first PR for this project. Please let me know if there is anything that I'm missing. Thank you again for the great project.

Keats · 2024-01-10T13:05:52Z

components/config/src/config/mod.rs

+                .feed_filename
+                .as_ref()
+                .map(|ff| path.ends_with(ff))
+                .unwrap_or_else(|| path.ends_with(DEFAULT_FEED_FILENAME))


I would maybe put that as a variable above so the condition is easier to read.

Good call. I have that one changed to keep the if statement more readable.

Keats · 2024-01-10T13:07:29Z

components/site/src/lib.rs

@@ -1022,6 +1029,19 @@ impl Site {
        Ok(())
    }

+    pub fn language_feed_filename(&self, lang: &str) -> String {


Can we not return &str?

Good call. Completely spaced that. Thank you for the heads up.

Keats · 2024-01-10T13:08:35Z

components/site/src/lib.rs

+                .config
+                .languages
+                .get(&self.config.default_language)
+                .map_or(false, |lang_opt| lang_opt.generate_feed)


looks like we do need better config querying based on a language like you did with language_feed_filename.
No need to change anything here, just thinking aloud

Let me know if the change I have is what you were thinking.

SumDonkuS · 2024-01-12T12:28:40Z

Thank you for catching those things for me. I'll keep a closer eye out for those in the future. Let me know if the modification to querying generate_feed from the config looks like what you were thinking. Thank you again.

Keats

I think it's ok. A bit iffy with Option but maybe it's fine

Keats · 2024-01-22T10:28:52Z

components/config/src/config/languages.rs

@@ -18,7 +18,7 @@ pub struct LanguageOptions {
    pub generate_feed: bool,
    /// The filename to use for feeds. Used to find the template, too.
    /// Defaults to "atom.xml", with "rss.xml" also having a template provided out of the box.


need to change the docstring no?

Keats · 2024-01-22T10:29:07Z

components/config/src/config/mod.rs

@@ -66,7 +67,7 @@ pub struct Config {
    pub feed_limit: Option<usize>,
    /// The filename to use for feeds. Used to find the template, too.
    /// Defaults to "atom.xml", with "rss.xml" also having a template provided out of the box.


SumDonkuS · 2024-01-27T17:43:37Z

Thank you for spotting those docs. They should now be modified to describe how the default values are handled.

Keats · 2024-05-27T19:03:12Z

Note: that PR conflicts with #2477, i'll have a look at rebasing it after 2477 is merged

Keats · 2024-06-19T12:58:08Z

The other PR has been merged, do you have time to rebase it or should i do it?

Keats · 2024-06-20T20:45:23Z

There seems to be more spots to fix than I thought. I'll release the next version of Zola first and get back to that after, otherwise I'm never going to do that release.

SumDonkuS · 2024-06-26T00:34:50Z

Sorry for the delay. Work pulled me away for a bit.

* Refine YAML date regex This commit does a few changes: - Introduce a new regex - it is a bit off-spec (it allows one-digit months and days in date-only mode) - uses named groups - avoids group duplication - parses offset once Fixes getzola#2538 * Fix nanosecond parsing * Rename variables for brewity * Add tests

Keats · 2024-07-01T21:19:55Z

I've put a tiny commit on the next branch: 4c5cc53 for some obvious issues.
Do you want to restart work on that PR? Probably better to start from scratch tbh

…generate feed for default language

…r default and other languages.

…lobal and default language block. Currently set to prefer the language level config.

… config.

SumDonkuS · 2024-07-02T04:10:30Z

Sorry. Missed your comment about starting fresh after rebasing. Let me know if you would like to start from scratch.

Keats · 2024-07-03T06:48:16Z

components/site/src/lib.rs

-            self.render_feeds(pages, Some(&PathBuf::from(code)), code, |c| c)?;
-            start = log_time(start, "Generated feed in other language");
-        }
+        self.render_all_feeds()?;


This name is not accurate since there are also section feeds. render_site_feeds?

Keats · 2024-07-03T06:51:04Z

components/site/src/lib.rs

+            let is_default_language = code == &self.config.default_language;
+
+            let skip_default_language_feed_generation =
+                is_default_language && !self.config.generate_feeds && !language.generate_feeds;


should that ambiguity be resolved when loading the config? Eg error if the value at the top level and in a default language level differs.
This way you can now just do something like self.config.languages.iter().filter(|x| x.generate_feeds) for the loop

Keats · 2024-07-03T06:52:09Z

components/site/src/lib.rs

@@ -1209,3 +1226,200 @@ fn log_time(start: Instant, message: &str) -> Instant {
    }
    now
 }
+
+#[cfg(test)]
+mod tests {


Can those be moved in the tests folders? This file is already long enough without tests

SumDonkuS mentioned this pull request Jan 4, 2024

"feed_filename for default language is specified twice" even though it's not #2378

Open

Keats reviewed Jan 10, 2024

View reviewed changes

SumDonkuS requested a review from Keats January 14, 2024 21:16

Keats reviewed Jan 22, 2024

View reviewed changes

SumDonkuS requested a review from Keats January 27, 2024 17:43

Keats force-pushed the next branch from 0a7cd61 to 17f8292 Compare June 21, 2024 09:01

Next version

67c2fe0

Keats force-pushed the next branch from 8b1a413 to 67c2fe0 Compare June 24, 2024 21:04

Keats mentioned this pull request Jul 1, 2024

Unable to generate RSS feed #2560

Closed

Fix some feed_filenames issues with multi languages

4c5cc53

Ignore Helix temp files

ede9423

SumDonkuS force-pushed the issue-2378-lang-level-feed-config branch from 0a65981 to 8d79d25 Compare July 2, 2024 01:44

SumDonkuS added 4 commits July 1, 2024 20:03

initial code changes to check language options for feed_filename and …

a61e528

…generate feed for default language

revert unneeded modifications for handling the generate feed logic fo…

096a72f

…r default and other languages.

Remove debugging print. Add test for generate_feeds defined in both g…

441df7e

…lobal and default language block. Currently set to prefer the language level config.

Fix comment. Remove debug println. Correct modification to serialized…

71da1d5

… config.

SumDonkuS force-pushed the issue-2378-lang-level-feed-config branch from f3c2fdd to 71da1d5 Compare July 2, 2024 02:06

SumDonkuS added 2 commits July 1, 2024 20:07

Fix comment

e68ec21

formatting fixes

a0d573a

Keats reviewed Jul 3, 2024

View reviewed changes

Keats force-pushed the next branch from 5adf8fb to ce10aae Compare August 15, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue 2378 lang level feed config #2400

Issue 2378 lang level feed config #2400

SumDonkuS commented Jan 4, 2024 •

edited

Loading

Keats Jan 10, 2024

SumDonkuS Jan 13, 2024

Keats Jan 10, 2024

SumDonkuS Jan 13, 2024

Keats Jan 10, 2024

SumDonkuS Jan 13, 2024

SumDonkuS commented Jan 12, 2024

Keats left a comment

Keats Jan 22, 2024

Keats Jan 22, 2024

SumDonkuS commented Jan 27, 2024

Keats commented May 27, 2024

Keats commented Jun 19, 2024

Keats commented Jun 20, 2024

SumDonkuS commented Jun 26, 2024

Keats commented Jul 1, 2024

SumDonkuS commented Jul 2, 2024

Keats Jul 3, 2024

Keats Jul 3, 2024

Keats Jul 3, 2024

Issue 2378 lang level feed config #2400

Are you sure you want to change the base?

Issue 2378 lang level feed config #2400

Conversation

SumDonkuS commented Jan 4, 2024 • edited Loading

Code changes

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SumDonkuS commented Jan 12, 2024

Keats left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SumDonkuS commented Jan 27, 2024

Keats commented May 27, 2024

Keats commented Jun 19, 2024

Keats commented Jun 20, 2024

SumDonkuS commented Jun 26, 2024

Keats commented Jul 1, 2024

SumDonkuS commented Jul 2, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SumDonkuS commented Jan 4, 2024 •

edited

Loading