jdejaegh/ics-fusion
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaces True with yes for specifying additional conf to avoid JSON/Python conflict

Browse source 
```
This commit is contained in:
xelast418 2023-09-21 09:49:07 +12:00
parent ada5f6477f
commit c4623f8808
No known key found for this signature in database
GPG key ID: 76EE00E7C90D5B64
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -32,7 +32,7 @@ The JSON configuration file should look like the following.
```json ```json
[ [
{ {
"conf": true, "conf": "str",
"extends": "str", "extends": "str",
"extendFail": "str", "extendFail": "str",
}, },
@ -110,7 +110,7 @@ Only the `url` and the `name` field are mandatory.
- `redactAs`: Replaces the content of the field with the specified string - `redactAs`: Replaces the content of the field with the specified string
If multiple calendars are specified in the configuration list, their events will be merged in the resulting ics feed. If multiple calendars are specified in the configuration list, their events will be merged in the resulting ics feed.
The first dataset with {"conf": true,} specifies options that are globally applied to all calenders in the conf. Omit this set to disable. Options The first dataset with {"conf": "yes",} specifies options that are globally applied to all calenders in the conf. Omit this set to disable. Options
- `extends`: string specifying the name (excluding .json) of another config file to extend. - `extends`: string specifying the name (excluding .json) of another config file to extend.
- `extendFail`: string speciying the action to take if an extend fails, either "fail" or "ignore". Default is "fail". - `extendFail`: string speciying the action to take if an extend fails, either "fail" or "ignore". Default is "fail".
@ -118,7 +118,7 @@ The first dataset with {"conf": true,} specifies options that are globally appli
Once the config file is created, the corresponding HTTP endpoint is accessible. For example, if the file `app/config/my-calendar.json` contains the configuration, the HTTP endpoint will be `http://localhost:8088/my-calendar`. Once the config file is created, the corresponding HTTP endpoint is accessible. For example, if the file `app/config/my-calendar.json` contains the configuration, the HTTP endpoint will be `http://localhost:8088/my-calendar`.
A config can extend another config file, to do this the extended config should contain begin with`{ A config can extend another config file, to do this the extended config should contain begin with`{
"conf": true, "conf": "yes",
"extends": <name of calendar>, "extends": <name of calendar>,
"extendFail": "fail", "extendFail": "fail",
},` },`

2
app/tools/tools.py
View file

@ -348,7 +348,7 @@ def process(path: str, from_cache: bool = True) -> Calendar:
data = [] data = []
for entry in config: for entry in config:
if entry.get("conf", False) == True: if entry.get("conf", "no") == "yes":
if entry.get("extends", None) is not None: if entry.get("extends", None) is not None:
try: try:
o = "app/config/" + sanitize_filename(entry["extends"]) + ".json" o = "app/config/" + sanitize_filename(entry["extends"]) + ".json"