diff options
| -rw-r--r-- | README.md | 11 | ||||
| -rw-r--r-- | src/FontFamily.java | 13 | ||||
| -rw-r--r-- | src/LineGraph.java | 2 | ||||
| -rw-r--r-- | update.sh | 2 | ||||
| -rw-r--r-- | week4.png | bin | 0 -> 66975 bytes |
5 files changed, 23 insertions, 5 deletions
@@ -151,3 +151,14 @@ CSV parsing added. Not quite the original design, but one that's more practical. JSON parsing not yet implemented, though the places where it will be needed have been outlined. Javadoc comments added for existing methods.  + +## Week 4: Updates +JSON parsing works well enough for most FontFamily metadata to be composed. +The only parsing which still needs implementation is tables of values. +That'll be worked on tomorrow, when the trend calculation methods are begun. +When originally writing the plans for this week, the repository still contained +all of the outline fonts. That proved impractical. However, the metadata contains +sets of data describing the Unicode subsets implemented by a font. Along with JSONReader.getAll(), +this fulfulls most of the same purpose. No disk space calculation, unfortunately. +There are 9 days left. + diff --git a/src/FontFamily.java b/src/FontFamily.java index 39fae26..cff4f87 100644 --- a/src/FontFamily.java +++ b/src/FontFamily.java @@ -23,8 +23,8 @@ public class FontFamily { private HashMap<String,Integer> styles; /* Taken from top level of METADATA.pb */ private String dateAdded; - /* Languages supported. */ - private String[] languages; + /* Unicode ranges. */ + private String[] subsets; private String designer; /* total views, 7day views, 30day views, 90day views, year views. Taken from popularity.json. */ @@ -50,7 +50,7 @@ public class FontFamily { private void parseMetadata(JSONReader metadata) { familyName = metadata.get("name"); dateAdded = metadata.get("date_added"); - languages = metadata.getAll("languages"); + subsets = metadata.getAll("subsets"); designer = metadata.get("designer"); license = metadata.get("license"); category = metadata.get("category"); @@ -67,4 +67,11 @@ public class FontFamily { */ private void parseStyles(CSVReader styles) { } + + public String getFamilyName() { + return familyName; + } + public String[] getSubsets() { + return subsets; + } } diff --git a/src/LineGraph.java b/src/LineGraph.java index 4e05bb7..129bb1c 100644 --- a/src/LineGraph.java +++ b/src/LineGraph.java @@ -14,7 +14,7 @@ import javax.swing.*; */ public class LineGraph { - int[][] coordinates; // A line graph has-a set of coordinates + private int[][] coordinates; // A line graph has-a set of coordinates /** * Constructor. @@ -1,7 +1,7 @@ #!/bin/sh #git pull --recurse -curl -LO https://raw.githubusercontent.com/google/fonts/main/tags/all/families.csv +#curl -LO https://raw.githubusercontent.com/google/fonts/main/tags/all/families.csv curl https://fonts.google.com/metadata/stats | \ # First line is junk. sed -n -e '2,$p' > popularity.json diff --git a/week4.png b/week4.png Binary files differnew file mode 100644 index 0000000..1e86cc6 --- /dev/null +++ b/week4.png |
