diff --git a/py/Boards/Charlie/.json b/py/Boards/Charlie/.json new file mode 100644 index 0000000..8b4704e --- /dev/null +++ b/py/Boards/Charlie/.json @@ -0,0 +1 @@ +{"Name": "", "Description": "", "Hus": "Charlie", "col-left": [], "col-center": [], "col-right": []} \ No newline at end of file diff --git a/py/Boards/Charlie/First-example-board.json b/py/Boards/Charlie/First-example-board.json deleted file mode 100644 index 7d15878..0000000 --- a/py/Boards/Charlie/First-example-board.json +++ /dev/null @@ -1 +0,0 @@ -{"Name": "First example board", "Description": "This is the first example board we have in the database.", "Hus": "Charlie", "col-left": [{"order": 0, "id": "parallel1", "text": "A parallel coordinates plot", "api_url": "..."}], "col-center": [{"order": 0, "id": "grid1", "text": "A grid plot", "api_url": "..."}], "col-right": [{"order": 0, "id": "horizon1", "text": "A horizon plot", "api_url": "..."}]} \ No newline at end of file diff --git a/py/Boards/Charlie/GM.json b/py/Boards/Charlie/GM.json deleted file mode 100644 index fa2af42..0000000 --- a/py/Boards/Charlie/GM.json +++ /dev/null @@ -1 +0,0 @@ -{"Name": "GM", "Description": "", "Hus": "Charlie", "col-left": [], "col-center": [{"order": 0, "id": "grid-580160", "text": "", "api_url": "grid/monthly?hus=Charlie&sensor=Temp_MP1_1_Pos1&type=celsius&year=2023&month=01"}], "col-right": []} \ No newline at end of file diff --git a/py/Boards/Charlie/GY.json b/py/Boards/Charlie/GY.json deleted file mode 100644 index ef2b8bb..0000000 --- a/py/Boards/Charlie/GY.json +++ /dev/null @@ -1 +0,0 @@ -{"Name": "GY", "Description": "G Yearky", "Hus": "Charlie", "col-left": [], "col-center": [{"order": 0, "id": "grid-405229", "text": "", "api_url": "grid/yearly?hus=Charlie&sensor=Temp_MP1_1_Pos1&type=celsius&year=2023"}], "col-right": []} \ No newline at end of file diff --git a/py/Boards/Charlie/HW.json b/py/Boards/Charlie/HW.json deleted file mode 100644 index 15097b0..0000000 --- a/py/Boards/Charlie/HW.json +++ /dev/null @@ -1 +0,0 @@ -{"Name": "HW", "Description": "", "Hus": "Charlie", "col-left": [], "col-center": [], "col-right": [{"order": 0, "id": "horizon-876464", "text": "", "api_url": "horizon/weekly?hus=Charlie&family=MP1_1&type=celsius&year=2023&week=15"}]} \ No newline at end of file diff --git a/py/Boards/Charlie/eee.json b/py/Boards/Charlie/eee.json new file mode 100644 index 0000000..c90b1a6 --- /dev/null +++ b/py/Boards/Charlie/eee.json @@ -0,0 +1 @@ +{"Name": "eee", "Description": "eeee", "Hus": "Charlie", "col-left": [], "col-center": [{"order": 0, "id": "grid-803064", "text": "", "api_url": "grid/monthly?hus=Charlie&sensor=Temp_MP1_1_Pos1&type=celsius&year=2023&month=01&hour=12"}], "col-right": []} \ No newline at end of file diff --git a/py/Boards/Charlie/ffff.json b/py/Boards/Charlie/ffff.json new file mode 100644 index 0000000..45e3127 --- /dev/null +++ b/py/Boards/Charlie/ffff.json @@ -0,0 +1 @@ +{"Name": "ffff", "Description": "ddddd", "Hus": "Charlie", "col-left": [], "col-center": [{"order": 0, "id": "grid-963811", "text": "", "api_url": "grid/monthly?hus=Charlie&sensor=Temp_MP1_1_Pos1&type=celsius&year=2023&month=01&hour=12"}], "col-right": []} \ No newline at end of file diff --git a/py/Boards/Charlie/my1.json b/py/Boards/Charlie/my1.json new file mode 100644 index 0000000..b368687 --- /dev/null +++ b/py/Boards/Charlie/my1.json @@ -0,0 +1 @@ +{"Name": "my1", "Description": "this is my example", "Hus": "Charlie", "col-left": [{"order": 0, "id": "parallel-6847321", "text": "", "api_url": "parallel/yearly?hus=Charlie&family=MP1_1&type=celsius&year=2023&hour=12&day=1"}, {"order": 1, "id": "parallel-9166361", "text": "wwww", "api_url": "parallel/yearly?hus=Charlie&family=MP1_1&type=celsius&year=2023&hour=12&day=1"}], "col-center": [{"order": 0, "id": "grid-6311", "text": "", "api_url": "grid/monthly?hus=Charlie&sensor=Temp_MP1_1_Pos1&type=celsius&year=2023&month=01&hour=12"}], "col-right": [{"order": 0, "id": "horizon-737361", "text": "", "api_url": "horizon/monthly?hus=Charlie&family=MP1_1&type=celsius&year=2023&month=1"}, {"order": 1, "id": "horizon-767913", "text": "", "api_url": "horizon/monthly?hus=Charlie&family=MP1_1&type=celsius&year=2023&month=1"}]} \ No newline at end of file diff --git a/py/Boards/Charlie/test1.json b/py/Boards/Charlie/test1.json deleted file mode 100644 index 041532a..0000000 --- a/py/Boards/Charlie/test1.json +++ /dev/null @@ -1 +0,0 @@ -{"Name": "test1", "Description": "this is a test", "Hus": "Charlie", "col-left": [{"order": 0, "id": "P-txt-723017", "text": "eeeeeeee", "api_url": null}, {"order": 1, "id": "parallel-4286811", "text": "", "api_url": "parallel/daily?hus=Charlie&family=MP1_1&type=celsius&day=2022-12-15"}], "col-center": [{"order": 0, "id": "G-txt-910177", "text": "err we", "api_url": null}, {"order": 1, "id": "grid-438525", "text": "", "api_url": "grid/yearly?hus=Charlie&sensor=Temp_MP1_1_Pos1&type=celsius&year=2023"}], "col-right": [{"order": 0, "id": "H-txt-974001", "text": "rerer er re", "api_url": null}, {"order": 1, "id": "horizon-487744", "text": "", "api_url": "horizon/daily?hus=Charlie&family=MP1_1&type=celsius&day=2023-02-07"}]} \ No newline at end of file diff --git a/py/Boards/Charlie/test2.json b/py/Boards/Charlie/test2.json deleted file mode 100644 index abc6032..0000000 --- a/py/Boards/Charlie/test2.json +++ /dev/null @@ -1 +0,0 @@ -{"Name": "test2", "Description": "this is exactly like test1", "Hus": "Charlie", "col-left": [{"order": 0, "id": "P-txt-723017", "text": "eeeeeeeeeeeeeeee", "api_url": null}, {"order": 1, "id": "parallel-4286811", "text": "", "api_url": "parallel/daily?hus=Charlie&family=MP1_1&type=celsius&day=2022-12-15"}], "col-center": [{"order": 0, "id": "G-txt-910177", "text": "err weerr we", "api_url": null}, {"order": 1, "id": "grid-438525", "text": "", "api_url": "grid/yearly?hus=Charlie&sensor=Temp_MP1_1_Pos1&type=celsius&year=2023"}], "col-right": [{"order": 0, "id": "H-txt-974001", "text": "rerer er rererer er re", "api_url": null}, {"order": 1, "id": "horizon-487744", "text": "", "api_url": "horizon/daily?hus=Charlie&family=MP1_1&type=celsius&day=2023-02-07"}]} \ No newline at end of file diff --git a/py/Boards/Charlie/test3.json b/py/Boards/Charlie/test3.json deleted file mode 100644 index 0e77d50..0000000 --- a/py/Boards/Charlie/test3.json +++ /dev/null @@ -1 +0,0 @@ -{"Name": "test3", "Description": "test2 has TXT+Diagram -> 1+2, 1+2 and 1+2", "Hus": "Charlie", "col-left": [{"order": 0, "id": "P-txt-723017", "text": "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee", "api_url": null}, {"order": 1, "id": "parallel-4286811", "text": "", "api_url": "parallel/daily?hus=Charlie&family=MP1_1&type=celsius&day=2022-12-15"}, {"order": 2, "id": "parallel-8519775", "text": "", "api_url": "parallel/yearly?hus=Charlie&family=MP1_1&type=celsius&year=2023"}], "col-center": [{"order": 0, "id": "G-txt-910177", "text": "err weerr weerr weerr we", "api_url": null}, {"order": 1, "id": "grid-438525", "text": "", "api_url": "grid/yearly?hus=Charlie&sensor=Temp_MP1_1_Pos1&type=celsius&year=2023"}, {"order": 2, "id": "grid-628976", "text": "", "api_url": "grid/monthly?hus=Charlie&sensor=Temp_MP1_1_Pos1&type=celsius&year=2023&month=01"}], "col-right": [{"order": 0, "id": "H-txt-974001", "text": "rerer er rererer er rererer er rererer er re", "api_url": null}, {"order": 1, "id": "horizon-487744", "text": "", "api_url": "horizon/daily?hus=Charlie&family=MP1_1&type=celsius&day=2023-02-07"}, {"order": 2, "id": "horizon-138015", "text": "", "api_url": "horizon/weekly?hus=Charlie&family=MP1_1&type=celsius&year=2023&week=14"}]} \ No newline at end of file diff --git a/py/Boards/Pilgatan/2222222.json b/py/Boards/Pilgatan/2222222.json deleted file mode 100644 index 70fc4b4..0000000 --- a/py/Boards/Pilgatan/2222222.json +++ /dev/null @@ -1 +0,0 @@ -{"Name": "2222222", "Description": "333333333", "Hus": "Pilgatan", "col-left": [], "col-center": [], "col-right": []} \ No newline at end of file diff --git a/py/Boards/Pilgatan/dddd.json b/py/Boards/Pilgatan/dddd.json deleted file mode 100644 index 94496dc..0000000 --- a/py/Boards/Pilgatan/dddd.json +++ /dev/null @@ -1 +0,0 @@ -{"Name": "dddd", "Description": "fff", "Hus": "Pilgatan", "col-left": [], "col-center": [], "col-right": []} \ No newline at end of file diff --git a/py/Boards/Pilgatan/ee.json b/py/Boards/Pilgatan/ee.json deleted file mode 100644 index 846e298..0000000 --- a/py/Boards/Pilgatan/ee.json +++ /dev/null @@ -1 +0,0 @@ -{"Name": "ee", "Description": "ee", "Hus": "Pilgatan", "col-left": [{"order": 0, "id": "parallel-5047360", "text": "", "api_url": "parallel/daily?hus=Pilgatan&family=SCv1&type=celsius&day=2023-06-06"}], "col-center": [{"order": 0, "id": "grid-175161", "text": "", "api_url": "grid/monthly?hus=Pilgatan&sensor=SCv1-1-Temp&type=celsius&year=2023&month=01"}], "col-right": [{"order": 0, "id": "horizon-970414", "text": "", "api_url": "horizon/daily?hus=Pilgatan&family=SCv1&type=celsius&day=2023-06-05"}]} \ No newline at end of file diff --git a/py/Boards/Pilgatan/rr.json b/py/Boards/Pilgatan/rr.json deleted file mode 100644 index a669ee4..0000000 --- a/py/Boards/Pilgatan/rr.json +++ /dev/null @@ -1 +0,0 @@ -{"Name": "rr", "Description": "rr", "Hus": "Pilgatan", "col-left": [], "col-center": [], "col-right": []} \ No newline at end of file diff --git a/py/output_import.txt b/py/output_import.txt new file mode 100644 index 0000000..ba95fba --- /dev/null +++ b/py/output_import.txt @@ -0,0 +1,283 @@ +Importing House: Charlie +Deleting and recreating 'Charlie.db'... +New card: 1; table name: Hus_Charlie_card_1 +Processing ../Data/Charlie/1-2022/1-2022-02.TXT... +Processing ../Data/Charlie/1-2022/1-2022-08.TXT... +Processing ../Data/Charlie/1-2022/1-2022-09.TXT... +Processing ../Data/Charlie/1-2022/1-2022-01.TXT... +Processing ../Data/Charlie/1-2022/1-2022-11.TXT... +Processing ../Data/Charlie/1-2022/1-2022-06.TXT... +Processing ../Data/Charlie/1-2022/1-2022-12.TXT... +Processing ../Data/Charlie/1-2022/1-2022-03.TXT... +Processing ../Data/Charlie/1-2022/1-2022-05.TXT... +Processing ../Data/Charlie/1-2022/1-2022-10.TXT... +Processing ../Data/Charlie/1-2022/1-2022-07.TXT... +Processing ../Data/Charlie/1-2022/1-2022-04.TXT... +New card: 4; table name: Hus_Charlie_card_4 +Processing ../Data/Charlie/4-2018/4-2018-10.TXT... +Processing ../Data/Charlie/4-2018/4-2018-12.TXT... +Processing ../Data/Charlie/4-2018/4-2018-08.TXT... +Processing ../Data/Charlie/4-2018/4-2018-07.TXT... +Processing ../Data/Charlie/4-2018/4-2018-09.TXT... +Processing ../Data/Charlie/4-2018/4-2018-11.TXT... +Processing ../Data/Charlie/4-2023/4-2023-08.TXT... +Processing ../Data/Charlie/4-2023/4-2023-07.TXT... +Processing ../Data/Charlie/4-2023/4-2023-02.TXT... +Processing ../Data/Charlie/4-2023/4-2023-04.TXT... +Processing ../Data/Charlie/4-2023/4-2023-03.TXT... +Processing ../Data/Charlie/4-2023/4-2023-01.TXT... +Processing ../Data/Charlie/4-2023/4-2023-05.TXT... +Processing ../Data/Charlie/4-2023/4-2023-06.TXT... +Processing ../Data/Charlie/1-2023/1-2023-04.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2023/1-2023-07.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2023/1-2023-06.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2023/1-2023-01.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2023/1-2023-03.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2023/1-2023-02.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2023/1-2023-08.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2023/1-2023-05.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2021/1-2021-08.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2021/1-2021-07.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2021/1-2021-11.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2021/1-2021-01.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2021/1-2021-06.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2021/1-2021-03.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2021/1-2021-04.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2021/1-2021-09.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2021/1-2021-05.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2021/1-2021-12.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2021/1-2021-10.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2021/1-2021-02.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/4-2022/4-2022-07.TXT... +Processing ../Data/Charlie/4-2022/4-2022-02.TXT... +Processing ../Data/Charlie/4-2022/4-2022-10.TXT... +Processing ../Data/Charlie/4-2022/4-2022-04.TXT... +Processing ../Data/Charlie/4-2022/4-2022-12.TXT... +Processing ../Data/Charlie/4-2022/4-2022-03.TXT... +Processing ../Data/Charlie/4-2022/4-2022-01.TXT... +Processing ../Data/Charlie/4-2022/4-2022-09.TXT... +Processing ../Data/Charlie/4-2022/4-2022-05.TXT... +Processing ../Data/Charlie/4-2022/4-2022-11.TXT... +Processing ../Data/Charlie/4-2022/4-2022-06.TXT... +Processing ../Data/Charlie/4-2022/4-2022-08.TXT... +Processing ../Data/Charlie/4-2020/4-2020-09.TXT... +Processing ../Data/Charlie/4-2020/4-2020-10.TXT... +Processing ../Data/Charlie/4-2020/4-2020-03.TXT... +Processing ../Data/Charlie/4-2020/4-2020-01.TXT... +Processing ../Data/Charlie/4-2020/4-2020-05.TXT... +Processing ../Data/Charlie/4-2020/4-2020-06.TXT... +Processing ../Data/Charlie/4-2020/4-2020-02.TXT... +Processing ../Data/Charlie/4-2020/4-2020-08.TXT... +Processing ../Data/Charlie/4-2020/4-2020-07.TXT... +Processing ../Data/Charlie/4-2020/4-2020-12.TXT... +Processing ../Data/Charlie/4-2020/4-2020-04.TXT... +Processing ../Data/Charlie/4-2020/4-2020-11.TXT... +Processing ../Data/Charlie/1-2018/1-2018-10.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2018/1-2018-09.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2018/1-2018-12.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2018/1-2018-11.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2018/1-2018-07.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2018/1-2018-08.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2019/1-2019-08.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2019/1-2019-12.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2019/1-2019-10.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2019/1-2019-09.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2019/1-2019-06.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2019/1-2019-07.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2019/1-2019-02.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2019/1-2019-05.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2019/1-2019-03.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2019/1-2019-01.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2019/1-2019-04.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2019/1-2019-11.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/4-2019/4-2019-09.TXT... +Processing ../Data/Charlie/4-2019/4-2019-07.TXT... +Processing ../Data/Charlie/4-2019/4-2019-12.TXT... +Processing ../Data/Charlie/4-2019/4-2019-03.TXT... +Processing ../Data/Charlie/4-2019/4-2019-11.TXT... +Processing ../Data/Charlie/4-2019/4-2019-01.TXT... +Processing ../Data/Charlie/4-2019/4-2019-02.TXT... +Processing ../Data/Charlie/4-2019/4-2019-05.TXT... +Processing ../Data/Charlie/4-2019/4-2019-08.TXT... +Processing ../Data/Charlie/4-2019/4-2019-06.TXT... +Processing ../Data/Charlie/4-2019/4-2019-04.TXT... +Processing ../Data/Charlie/4-2019/4-2019-10.TXT... +Processing ../Data/Charlie/1-2020/1-2020-09.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2020/1-2020-06.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2020/1-2020-08.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2020/1-2020-07.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2020/1-2020-04.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2020/1-2020-03.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2020/1-2020-02.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2020/1-2020-10.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2020/1-2020-01.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2020/1-2020-11.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2020/1-2020-12.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/1-2020/1-2020-05.TXT... + - Invalid file format; SKIPPING! 38 37 +Processing ../Data/Charlie/4-2021/4-2021-03.TXT... +Processing ../Data/Charlie/4-2021/4-2021-10.TXT... +Processing ../Data/Charlie/4-2021/4-2021-12.TXT... +Processing ../Data/Charlie/4-2021/4-2021-06.TXT... +Processing ../Data/Charlie/4-2021/4-2021-07.TXT... +Processing ../Data/Charlie/4-2021/4-2021-02.TXT... +Processing ../Data/Charlie/4-2021/4-2021-01.TXT... +Processing ../Data/Charlie/4-2021/4-2021-11.TXT... +Processing ../Data/Charlie/4-2021/4-2021-04.TXT... +Processing ../Data/Charlie/4-2021/4-2021-09.TXT... +Processing ../Data/Charlie/4-2021/4-2021-08.TXT... +Processing ../Data/Charlie/4-2021/4-2021-05.TXT... +Importing House: Pilgatan +Deleting and recreating 'Pilgatan.db'... +New card: v6; table name: Hus_Pilgatan_card_v6 +Processing ../Data/Pilgatan/v6-2023-08.TXT... +Processing ../Data/Pilgatan/v6-2022-06.TXT... +New card: v1; table name: Hus_Pilgatan_card_v1 +Processing ../Data/Pilgatan/v1-2022-10.TXT... +Processing ../Data/Pilgatan/v1-2021-12.TXT... +Processing ../Data/Pilgatan/v6-2021-02.TXT... + - Invalid file format; SKIPPING! 35 185 +Processing ../Data/Pilgatan/v6-2021-06.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v1-2022-03.TXT... +Processing ../Data/Pilgatan/v6-2021-07.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v6-2022-08.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v6-2021-05.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v1-2023-07.TXT... +Processing ../Data/Pilgatan/v1-2022-05.TXT... +Processing ../Data/Pilgatan/v1-2022-06.TXT... +Processing ../Data/Pilgatan/v1-2021-08.TXT... +Processing ../Data/Pilgatan/v6-2022-03.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v1-2023-01.TXT... +Processing ../Data/Pilgatan/v1-2021-05.TXT... + - Invalid file format; SKIPPING! 157 185 +Processing ../Data/Pilgatan/v1-2023-08.TXT... +Processing ../Data/Pilgatan/v1-2023-10.TXT... +Processing ../Data/Pilgatan/v1-2022-01.TXT... +Processing ../Data/Pilgatan/v1-2023-02.TXT... +Processing ../Data/Pilgatan/v6-2023-09.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v6-2021-03.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v6-2021-04.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v1-2021-06.TXT... +Processing ../Data/Pilgatan/v6-2022-10.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v1-2023-05.TXT... +Processing ../Data/Pilgatan/v6-2022-09.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v1-2023-04.TXT... +Processing ../Data/Pilgatan/v1-2021-03.TXT... + - Invalid file format; SKIPPING! 157 185 +Processing ../Data/Pilgatan/v1-2023-06.TXT... +Processing ../Data/Pilgatan/v6-2021-10.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v6-2021-11.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v1-2023-03.TXT... +Processing ../Data/Pilgatan/v1-2023-09.TXT... +Processing ../Data/Pilgatan/v6-2023-01.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v6-2021-08.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v6-2023-06.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v6-2021-09.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v6-2022-05.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v6-2022-04.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v1-2022-02.TXT... +Processing ../Data/Pilgatan/v6-2022-12.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v1-2022-12.TXT... +Processing ../Data/Pilgatan/v6-2022-07.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v6-2022-02.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v6-2021-12.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v6-2023-07.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v6-2023-10.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v1-2021-02.TXT... + - Invalid file format; SKIPPING! 9 185 +Processing ../Data/Pilgatan/v1-2021-04.TXT... + - Invalid file format; SKIPPING! 157 185 +Processing ../Data/Pilgatan/v1-2022-07.TXT... +Processing ../Data/Pilgatan/v1-2021-10.TXT... +Processing ../Data/Pilgatan/v6-2023-02.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v1-2021-11.TXT... +Processing ../Data/Pilgatan/v1-2022-11.TXT... +Processing ../Data/Pilgatan/v1-2022-09.TXT... +Processing ../Data/Pilgatan/v1-2022-08.TXT... +Processing ../Data/Pilgatan/v6-2023-03.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v1-2021-07.TXT... +Processing ../Data/Pilgatan/v6-2022-01.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v6-2023-04.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v6-2023-05.TXT... + - Invalid file format; SKIPPING! 147 185 +Processing ../Data/Pilgatan/v1-2021-09.TXT... +Processing ../Data/Pilgatan/v1-2022-04.TXT... +Processing ../Data/Pilgatan/v6-2022-11.TXT... + - Invalid file format; SKIPPING! 147 185 diff --git a/web-html/TraHus-Code_report.txt b/web-html/TraHus-Code_report.txt deleted file mode 100644 index 65903a8..0000000 --- a/web-html/TraHus-Code_report.txt +++ /dev/null @@ -1,93 +0,0 @@ -Trahus Code Report -2023-10-10 ---- -All Files: js/dash.js, ../py/import.py, ../py/main.py, dash.html, home.html, css/dash.css, config/config.js, config/datamap.js, ../py/README.md -Number of Lines: 3563 -Number of Variables: 182 -Number of Functions: 35 -Number of If Statements: 14 -Number of Switch Statements: 6 -Number of ForEach Statements: 12 ---- - -File: js/dash.js -Number of Lines: 1516 -Number of Variables: 174 -Number of Functions: 21 -Number of If Statements: 14 -Number of Switch Statements: 6 -Number of ForEach Statements: 11 ---- - -File: ../py/import.py -Number of Lines: 101 -Number of Variables: 12 -Number of Functions: 0 -Number of If Statements: 0 -Number of Switch Statements: 0 -Number of ForEach Statements: 0 ---- - -File: ../py/main.py -Number of Lines: 469 -Number of Variables: 15 -Number of Functions: 14 -Number of If Statements: 0 -Number of Switch Statements: 0 -Number of ForEach Statements: 0 ---- - -File: dash.html -Number of Lines: 1073 -Number of Variables: 11 -Number of Functions: 0 -Number of If Statements: 0 -Number of Switch Statements: 0 -Number of ForEach Statements: 0 ---- - -File: home.html -Number of Lines: 89 -Number of Variables: 8 -Number of Functions: 0 -Number of If Statements: 0 -Number of Switch Statements: 0 -Number of ForEach Statements: 1 ---- - -File: css/dash.css -Number of Lines: 103 -Number of Variables: 0 -Number of Functions: 0 -Number of If Statements: 0 -Number of Switch Statements: 0 -Number of ForEach Statements: 0 ---- - -File: config/config.js -Number of Lines: 12 -Number of Variables: 5 -Number of Functions: 0 -Number of If Statements: 0 -Number of Switch Statements: 0 -Number of ForEach Statements: 0 ---- - -File: config/datamap.js -Number of Lines: 80 -Number of Variables: 3 -Number of Functions: 0 -Number of If Statements: 0 -Number of Switch Statements: 0 -Number of ForEach Statements: 0 ---- - -File: ../py/README.md -Number of Lines: 120 -Number of Variables: 0 -Number of Functions: 0 -Number of If Statements: 0 -Number of Switch Statements: 0 -Number of ForEach Statements: 0 ---- - diff --git a/web-html/codereport.py b/web-html/codereport.py deleted file mode 100644 index b84c0e6..0000000 --- a/web-html/codereport.py +++ /dev/null @@ -1,101 +0,0 @@ -import sys -import re - -def analyze_file(file_path): - with open(file_path, 'r') as file: - lines = file.readlines() - - num_lines = len(lines) - variables = [] - functions = 0 - ifs = 0 - switches = 0 - foreachs = 0 - - for line in lines: - line = line.strip() - - # Check for variable declarations and add them to the list - var_declaration_match_js = re.match(r"^(var|let|const)\s+([\w$]+)", line) - var_declaration_match_py = re.match(r"^(?:.*)?(\w+)\s*=", line) - if var_declaration_match_js: - variable = var_declaration_match_js.group(2) - variables.append(variable) - elif var_declaration_match_py: - variable = var_declaration_match_py.group(1) - variables.append(variable) - - # Count the number of function declarations - function_declaration_match_js = re.match(r"^(function)\s+[\w$]+\(", line) - function_declaration_match_py = re.match(r"^(?:def)\s+(?:(?:\w+\s*\(.*\))|(?:\w+))", line) - if function_declaration_match_js or function_declaration_match_py: - functions += 1 - - # Count the number of if statements - if re.match(r"^(if)\s*\(", line): - ifs += 1 - - # Count the number of switch statements - if re.match(r"^(switch)\s*\(", line): - switches += 1 - - # Count the number of forEach statements - if re.match(r"^(.+)\.forEach\s*\(", line): - foreachs += 1 - - return { - 'file': file_path, - 'num_lines': num_lines, - 'num_variables': variables, - 'num_functions': functions, - 'num_ifs': ifs, - 'num_switches': switches, - 'num_foreachs': foreachs - } - -if __name__ == '__main__': - if len(sys.argv) < 2: - print('Please provide at least one JavaScript or Python file to analyze.') - sys.exit(1) - - total_lines = 0 - total_variables = [] - total_functions = 0 - total_ifs = 0 - total_switches = 0 - total_foreachs = 0 - - reports = [] - - for file_path in sys.argv[1:]: - analysis = analyze_file(file_path) - total_lines += analysis["num_lines"] - total_variables.extend(analysis["num_variables"]) - total_functions += analysis["num_functions"] - total_ifs += analysis["num_ifs"] - total_switches += analysis["num_switches"] - total_foreachs += analysis["num_foreachs"] - - report = f'File: {analysis["file"]}\n' - report += f'Number of Lines: {analysis["num_lines"]}\n' - report += f'Number of Variables: {len(set(analysis["num_variables"]))}\n' - report += f'Number of Functions: {analysis["num_functions"]}\n' - report += f'Number of If Statements: {analysis["num_ifs"]}\n' - report += f'Number of Switch Statements: {analysis["num_switches"]}\n' - report += f'Number of ForEach Statements: {analysis["num_foreachs"]}\n' - report += '---\n' - reports.append(report) - - print('Total Report:') - print('---') - print(f'All Files: {", ".join(sys.argv[1:])}') - print(f'Number of Lines: {total_lines}') - print(f'Number of Variables: {len(set(total_variables))}') - print(f'Number of Functions: {total_functions}') - print(f'Number of If Statements: {total_ifs}') - print(f'Number of Switch Statements: {total_switches}') - print(f'Number of ForEach Statements: {total_foreachs}') - print('---\n') - - for report in reports: - print(report) \ No newline at end of file diff --git a/web-html/test.html b/web-html/test.html deleted file mode 100644 index 3dcd326..0000000 --- a/web-html/test.html +++ /dev/null @@ -1,48 +0,0 @@ - - -
-