From 1dccb10a450c5cf905c4df6e2eaf033c1fd307e0 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 16 Jun 2025 15:44:24 -0600 Subject: [PATCH 01/11] Give a readout on how long the photos page took to get loaded. --- run.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/run.sh b/run.sh index 2790b0c..e8b23f2 100755 --- a/run.sh +++ b/run.sh @@ -99,6 +99,7 @@ find files/photos/ -name "*".html -print -delete http_code=0 port="${ports%% *}" photos_uri=":$port/photos/" + beg_time="$SECONDS" while [[ $http_code != "200" ]]; do log "Sleeping for '$count' while waiting for $photos_uri to come up." sleep $count @@ -112,7 +113,9 @@ find files/photos/ -name "*".html -print -delete count=$(( count + 1 )) fi done - log "Finished checking for /photos/." + end_time="$SECONDS" + time="$(( $end_time - $beg_time ))" + log "Finished checking for /photos/ after $time seconds." } & ## Main ## From f090607f6700ecc21fb8c73741d17ad34b769300 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 16 Jun 2025 15:52:20 -0600 Subject: [PATCH 02/11] Add build time to end of the page comments. --- pages/photos.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pages/photos.sh b/pages/photos.sh index 2924752..eb5746c 100755 --- a/pages/photos.sh +++ b/pages/photos.sh @@ -291,10 +291,16 @@ function build_all_page { } ## Main ## +beg_time="$SECONDS" + start_main_page build_album_pages build_all_page end_main_page +end_time="$SECONDS" +time="$(( $end_time - $beg_time ))" +echo "" >> $mainpage + cat $mainpage exit 0 From afac80d5438a3cb4754c14d96ad26eadb73919b4 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 16 Jun 2025 15:57:34 -0600 Subject: [PATCH 03/11] Add single quotes around variable output for consistency. --- run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.sh b/run.sh index e8b23f2..ff8cab8 100755 --- a/run.sh +++ b/run.sh @@ -115,7 +115,7 @@ find files/photos/ -name "*".html -print -delete done end_time="$SECONDS" time="$(( $end_time - $beg_time ))" - log "Finished checking for /photos/ after $time seconds." + log "Finished checking for /photos/ after '$time' seconds." } & ## Main ## From d673eb2f6a67727a4f5c999441af8b5076c1004c Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 16 Jun 2025 16:00:46 -0600 Subject: [PATCH 04/11] Fix unquoted values resulting in unclosed tag. --- pages/photos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/photos.sh b/pages/photos.sh index eb5746c..a46ca42 100755 --- a/pages/photos.sh +++ b/pages/photos.sh @@ -249,7 +249,7 @@ function build_all_page { count=0 fi if [[ $count == 0 ]]; then - echo -e "\t\t
" >> $allpage + echo -e "\t\t
" >> $allpage fi # Add a column. From ee367f9b3f187a680b857473ef2f5aa1fc416fb2 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 16 Jun 2025 16:03:01 -0600 Subject: [PATCH 05/11] Close the previous row before creating a new one! :) --- pages/photos.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/photos.sh b/pages/photos.sh index a46ca42..dcc8e5a 100755 --- a/pages/photos.sh +++ b/pages/photos.sh @@ -249,6 +249,7 @@ function build_all_page { count=0 fi if [[ $count == 0 ]]; then + echo -e "\t\t
" >> $allpage echo -e "\t\t
" >> $allpage fi From d80953328093e069d345c770348336ab78754e45 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 16 Jun 2025 16:36:20 -0600 Subject: [PATCH 06/11] Ensure row divs are not double-closed. --- pages/photos.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pages/photos.sh b/pages/photos.sh index dcc8e5a..6e87a93 100755 --- a/pages/photos.sh +++ b/pages/photos.sh @@ -131,13 +131,15 @@ function build_album_pages { fi ## Put in the subpage HTML ## - # Set the count if this is the first loop. + new_row="\t\t
" + # Set the count and start a row if this is the first loop. if [[ -z $count ]]; then count=0 - fi - # Add a row for the next 2 images. - if (( $count % 2 == 0 )); then - echo -e "\t\t
" >> $subpage + echo -e "$newrow" >> $subpage + # Else check if we need to start a new one for the next 2 images. + elif (( $count % 2 == 0 )); then + echo -e "\t\t
" >> $subpage + echo -e "$newrow" >> $subpage fi # Add the container for the image and its text. echo -e "\t\t\t
" >> $subpage @@ -160,10 +162,6 @@ function build_album_pages { fi # Close the image description and its link. echo -e "

\n\t\t\t\t\n\t\t\t
" >> $subpage - # Close the row after an odd count. - if (( $count % 2 == 1 )); then - echo -e "\t\t
" >> $subpage - fi count=$(( count + 1 )) done echo -e "\t\t
" >> $subpage From efbc9fc6dbc8ffe805e898938674c2aa6bbc242b Mon Sep 17 00:00:00 2001 From: Hyperling Date: Sun, 20 Jul 2025 16:22:26 -0700 Subject: [PATCH 07/11] Add a section on how to properly use Obtainium with my Gitea server. --- pages/subpages/home/apps.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pages/subpages/home/apps.php b/pages/subpages/home/apps.php index ac0ae35..4b5b0b1 100755 --- a/pages/subpages/home/apps.php +++ b/pages/subpages/home/apps.php @@ -207,6 +207,28 @@
+
+

Obtainium Configuration

+
+ +
+
+

+ In order to have the correct version numbers in Obtainium: +

+
    +
  • Enable "Sort by only the last segment of the link".
    • +
  • + Set the "Version string extraction RegEx" field to: + [0-9\.]+[0-9]+ +
    • +
+

+ Otherwise, "Take first link" works with pseudo versions. +

+
+
+

Other Programs

From 68fb297cb0d7beb5db22478b12112891ddccf496 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Sun, 3 Aug 2025 14:41:52 -0700 Subject: [PATCH 08/11] Reference a new Book Recommendation page on the Lists page. --- pages/lists.php | 59 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/pages/lists.php b/pages/lists.php index ec87496..6352be1 100755 --- a/pages/lists.php +++ b/pages/lists.php @@ -12,25 +12,54 @@

Lists

-
-

Gear

-

Apps

- - -
+ +
+

+ + Books + +

+

- Gear that I find critical to my life. + TBD/TODO: Berk page description goes here!

- -
- - -

- Apps that I use frequently on a degoogled Android phone. + Another line fortesting. +

+

+ Yet another line fortesting. +

+
+
+ + +
+

+ + Apps (Repo TBD/TODO) + +

+
+

+ Obtaiumiun config for apps that I use on a degoogled Android phone. +

+
+
+ + +
+

+ + Gear + +

+
+

+ Important gear I recommend.

From 70774266104ba335f0f8d1f0494d44f65bedc55f Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 12 Aug 2025 05:46:07 -0700 Subject: [PATCH 09/11] Change to just use one page after all. --- pages/{lists.php => resources.php} | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) rename pages/{lists.php => resources.php} (73%) diff --git a/pages/lists.php b/pages/resources.php similarity index 73% rename from pages/lists.php rename to pages/resources.php index 6352be1..832f821 100755 --- a/pages/lists.php +++ b/pages/resources.php @@ -4,26 +4,23 @@ -->
-

Lists

+

Lists of Resources

- - Books - + Books

- TBD/TODO: Berk page description goes here! + TBD/TODO: Berk list description goes here!

Another line fortesting. @@ -31,6 +28,17 @@

Yet another line fortesting.

+
    +
  • + The Peaceful Warrior +
    • +
  • + TBD: Name of book on healing through breathing and posture. +
    • +
  • + The Untethered Soul / Living Untethered +
    • +
@@ -52,10 +60,7 @@

- - Gear - + Gear

From 98e52e68331c56e27609ba79796d633c5b6a26ae Mon Sep 17 00:00:00 2001 From: Hyperling Date: Fri, 19 Sep 2025 13:07:26 -0700 Subject: [PATCH 10/11] Add SEO type tags. --- pages/helpers/header.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pages/helpers/header.php b/pages/helpers/header.php index 4f2350b..1d57e9b 100755 --- a/pages/helpers/header.php +++ b/pages/helpers/header.php @@ -29,4 +29,17 @@ + + + + + + + + + + + + + From e5542ed8bb4ab72a534e6bd659929c822e34727e Mon Sep 17 00:00:00 2001 From: Hyperling Date: Fri, 19 Sep 2025 13:21:36 -0700 Subject: [PATCH 11/11] Fix typo, --w was not getting recognized. --- run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.sh b/run.sh index 2790b0c..d3a145b 100755 --- a/run.sh +++ b/run.sh @@ -103,7 +103,7 @@ find files/photos/ -name "*".html -print -delete log "Sleeping for '$count' while waiting for $photos_uri to come up." sleep $count log "Checking if $photos_uri is available." - http_code="`curl --silent --fail --w '\n%{http_code}' localhost$photos_uri | tail -n 1`" + http_code="`curl --silent --fail -w '\n%{http_code}' localhost$photos_uri | tail -n 1`" log "Check for $photos_uri responded with '$http_code'." if (( $count >= 10 )); then log "Giving up on loading $photos_uri after '$count' attempts."