From 0a950e769dda9b406edc8554c40237df756c16ff Mon Sep 17 00:00:00 2001 From: idk Date: Fri, 13 Jan 2023 07:37:02 +0000 Subject: [PATCH] fix metadata extraction issue which was keeping windows newsfeed from building correctly --- data/win/beta/entries.html | 31 +++++++++++++------------------ data/win/testing/entries.html | 35 +++++++++++++++++------------------ generate_news.py | 4 +++- 3 files changed, 33 insertions(+), 37 deletions(-) diff --git a/data/win/beta/entries.html b/data/win/beta/entries.html index 2b0cc14..a593879 100644 --- a/data/win/beta/entries.html +++ b/data/win/beta/entries.html @@ -34,7 +34,7 @@ As always it is recommended that you update to the latest version of the I2P router at your earliest convenient opportunity.

@@ -50,25 +50,20 @@ published="2022-11-23T01:00:00Z" updated="2022-11-23T01:00:00Z">
- -

-The I2P Easy-Install bundle for Windows has been released. -In this release, support has been added for most major browsers, including all major Firefox(Gecko) and Chromium forks. -Compatibility with external I2P Service installs and un-bundled I2P user installs has been improved. -The Easy-Install bundle can now detect other I2P routers and prompt the user to launch them instead, if they already have I2P. -The browser extensions have been updated to the latest versions. -The Easy-Install now has access to `i2p.plugins.firefox`'s usability mode via the `-usability` command-line flag. -The default mode is the "Strict" mode where Javascript is disabled by NoScript. -In usability mode, Javascript is restricted by JShelter. -For more details, see the profile manager repository at i2pgit.org. -

-

-It is recommended that you update to this release for the best security, privacy, and performance, and to help the network. -

- +The I2P Easy-Install bundle for Windows has been released.

- + In this release, support has been added for most major browsers, including all major Firefox(Gecko) and Chromium forks. + Compatibility with external I2P Service installs and un-bundled I2P user installs has been improved. + The Easy-Install bundle can now detect other I2P routers and prompt the user to launch them instead, if they already have I2P. + The browser extensions have been updated to the latest versions. + The Easy-Install now has access to `i2p.plugins.firefox`'s usability mode via the `-usability` command-line flag. + The default mode is the "Strict" mode where Javascript is disabled by NoScript. + In usability mode, Javascript is restricted by JShelter. + For more details, see the profile manager repository at i2pgit.org. +

+

+ It is recommended that you update to this release for the best security, privacy, and performance, and to help the network.

diff --git a/data/win/testing/entries.html b/data/win/testing/entries.html index febfdc8..6e5d9f0 100644 --- a/data/win/testing/entries.html +++ b/data/win/testing/entries.html @@ -8,7 +8,11 @@ published="2023-01-13T01:00:00Z" updated="2023-01-13T01:00:00Z">
-Windows Easy-Install Bundle 2.1.0 released to improve stability, performance. + +

+ Windows Easy-Install Bundle 2.1.0 released to improve stability, performance. +

+

The I2P Easy-Install bundle for Windows version 2.1.0 has been released. @@ -50,25 +54,20 @@ published="2022-11-23T01:00:00Z" updated="2022-11-23T01:00:00Z">

- -

-The I2P Easy-Install bundle for Windows has been released. -In this release, support has been added for most major browsers, including all major Firefox(Gecko) and Chromium forks. -Compatibility with external I2P Service installs and un-bundled I2P user installs has been improved. -The Easy-Install bundle can now detect other I2P routers and prompt the user to launch them instead, if they already have I2P. -The browser extensions have been updated to the latest versions. -The Easy-Install now has access to `i2p.plugins.firefox`'s usability mode via the `-usability` command-line flag. -The default mode is the "Strict" mode where Javascript is disabled by NoScript. -In usability mode, Javascript is restricted by JShelter. -For more details, see the profile manager repository at i2pgit.org. -

-

-It is recommended that you update to this release for the best security, privacy, and performance, and to help the network. -

- +The I2P Easy-Install bundle for Windows has been released.

- + In this release, support has been added for most major browsers, including all major Firefox(Gecko) and Chromium forks. + Compatibility with external I2P Service installs and un-bundled I2P user installs has been improved. + The Easy-Install bundle can now detect other I2P routers and prompt the user to launch them instead, if they already have I2P. + The browser extensions have been updated to the latest versions. + The Easy-Install now has access to `i2p.plugins.firefox`'s usability mode via the `-usability` command-line flag. + The default mode is the "Strict" mode where Javascript is disabled by NoScript. + In usability mode, Javascript is restricted by JShelter. + For more details, see the profile manager repository at i2pgit.org. +

+

+ It is recommended that you update to this release for the best security, privacy, and performance, and to help the network.

diff --git a/generate_news.py b/generate_news.py index 75d01de..910a512 100755 --- a/generate_news.py +++ b/generate_news.py @@ -88,7 +88,9 @@ def prepare_entries_file(fg, entries_file=None): def extract_entry_metadata(s): m = {k:v.strip('"') for k,v in re.findall(r'(\S+)=(".*?"|\S+)', s)} - m['summary'] = re.findall(r'(.*)', s)[0] + summary = re.findall(r'(.*)', s, re.DOTALL) + if len(summary) > 0: + m['summary'] = summary[0] return m def load_releases(fg):