Commit Graph
5979 Commits
Author SHA1 Message Date
Landon Curt Noll b947c1f155 fix other quote problems so GitHub does not complain 2024-09-24 22:27:18 -07:00
Landon Curt Noll 7c27ac4e0c fix Illegal quoting
When viewed on GitHub,
[summary.csv](https://github.com/ioccc-src/temp-test-ioccc/blob/master/summary.csv)
reported:

> We can make this file beautiful and searchable if this error is corrected: Illegal quoting in line 16.

This is an attempt to fix that problem.

NOTE: We are not sure what is wrong with the quotes on line 16.
Perhaps any quotes with the file is a problem and GitHub just reported
the first problem?
2024-09-24 22:21:53 -07:00
Landon Curt Noll c1f2a5f5e2 add temporary summary.csv file
This file will go away, but is a good start for the
title and abstract for entries.

The contents started from
[summary.txt](https://github.com/ioccc-src/winner/blob/master/all/summary.txt).

We converted the contents into a CSV format.  Moreover the abstract was
limited to no more than 63 characters.  All comma's (",") within the
abstract were removed to make converting to CSV easier.

NOTE: This is a tempory file that will **GO AWAY** once the all of the
`.entry.json` files have been updated with a title and abstract.
2024-09-24 21:57:48 -07:00
Landon Curt Noll 7359c091b5 sort entries in bin/README.md by filename 2024-09-24 18:27:03 -07:00
Landon Curt Noll ffcfb7d0ba Merge pull request #2670 from xexyl/typo-unicode-fix 2024-09-24 12:13:09 -07:00
Cody Boone Ferguson 77e9d16aeb Typo fixes & clarification in bin/unicode-fix.sed 2024-09-24 11:46:05 -07:00
Landon Curt Noll f9f72152ab add make unicode_chk and add jparse check to bin/unicode-chk.sh
We add `make unicode_chk` to run `bin/unicode-chk.sh` to check all
`.entry.json` and all `author/author_handle.json` files.

Added a JSON format check by `jparse(1)` to `bin/unicode-chk.sh`.

Changed `bin/unicode-chk.sh` VERSION from "1.0 2024-09-23"
to "1.1 2024-09-24".

Performed `make unicode_chk` to test the above under macOS.
2024-09-24 04:51:22 -07:00
Landon Curt Noll 499be5983d use jsp tool, workaround JSON Unicode bugs, misc fixes
If the [jsp tool](https://github.com/kjozsa/jsp) is
installed, it will be used in favor of the [JSONPath.sh
tool](https://github.com/lcn2/JSONPath.sh).

Updated `bin/jfmt-wrapper.sh`, `bin/jprint-wrapper.sh`, and
`bin/jval-wrapper.sh` to use jsp if found.  These 3 tools may be given
`-t tool` where tool is either "_jsp_" or "_JSONPath.sh_" for force the
use of the tool.  They also use `-Q` to perform a quick check tool using
trivial input.

The `bin/jval-wrapper.sh` tool had been simplified.  The `-w`,
`-i` and `-u` options are gone.  Instead it has:

```
    -b    print only values (def: print both JSON member and JSON value)
    -q    remove enclosing double quotes (def: keep any enclosing double quotes)
```

Add `make all_jfmt` to Makefile to canonically format all entry and
author handle JSON files.

A sed script `bin/unicode-fix.sed` has been added that converts
JSON string "_\u[0-9A-Fa-f]{4}_" encoding that may arise from known
JSON data.  This is done as a work-a-round for [Unicode / UTF-8
issues](https://github.com/xexyl/jparse/issues/13) with `jstrdecode(1)`.

The `bin/unicode-chk.sh` tool, if given on file arguments, scans
all `.entry.json` and `author/author_handle.json` JSON files to be
sure that, after `bin/unicode-fix.sed` processing, no JSON string
"_\u[0-9A-Fa-f]{4}_" encodings remain.

Removed all `-j jparse` args from commands.  Instead the `jparse(1)`
tool is looked for along $PATH.

Added `combine_author_handle.sh` tool to transform all of the
`author/author_handle.json` files into a temporary as a single JSON
file so that `bin/jval-wrapper.sh` tool may be used to extract all
"_sort_word_" or all "_entry_id_" values.

Changed `bin/all-jfmt.sh` VERSION from "1.0 2024-08-31"
to "1.1 2024-09-24".

Changed `bin/csv2entry.sh` VERSION from "1.2.3 2024-08-30"
to "1.3 2024-09-23".

Changed `bin/cvt-submission.sh` VERSION from "1.1 2024-08-31"
to "1.2 2024-09-23".

Changed `bin/entry2csv.sh` VERSION from "1.2.1 2024-08-17"
to "1.3 2024-09-23".

Changed `bin/gen-authors.sh` VERSION from "1.12 2024-08-18"
to "1.13 2024-09-23".

Changed `bin/gen-location.sh` VERSION from "1.6 2024-08-18"
to "1.7 2024-09-23".

Changed `bin/gen-status.sh` VERSION from "1.6 2024-08-17"
to "1.7 2024-09-23".

Changed `bin/gen-years.sh` VERSION from "1.4 2024-08-17"
to "1.5 2024-09-23".

Changed `bin/jfmt-wrapper.sh` VERSION from "1.1 2024-08-20"
to "1.2 2024-09-23".

Changed `bin/jprint-wrapper.sh` VERSION from "1.1 2024-08-20"
to "1.3 2024-09-23".

Changed `bin/jval-wrapper.sh` VERSION from "1.0.4 2024-08-20"
to "1.1 2024-09-23".

Changed `bin/manifest.entry.json.awk` VERSION from "1.1.2 2024-07-28"
to "1.2 2024-09-17".

Changed `bin/output-index-author.sh` VERSION from "1.8 2024-08-17"
to "1.9 2024-09-23".

Changed `bin/output-year-index.sh` VERSION from "1.4.4 2024-08-05"
to "1.5 2024-09-23".

Changed `bin/subst.entry-index.sh` VERSION from "1.5 2024-08-13"
to "1.6 2024-09-23".

Added `bin/combine_author_handle.sh` VERSION "1.0 2024-09-23".

Added `bin/unicode-chk.sh` VERSION "1.0 2024-09-23".

Added `bin/unicode-fix.sed` VERSION "1.0 2024-09-23".

Perform `make www` to perform the above and test under macOS.

FYI: On our MacBook Pro, `make www` took:

```
    make www  631.79s user 264.95s system 94% cpu 15:53.71 total
```

FYI: On our MacBook Pro, `make quick_www` took:

```
    make quick_www  81.43s user 58.26s system 102% cpu 2:16.02 total
```
2024-09-24 04:04:27 -07:00
Landon Curt Noll e84d6eb095 add make sort_gitignore to make www and make quick_www 2024-09-07 12:28:57 -07:00
Landon Curt Noll b41ad48d79 Merge pull request #2669 from xexyl/jparse-mkiocccentry-faq 2024-09-07 12:05:34 -07:00
Cody Boone Ferguson 79e3f18ed6 Minor fixes to FAQ wrt other repos
The FAQ now notes that there can be times where the jparse repo
(https://github.com/xexyl/jparse/) is different from the mkiocccentry
repo's subdirectory jparse. This is one of the reasons the tools in the
mkiocccentry and the jparse repo show the jparse API with the -V
(version) option.

I believe that this is all that's needed for the jparse repo in the FAQ
but time will tell on that.
2024-09-07 09:39:51 -07:00
Landon Curt Noll 69bef8add2 fix bin/sort.gitignore.sh and bin/sgi.sh
We added ._.DS_Store to `.gitignore`, and generalized the `/archive/historic/`
year sub-directories into a single pattern line.

We fix `bin/sgi.sh` to properly sort, canonically, `.gitignore` files
including `._.DS_Store` lines.  The tool now stories stdin content
into a temporary file, then prints 6 classes of files from the
temporary file to stdout.

Changed `bin/sgi.sh` VERSION from "1.1.3 2024-08-18"
to "1.2 2024-09-05".

Fixed a bug in `bin/sort.gitignore.sh` that prevented it from
finding the `bin/sgi.sh` tool.

Changed `bin/sort.gitignore.sh` VERSION from "1.1.8 2024-07-28"
to "1.2 2024-09-05".

Performed `make sort_gitignore` to test the above under macOS.

NOTE: The above canonically sorted:

- 2004/hibachi/.gitignore
- 2005/mynx/.gitignore
- 2011/vik/.gitignore
- 2013/dlowe/.gitignore
- 2020/otterness/.gitignore
2024-09-05 16:56:47 -07:00
Landon Curt Noll a6c34f57cf update FAQ as per changes to jparse and mkiocccentry repos 2024-09-03 01:06:29 -07:00
Landon Curt Noll 7faec7d6a1 Merge pull request #2668 from xexyl/html06
Format fix some of 2006 entries' index.html
2024-09-02 14:37:33 -07:00
Cody Boone Ferguson 513e0c9001 Format fix some of 2006 entries' index.html 2024-09-02 13:02:28 -07:00
Landon Curt Noll d3ba52c5bd Merge pull request #2667 from xexyl/inabiaf
Minor update to bugs.html wrt INABIAF
2024-09-02 12:57:14 -07:00
Cody Boone Ferguson 624a51081c Minor update to bugs.html wrt INABIAF 2024-09-02 12:54:59 -07:00
Landon Curt Noll 73d777a4b8 add may apply to HHG quote pre-text 2024-09-02 12:52:27 -07:00
Landon Curt Noll 519705d178 add some FAQ humor and clarification
Added a new "FAQ 1.4  - What is the **Great Fork Merge**?"
and a new "FAQ 6.18 - I do not understand the IOCCC, can you explain it
to me?".

Updated "FAQ 0.11: How can I validate any JSON document?"
with new jparse info.

Performed `make gen_top_html` to accomplish the above and to test under macOS.
2024-09-01 22:44:55 -07:00
Landon Curt Noll 841a44c364 add the goal to have fun with C! 2024-09-01 22:16:43 -07:00
Landon Curt Noll 8866c45a90 remove obsolete XXX comment from bin/csv2entry.sh 2024-09-01 01:01:25 -07:00
Landon Curt Noll 114e7ce85f improve format of make help 2024-09-01 00:38:31 -07:00
Landon Curt Noll e1bae250e1 fix make help typo 2024-09-01 00:21:04 -07:00
Landon Curt Noll cbdf9ed33f add bin/all-jfmt.sh tool
Added `bin/all-jfmt.sh` tool.

Added `make all_jfmt` rule to `Makefile`.
Added `make all_jfmt` to `make www`.

NOTE: Because the `bin/all-jfmt.sh` tool is slow, we did not
add `make all_jfmt` to `make quick_www`.
NOTE: Once the `jprint(1)` tool, as described in [issue
repo](https://github.com/xexyl/jparse), this tool (and a number of other
tools) will run **MUCH FASTER**.

Performed `make www` to accomplish the above and to test under macOS.

FYI: The `make www` takes:

    make www  396.29s user 523.94s system 102% cpu 15:00.82 total

This command will become somewhat faster when the `jprint(1)` tool is ready.
It will become **MUCH** faster when the `jval(1)` tool is ready.

As a comparison, `make quick_www` takes only:

    make quick_www  43.63s user 53.87s system 109% cpu 1:29.17 total
2024-09-01 00:16:13 -07:00
Landon Curt Noll e7656ec3b1 improve the usage message slightly to bin/jfmt-wrapper.sh 2024-08-31 22:34:54 -07:00
Landon Curt Noll 045716cde2 release bin/cvt-submission.sh tool
The `bin/cvt-submission.sh` tool is now complete.

Changed `bin/cvt-submission.sh` VERSION from "1.0.5 2024-08-17"
to "1.1 2024-08-31".

Make minor error message fix to `bin/csv2entry.sh`.

Performed `make quick_www` to accomplish the above and to test under macOS.

TODO: Complete the `bin/csv2entry.sh` tool.
2024-08-31 00:38:29 -07:00
Landon Curt Noll db67bf8a37 fix bin/csv2entry.sh
We fixed `bin/csv2entry.sh` to output entry `.entry.json`
files in JSON canonical form.

Changed `bin/csv2entry.sh` VERSION from "1.2.2 2024-08-17"
to "1.2.3 2024-08-30".

Performed `make quick_www` to accomplish the above and to test under macOS.
2024-08-30 22:45:22 -07:00
Landon Curt Noll 71c48f0094 Merge pull request #2666 from xexyl/guidelines-jparse
Add jparse repo to guidelines
2024-08-30 12:12:33 -07:00
Cody Boone Ferguson a73ec108b3 Add jparse repo to guidelines
The jparse/ subdirectory in the mkiocccentry repo is self-contained but
it was suggested to put in parentheses the original source and this has
been done now.
2024-08-30 11:53:40 -07:00
Landon Curt Noll d981aa2a04 revert non-canonical JSON changes from a previous commit
The PR #2662 introduced TAB characters into entry `.entry.json` files
and mal-formatted `author_handle` JSON members.

To restore canonical JSON formatting, we did:

```sh
find [12][90][89012][0-9] -name .entry.json -print | xargs -n 1 bin/jfmt-wrapper.sh -v 1
```

BTW: We have written a tool, currently untested, to do this.  We plan to also
     add a new fix JSON format rule to the top level `Makefile`.

Performed `make www` to accomplish the above and to test under macOS.
2024-08-29 19:03:28 -07:00
Landon Curt Noll 70d3b5a4b7 Merge pull request #2665 from xexyl/vince05
Format fixes in 2005/vince/index.html
2024-08-29 18:34:07 -07:00
Landon Curt Noll 909f76bb96 Merge pull request #2664 from xexyl/vik05
Format fixes in 2005/vik/index.html
2024-08-29 18:33:53 -07:00
Landon Curt Noll b4d60fe0bd Merge pull request #2663 from xexyl/toledo05
Format fixes in 2005/toledo/index.html
2024-08-29 18:33:37 -07:00
Landon Curt Noll 46cb38b7c9 Merge pull request #2662 from xexyl/manifest-json
Use canonicalised 4 spaces in .entry.json files
2024-08-29 18:33:19 -07:00
Landon Curt Noll e9ac0f4fe9 Merge pull request #2661 from xexyl/sykes2005
Format fixes in 2005/sykes/index.html
2024-08-29 18:27:55 -07:00
Landon Curt Noll 7500c34918 Merge pull request #2660 from xexyl/persano05-index
Persano05 index
2024-08-29 18:27:19 -07:00
Landon Curt Noll cdf301a101 Merge pull request #2659 from xexyl/mynx05-html
Format fixes in 2005/mynx/index.html
2024-08-29 18:27:04 -07:00
Cody Boone Ferguson 9212f53531 Format fixes in 2005/vince/index.html 2024-08-29 13:20:03 -07:00
Cody Boone Ferguson 3659d264f5 Format fixes in 2005/vik/index.html 2024-08-29 13:16:53 -07:00
Cody Boone Ferguson ed40cc367f Format fixes in 2005/toledo/index.html 2024-08-29 13:13:57 -07:00
Cody Boone Ferguson 433281e5f6 Use canonicalised 4 spaces in .entry.json files 2024-08-29 12:59:55 -07:00
Cody Boone Ferguson e9cc8ce703 Format fixes in 2005/sykes/index.html 2024-08-29 12:47:07 -07:00
Cody Boone Ferguson 55f5005a68 Format fix 2005/persano/index.html 2024-08-29 12:38:21 -07:00
Cody Boone Ferguson b1e0bddbd0 Format fixes in 2005/mynx/index.html 2024-08-29 12:33:46 -07:00
Landon Curt Noll 81e9dd597e Merge pull request #2658 from xexyl/mikeash05-bugs
Fix bugs.html for 2005/mikeash
2024-08-29 02:48:05 -07:00
Landon Curt Noll 823caf21cf Merge pull request #2657 from xexyl/giljade05-html
Format fix 2005/giljade/index.html + update bugs
2024-08-29 02:47:14 -07:00
Cody Boone Ferguson 870d6628eb Fix bugs.html for 2005/mikeash 2024-08-28 15:25:27 -07:00
Cody Boone Ferguson 05097e41d6 Format fix 2005/giljade/index.html + update bugs 2024-08-28 15:20:08 -07:00
Landon Curt Noll 6e504407d8 Merge pull request #2656 from xexyl/boutines05
Format and link fix 2005/boutines/index.html
2024-08-28 12:24:45 -07:00
Landon Curt Noll a4adadfc25 Merge pull request #2655 from xexyl/fmt-inc-index
Format fixes/improvements in inc/index.html
2024-08-28 12:21:58 -07:00