diff --git a/build/archive.css b/build/archive.css index a6cc133..79674d3 100644 --- a/build/archive.css +++ b/build/archive.css @@ -135,12 +135,19 @@ div.fic h1 span.ficnoprelim { font-size: 0.6em; } -div.fic h1 span.abandoned { +div.fic h1 span.abandoned, div.fic h1 span.incomplete { font-weight: normal; - background-color: #9c0000; color: white; } +div.fic h1 span.abandoned { + background-color: #9c0000; +} + +div.fic h1 span.incomplete { + background-color: #8ab60b; +} + div.fic ul.ficlinks li, div.fic ul.ficmeta li { list-style: none; } diff --git a/commentpage.py b/commentpage.py index eccb595..0be603a 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: @@ -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": @@ -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) @@ -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("

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/events.py b/events.py index 1c8b821..bb948b2 100644 --- a/events.py +++ b/events.py @@ -86,11 +86,11 @@ def eventlist(local=False): position += 1 eventlocation = (eventlist[position])["location"] if eventlocation == "dwjournal": - filewrite.write("\"[personal" + theevent.replace("-","_")+ "") + filewrite.write("\"[personal" + theevent.replace("-","_")+ "") elif eventlocation == "dwcomm": - filewrite.write("\"[community" + theevent.replace("-","_") + "") + filewrite.write("\"[community" + theevent.replace("-","_") + "") elif eventlocation == "ljjournal": - filewrite.write("\"[personal" + theevent.replace("-","_")+ "") + filewrite.write("\"[personal" + theevent.replace("-","_")+ "") else: filewrite.write(theevent) filewrite.write(" (" + str(len(evententries)) + ": " + ", ".join(eventfandoms) + ")\n") diff --git a/feed.py b/feed.py index 7b5de27..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 @@ -160,8 +160,7 @@ def feedgen(local=False): filewrite.write(", " + thegenre) genred = True filewrite.write("\n") - futuredate = date + datetime.timedelta(days=2) - filewrite.write(futuredate.strftime("%a, %-d %b %Y")) + filewrite.write(date.strftime("%a, %-d %b %Y")) filewrite.write(" 00:00:00 GMT\n") if local: filewrite.write("/home/mdd/Documents/proj/fic-archive/build/") @@ -185,7 +184,7 @@ def feedgen(local=False): filewrite.write(" in this update") filewrite.write(".") try: - filewrite.write(" " + re.sub("<[^<]+?>","",re.sub(".*","[spoiler]",thefile.summary))) + filewrite.write(" " + re.sub(" "," ",re.sub("<[^<]+?>","",re.sub(".*","[spoiler]",thefile.summary)))) except: filewrite.write(" No summary provided.") try: diff --git a/headerfooter.py b/headerfooter.py index 02cb828..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") @@ -39,5 +39,5 @@ def footerwrite(output,main=False,local=False): footer.write("/home/mdd/Documents/proj/fic-archive/build/") else: footer.write("/fic/") - footer.write("verify/index.html?returnto=${window.location}`; }\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 0db08cd..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 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
\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
\n
\n\n
\n") filewrite.close() headerfooter.footerwrite("build/index.html",True,local) diff --git a/makeheader.py b/makeheader.py index 4174a60..9440278 100644 --- a/makeheader.py +++ b/makeheader.py @@ -46,7 +46,7 @@ def linkgen(ficno,output="output.html",local=False): 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("
  • \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__": 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