From d1003797f20dd8fa4a9489b473ecae44c7310c5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tr=C3=A9meur?= Date: Mon, 20 Nov 2023 20:21:51 +0000 Subject: [PATCH] Change ratings terminology, better emoji support --- build/archive.css | 2 +- feed.py | 8 ++++---- headerfooter.py | 2 +- makeheader.py | 4 ++-- statsgen.py | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build/archive.css b/build/archive.css index 94810bd..fa3b985 100644 --- a/build/archive.css +++ b/build/archive.css @@ -9,7 +9,7 @@ body { background: rgb(185,106,106); background: radial-gradient(circle, rgba(185,106,106,1) 0%, rgba(236,197,197,1) 100%); background-attachment: fixed; - font-family: "Merriweather", serif; + font-family: "Merriweather", serif, "Noto Color Emoji"; } body, a, a:visited { diff --git a/feed.py b/feed.py index 57a4adf..ccbc179 100644 --- a/feed.py +++ b/feed.py @@ -108,9 +108,9 @@ def feedgen(local=False): except: pass if origread.rating == "g": - therating = "G" + therating = "U" elif origread.rating == "t": - therating = "T" + therating = "G+" elif origread.rating == "m": therating = "M" elif origread.rating == "e": @@ -142,9 +142,9 @@ def feedgen(local=False): except: pass if thefile.rating == "g": - therating = "G" + therating = "U" elif thefile.rating == "t": - therating = "T" + therating = "G+" elif thefile.rating == "m": therating = "M" elif thefile.rating == "e": diff --git a/headerfooter.py b/headerfooter.py index b4f723c..867ad22 100644 --- a/headerfooter.py +++ b/headerfooter.py @@ -5,7 +5,7 @@ def headerwrite(output,title,headerone,desc,main=False,local=False): header.write("/home/mdd/Documents/drive/proj/fic-archive/build/") else: header.write("/fic/") - header.write("archive.css\">\n\n\n\n\n" + title + "\n\n\n\n
\n
\n\n

" + headerone + "

\n" + desc + "\n") + header.write("archive.css\">\n\n\n\n\n" + title + "\n\n\n\n
\n
\n\n

" + headerone + "

\n" + desc + "\n") if not main: header.write("

\n\n

  • Rating: ") if fileread.rating == "g": - filewrite.write("general") + filewrite.write("universal") elif fileread.rating == "t": - filewrite.write("teen") + filewrite.write("general") elif fileread.rating == "m": filewrite.write("mature") elif fileread.rating == "e": diff --git a/statsgen.py b/statsgen.py index c8fb21e..c2ba6f6 100644 --- a/statsgen.py +++ b/statsgen.py @@ -187,13 +187,13 @@ def ficsum(ficcount,year,month=0,showfandom=True,local=False): ficstring += language ficstring += "" if rating == "g": - ficstring += "  G " + ficstring += "  U " elif rating == "t": - ficstring += "  T " + ficstring += "  G " elif rating == "m": ficstring += "  M " elif rating == "e": - ficstring += "  E " + ficstring += "  X " for thegenre in genre: if thegenre == "gen": ficstring += "  ☉ "