From b1363a5be08d77f36b24531c2991151082181cde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tr=C3=A9meur?= Date: Fri, 11 Oct 2024 19:58:09 +0100 Subject: [PATCH 01/10] Tweak wording on comments index --- commentpage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commentpage.py b/commentpage.py index eccb595..4a28258 100644 --- a/commentpage.py +++ b/commentpage.py @@ -162,7 +162,7 @@ def commentindex(local=False): # write header headerfooter.headerwrite("build/comments/index.html","Comments","Comments","",False,local) filewrite = open("build/comments/index.html", "a") - filewrite.write("

Comments I receive are archived on this site and linked back to the original. If you don’t want your comments from other sources archived here, or if you require any changes to the presentation of your comments, please email me. Please note, however, that this website is not indexed by search engines and I don’t “advertise” it on mainstream social media.

\n

You can leave comments on the relevant comment pages for each fic (where this is enabled). If you’d like notification of any reply, please leave your email address. If you’d like a link from your pseudonym to a website, you can supply this as well. I’ll happily link to personal websites, Dreamwidth profiles, and (at least for now) AO3 profiles; I’m unlikely to include links to for-profit social media websites, Carrd, or Patreon.

\n

Comments are turned off on any fic over two years old unless it’s in a Final Fantasy fandom.

\n") + filewrite.write("

Comments I receive are archived on this site and linked back to the original. If you don’t want your comments from other sources archived here, or if you require any changes to the presentation of your comments, please email me. Please note, however, that this website is not indexed by search engines.

\n

If you don’t have JavaScript switched off, you can leave comments on the relevant comment pages for each fic (where this is enabled). Please leave your email address if you’d like notification of any reply. If you’d like a link from your pseudonym to a website, you can supply this as well, although I reserve the right not to link to certain advertising/tracker-heavy websites.

\n

Comments are turned off on some older fics.

\n") filewrite.close() headerfooter.footerwrite("build/comments/index.html",False,local) From 645343541088f2ac023c191b469c5018c8c88618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tr=C3=A9meur?= Date: Fri, 18 Oct 2024 23:42:13 +0100 Subject: [PATCH 02/10] Account for #ficwip events --- makeheader.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/makeheader.py b/makeheader.py index 4174a60..1c61adb 100644 --- a/makeheader.py +++ b/makeheader.py @@ -509,6 +509,8 @@ def ficgen(ficno,unique=False,output="output.html",local=False,single=False): pass elif fileread.eventname == "robotsoup": filewrite.write("Written for \"[personalkalloway’s " + fileread.eventdeets + " fest.") + elif fileread.eventname == "#ficwip": + filewrite.write("Written for the #ficwip event " + fileread.eventdeets + ".") try: if fileread.notes: filewrite.write(" ") From fafbbc80f5e7f5ca11499d1ad7ab09dda3d73df3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tr=C3=A9meur?= Date: Tue, 22 Oct 2024 12:32:32 +0100 Subject: [PATCH 03/10] Refine ficwip inclusion --- makeheader.py | 5 ++++- statsgen.py | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/makeheader.py b/makeheader.py index 1c61adb..36482ba 100644 --- a/makeheader.py +++ b/makeheader.py @@ -510,7 +510,10 @@ def ficgen(ficno,unique=False,output="output.html",local=False,single=False): elif fileread.eventname == "robotsoup": filewrite.write("Written for \"[personalkalloway’s " + fileread.eventdeets + " fest.") elif fileread.eventname == "#ficwip": - filewrite.write("Written for the #ficwip event " + fileread.eventdeets + ".") + filewrite.write("Written for the #ficwip event " + fileread.eventdeets + "") + if fileread.event == "prompt": + filewrite.write(", in response to prompt, " + fileread.prompt + "") + filewrite.write(".") try: if fileread.notes: filewrite.write(" ") diff --git a/statsgen.py b/statsgen.py index 1f743d8..7539e0b 100644 --- a/statsgen.py +++ b/statsgen.py @@ -481,6 +481,8 @@ def yeargen(local=False): filewrite.write("\"[personal" + (event["eventname"]).replace("-","_")+ "") elif event["eventlocation"] == "ljjournal": filewrite.write("\"[personal" + (event["eventname"]).replace("-","_")+ "") + elif event["eventname"] == "#ficwip": + filewrite.write("#ficwip") else: filewrite.write(event["eventname"]) filewrite.write("\n" + str(event["words"]) + "" + str(len(event["ficno"])) + " fic") From 2c2244e401a7cfa5746f296a901468cd4266c5c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tr=C3=A9meur?= Date: Thu, 21 Nov 2024 23:04:11 +0000 Subject: [PATCH 04/10] Change webhook destination --- commentpage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commentpage.py b/commentpage.py index 4a28258..519bd57 100644 --- a/commentpage.py +++ b/commentpage.py @@ -119,7 +119,7 @@ def commentpage(ficno,directory,local=False): except: pass if fffandom or timeelapsed.days < 730: - filewrite.write("\n") + filewrite.write("\n") filewrite.close() headerfooter.footerwrite(commentspath + "/index.html",False,local) From c075c2f0f71ddf4d572d06fcf3456c0b3fe82824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tr=C3=A9meur?= Date: Fri, 22 Nov 2024 13:40:05 +0000 Subject: [PATCH 05/10] Set max length for comments --- commentpage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commentpage.py b/commentpage.py index 519bd57..b2caa95 100644 --- a/commentpage.py +++ b/commentpage.py @@ -65,7 +65,7 @@ def commentpage(ficno,directory,local=False): headerfooter.headerwrite(commentspath + "/index.html","Comments for fic no. " + ficnostring,"Comments for fic no. " + ficnostring + "","",False,local) filewrite = open(commentspath + "/index.html", "a") if fffandom or timeelapsed.days < 730: - filewrite.write("

Leave a comment

\n\n

Comments will be posted manually; please expect a delay between submitting your comment and seeing it below!

\n
\n\n\n\n\n\n
\n") + filewrite.write("

Leave a comment

\n\n

Comments will be posted manually; please expect a delay between submitting your comment and seeing it below!

\n
\n\n\n\n\n\n
\n") else: try: if fileread.event == "ao3exchange" and (fileread.datewords[0])["date"].year > 2019: From e43cf71ba57e67c95dff5104e10332080223d799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tr=C3=A9meur?= Date: Mon, 2 Dec 2024 21:11:32 +0000 Subject: [PATCH 06/10] No need to have JS that just prints JS now is there lads --- indexgen.py | 2 +- verifygen.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indexgen.py b/indexgen.py index 0db08cd..f71da44 100644 --- a/indexgen.py +++ b/indexgen.py @@ -96,7 +96,7 @@ def indexgen(local=False): filewrite.write("events/index.html") else: filewrite.write("/fic/events") - filewrite.write("\">Events\n

Since 2020 I’ve participated in some fandom exchanges and other events. Many of my more recent fics are in this category.

\n\n
\n

Other

\n
    \n
  • Stats by year: " + (str(statslist(local))) + "
    • \n
\n
\n
\n\n
\n") + filewrite.write("\">Events\n

Since 2020 I’ve participated in some fandom exchanges and other events. Many of my more recent fics are in this category.

\n\n
\n

Other

\n
    \n
  • Stats by year: " + (str(statslist(local))) + "
    • \n
\n
\n
\n\n
\n") filewrite.close() headerfooter.footerwrite("build/index.html",True,local) diff --git a/verifygen.py b/verifygen.py index 9ba6951..5a7bfaf 100644 --- a/verifygen.py +++ b/verifygen.py @@ -9,7 +9,7 @@ def verifygen(local=False): # write header headerfooter.headerwrite("build/verify/index.html","Tré’s fic archive","Warning","",True,local) filewrite = open("build/verify/index.html", "a") - filewrite.write("

Please note before proceeding:

\n

Some of my fanfiction is NSFW (ranging from slightly obscene language to explicit sex scenes), some is RPF, and some of it contains mature or potentially objectionable themes (death, suicide, mental illness, incest …). Ratings and warnings are given accordingly, don’t like don’t read. If you consider yourself to be a minor, kindly gtfo and read some real literature instead. Honestly, it will be much more edifying.

\n\n\n\n
\n\n
\n\n\n\n\n\n\n\n\n") + footer.write("verify/index.html?returnto=${window.location}`; }\n\n\n") footer.close() diff --git a/indexgen.py b/indexgen.py index f71da44..c8a245e 100644 --- a/indexgen.py +++ b/indexgen.py @@ -58,7 +58,7 @@ def indexgen(local=False): # write header headerfooter.headerwrite("build/index.html","Tré’s fic archive","Tré’s fic archive","",True,local) filewrite = open("build/index.html", "a") - filewrite.write("

Here is all my fanfiction! Some of it is also syndicated elsewhere, but this site is the canonical location for everything I’ve written.

\n

Transformative works policy: The contents of these pages are licensed under CC BY-NC 4.0. \"\"\"\"\"\" In other words, transformative works are permitted as long as there is a clearly visible hyperlink to the original and no financial transactions are involved.

\n

The code for this archive is available here. Commenting is switched on for most fics written at least semi-recently – read about that Here is all my fanfiction! Some of it is also syndicated elsewhere, but this site is the canonical location for everything I’ve written.

\n

Transformative works policy: The contents of these pages are licensed under CC BY-NC 4.0. \"\"\"\"\"\" In other words, transformative works are permitted as long as there is a clearly visible hyperlink to the original and no financial transactions are involved.

\n

The code for this archive is available here. Commenting is switched on for most fics written at least semi-recently – read about that \n") # write html link if there is one if fileread.html: - filewrite.write("

  • HTML
    • \n") # write pdf link if there is one if fileread.pdf: - filewrite.write("
  • PDF
    • \n") # write epub link if there is one if fileread.epub: - filewrite.write("
  • \n") # write html link if there is one if fileread.html: - filewrite.write("
  • HTML
    • \n") # write pdf link if there is one if fileread.pdf: - filewrite.write("
  • PDF
    • \n") # write epub link if there is one if fileread.epub: - filewrite.write("
  • AO3
    • \n") @@ -325,6 +325,8 @@ def ficgen(ficno,unique=False,output="output.html",local=False,single=False): pass if fileread.status == "abandoned": filewrite.write(" (abandoned)") + elif fileread.status == "incomplete": + filewrite.write(" (in progress)") filewrite.write("\n
    \n
    \n\n") + filewrite.write("

    \n\n\n") filewrite.close() if __name__ == "__main__": From 8ddca86ff0e1c4e17b755a455be55830a5c4f536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tr=C3=A9meur?= Date: Sun, 23 Feb 2025 00:19:50 +0000 Subject: [PATCH 09/10] renaming myself, wording tweaks --- commentpage.py | 4 ++-- feed.py | 2 +- headerfooter.py | 2 +- indexgen.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/commentpage.py b/commentpage.py index b2caa95..0be603a 100644 --- a/commentpage.py +++ b/commentpage.py @@ -74,7 +74,7 @@ def commentpage(ficno,directory,local=False): pass try: if fileread.comments: - filewrite.write("

    Archived comments

    \n

    If you left one of these comments and would like it to be removed from the archive, please email me.

    \n

    My replies are included only if they were originally posted on this site.

    \n") + filewrite.write("

    Archived comments

    \n

    I often delete copies of my fics syndicated to other websites, so I archive comments here as a way of preserving them. If you left one of these comments and would like it to be removed from the archive, please email me.

    \n

    My replies are included only if they were originally posted on this site.

    \n") for comment in fileread.comments: filewrite.write("
    \n

    ") if comment["site"] == "dw": @@ -162,7 +162,7 @@ def commentindex(local=False): # write header headerfooter.headerwrite("build/comments/index.html","Comments","Comments","",False,local) filewrite = open("build/comments/index.html", "a") - filewrite.write("

    Comments I receive are archived on this site and linked back to the original. If you don’t want your comments from other sources archived here, or if you require any changes to the presentation of your comments, please email me. Please note, however, that this website is not indexed by search engines.

    \n

    If you don’t have JavaScript switched off, you can leave comments on the relevant comment pages for each fic (where this is enabled). Please leave your email address if you’d like notification of any reply. If you’d like a link from your pseudonym to a website, you can supply this as well, although I reserve the right not to link to certain advertising/tracker-heavy websites.

    \n

    Comments are turned off on some older fics.

    \n") + filewrite.write("

    I tend to temporarily syndicate my fics to other websites and then delete them, so comments I receive are archived on this site and linked back to the original. If you don’t want your comments from other sources archived here, or if you require any changes to the presentation of your comments, please email me. Please note, however, that this website is not indexed by search engines.

    \n

    If you haven’t switched off JavaScript, you can leave comments on the relevant comment pages for each fic (where this is enabled). Please leave your email address if you’d like notification of any reply. If you’d like a link from your pseudonym to a website, you can supply this as well, although I reserve the right not to link to certain advertising/tracker-heavy websites.

    \n

    Comments are turned off on some older fics.

    \n") filewrite.close() headerfooter.footerwrite("build/comments/index.html",False,local) diff --git a/feed.py b/feed.py index cb234ca..b63fc34 100644 --- a/feed.py +++ b/feed.py @@ -11,7 +11,7 @@ def feedgen(local=False): os.remove("build/feed.xml") # write header header = open("build/feed.xml", "a") - header.write("\n\n\n\nTré’s fic archive\nhttps://tre.praze.net/fic\nAll my fanfiction\nen-gb\n") + header.write("\n\n\n\nMez’s fic archive\nhttps://tre.praze.net/fic\nAll my fanfiction\nen-gb\n") header.close() datelist = [] ficcount = 500 diff --git a/headerfooter.py b/headerfooter.py index b8c8d0e..46555b9 100644 --- a/headerfooter.py +++ b/headerfooter.py @@ -5,7 +5,7 @@ def headerwrite(output,title,headerone,desc,main=False,local=False,single=False, header.write("/home/mdd/Documents/proj/fic-archive/build/") else: header.write("/fic/") - header.write("archive.css\">\n\n\n\n" + title + "\n\n\n\n\n\n\n\n") + header.write("archive.css\">\n\n\n\n" + title + "\n\n\n\n\n\n\n\n") if single: header.write("\n\n\n\n\n
    \n
    \n\n

    " + headerone + "

    \n" + desc + "\n") diff --git a/indexgen.py b/indexgen.py index c8a245e..36148c7 100644 --- a/indexgen.py +++ b/indexgen.py @@ -56,9 +56,9 @@ def indexgen(local=False): if os.path.exists("build/index.html"): os.remove("build/index.html") # write header - headerfooter.headerwrite("build/index.html","Tré’s fic archive","Tré’s fic archive","",True,local) + headerfooter.headerwrite("build/index.html","Mez’s fic archive","Mez’s fic archive","",True,local) filewrite = open("build/index.html", "a") - filewrite.write("

    Here is all my fanfiction! Some of it is also syndicated elsewhere, but this site is the canonical location for everything I’ve written.

    \n

    Transformative works policy: The contents of these pages are licensed under CC BY-NC 4.0. \"\"\"\"\"\" In other words, transformative works are permitted as long as there is a clearly visible hyperlink to the original and no financial transactions are involved.

    \n

    The code for this archive is available here. Commenting is switched on for most fics written at least semi-recently – read about that Here is all my fanfiction! Some of it is also syndicated elsewhere (often temporarily), but this site is the canonical location for everything I’ve written.

    \n

    Transformative works policy: The contents of these pages are licensed under CC BY-NC 4.0. \"\"\"\"\"\" In other words, transformative works are permitted as long as there is a clearly visible hyperlink to the original and no financial transactions are involved.

    \n

    The code for this archive is available here. Commenting is switched on for most fics written at least semi-recently – read about that Date: Sat, 15 Mar 2025 13:21:45 +0000 Subject: [PATCH 10/10] Stop using OTW symbols --- statsgen.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/statsgen.py b/statsgen.py index 06b58b2..8c27fd0 100644 --- a/statsgen.py +++ b/statsgen.py @@ -185,31 +185,31 @@ def ficsum(ficcount,year,month=0,showfandom=True,local=False): ficstring += ", " if language: ficstring += language - ficstring += "" + ficstring += " " if rating == "g": - ficstring += "  U " + ficstring += "🟢" elif rating == "t": - ficstring += "  G " + ficstring += "🟡" elif rating == "m": - ficstring += "  M " + ficstring += "🟠" elif rating == "e": - ficstring += "  X " + ficstring += "🔴" for thegenre in genre: if thegenre == "gen": - ficstring += "  ☉ " + ficstring += "⭕" elif thegenre == "slash": - ficstring += "  ♂ " + ficstring += "👨👨" elif thegenre == "het": - ficstring += "  ⚤ " + ficstring += "👨👩" elif thegenre == "femslash": - ficstring += "  ♀ " + ficstring += "👩👩" elif thegenre == "poly": - ficstring += "     " + ficstring += "🧑➕" elif thegenre == "other": - ficstring += "  ☿ " + ficstring += "💖" if warnings: - ficstring += "  !? " - ficstring += " " + str(words) + "" + ficstring += "❗" + ficstring += " " + str(words) + "" return ficstring """