Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Harjot1Singh committed Jan 15, 2018
2 parents d1763cb + 9e0036e commit 8723433
Show file tree
Hide file tree
Showing 19 changed files with 339 additions and 30 deletions.
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,12 @@ The schema can be modified in the `migrations/schema.js` file.
### Structure

JSON files for `Raags`, `Sources`, `Writers`, and `Line_Types` can be found in the `seeds` folder.
Changing a value here will be reflected everwhere else. The `array index + 1` represents the id used
Changing a value here will be reflected everwhere else. The `(array index) + 1` represents the id used
for each relation in other tables.

Lines are split by `sources/source name/first ang in batch/ang number.json`.

Banis can be added in `banis.json`. To define the lines a bani contains,
add a `start_banis` key with an array of the index of the banis that start there,
and a corresponding `end_banis` with the same in the ending line's definition in
the corresponding ang file.

Banis can be added by adding a named JSON file to the `banis` folder. To define the lines a bani contains, each bani should contain a list of objects with `start_line` and `end_line`, referring to the files in `sources`. Note that for now, these lines have to be updated if new lines are added or removed from the source files.

Shabads are split by `shabads/source name/writer name.json`.

Expand Down Expand Up @@ -72,3 +68,4 @@ You can use an application like [DBeaver](https://dbeaver.jkiss.org/) to view th
## Todo

- Redo English translations under an open license
- Automatically update the Bani files if a line change in sources occurs
26 changes: 26 additions & 0 deletions seeds/banis/Aarti (Standard).json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[
{
"start_line": 554,
"end_line": 567
},
{
"start_line": 30041,
"end_line": 30050
},
{
"start_line": 30069,
"end_line": 30079
},
{
"start_line": 57725,
"end_line": 57733
},
{
"start_line": 30087,
"end_line": 30097
},
{
"start_line": 69609,
"end_line": 69613
}
]
14 changes: 14 additions & 0 deletions seeds/banis/Akhand Paath (Bhog).json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[
{
"start_line": 60435,
"end_line": 60624
},
{
"start_line": 39316,
"end_line": 39525
},
{
"start_line": 379,
"end_line": 385
}
]
6 changes: 6 additions & 0 deletions seeds/banis/Anand Sahib (40).json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"start_line": 39316,
"end_line": 39525
}
]
10 changes: 10 additions & 0 deletions seeds/banis/Anand Sahib (6 Pauris with Salok).json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"start_line": 39316,
"end_line": 39525
},
{
"start_line": 379,
"end_line": 385
}
]
14 changes: 0 additions & 14 deletions seeds/banis/Another Example Bani.json

This file was deleted.

178 changes: 178 additions & 0 deletions seeds/banis/Asa di Var.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
[
{
"start_line": 20378,
"end_line": 20383
},
{
"start_line": 20882,
"end_line": 20901
},
{
"start_line": 20384,
"end_line": 20387
},
{
"start_line": 20902,
"end_line": 20936
},
{
"start_line": 20388,
"end_line": 20391
},
{
"start_line": 20937,
"end_line": 21000
},
{
"start_line": 20396,
"end_line": 20400
},
{
"start_line": 21001,
"end_line": 21038
},
{
"start_line": 20401,
"end_line": 20404
},
{
"start_line": 21039,
"end_line": 21064
},
{
"start_line": 20405,
"end_line": 20408
},
{
"start_line": 21065,
"end_line": 21120
},
{
"start_line": 20413,
"end_line": 20417
},
{
"start_line": 21121,
"end_line": 21151
},
{
"start_line": 20418,
"end_line": 20421
},
{
"start_line": 21152,
"end_line": 21180
},
{
"start_line": 20422,
"end_line": 20425
},
{
"start_line": 21181,
"end_line": 21209
},
{
"start_line": 20426,
"end_line": 20429
},
{
"start_line": 21210,
"end_line": 21234
},
{
"start_line": 20430,
"end_line": 20434
},
{
"start_line": 21235,
"end_line": 21262
},
{
"start_line": 20435,
"end_line": 20438
},
{
"start_line": 21263,
"end_line": 21288
},
{
"start_line": 20439,
"end_line": 20442
},
{
"start_line": 21289,
"end_line": 21323
},
{
"start_line": 20443,
"end_line": 20446
},
{
"start_line": 21324,
"end_line": 21358
},
{
"start_line": 20447,
"end_line": 20451
},
{
"start_line": 21359,
"end_line": 21374
},
{
"start_line": 20452,
"end_line": 20455
},
{
"start_line": 21375,
"end_line": 21397
},
{
"start_line": 20456,
"end_line": 20459
},
{
"start_line": 21398,
"end_line": 21422
},
{
"start_line": 20460,
"end_line": 20463
},
{
"start_line": 21423,
"end_line": 21443
},
{
"start_line": 20464,
"end_line": 20468
},
{
"start_line": 21444,
"end_line": 21457
},
{
"start_line": 20469,
"end_line": 20472
},
{
"start_line": 21458,
"end_line": 21484
},
{
"start_line": 20473,
"end_line": 20476
},
{
"start_line": 21485,
"end_line": 21496
},
{
"start_line": 20477,
"end_line": 20480
},
{
"start_line": 21497,
"end_line": 21511
}
]
10 changes: 10 additions & 0 deletions seeds/banis/Chaupai Sahib (Medium).json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"start_line": 81121,
"end_line": 81183
},
{
"start_line": 69610,
"end_line": 69613
}
]
6 changes: 6 additions & 0 deletions seeds/banis/Chaupai Sahib (Standard).json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"start_line": 81121,
"end_line": 81173
}
]
6 changes: 6 additions & 0 deletions seeds/banis/Jaap Sahib.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"start_line": 60628,
"end_line": 61071
}
]
6 changes: 6 additions & 0 deletions seeds/banis/Jap Ji Sahib.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"start_line": 1,
"end_line": 385
}
]
10 changes: 0 additions & 10 deletions seeds/banis/Japji Sahib.json

This file was deleted.

6 changes: 6 additions & 0 deletions seeds/banis/Lava(n).json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"start_line": 33100,
"end_line": 33124
}
]
6 changes: 6 additions & 0 deletions seeds/banis/Raag Mala.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"start_line": 60564,
"end_line": 60624
}
]
38 changes: 38 additions & 0 deletions seeds/banis/Rehras Sahib (Standard).json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
[
{
"start_line": 20477,
"end_line": 20480
},
{
"start_line": 21211,
"end_line": 21216
},
{
"start_line": 386,
"end_line": 533
},
{
"start_line": 81121,
"end_line": 81173
},
{
"start_line": 69609,
"end_line": 69613
},
{
"start_line": 39316,
"end_line": 39525
},
{
"start_line": 60552,
"end_line": 60562
},
{
"start_line": 41296,
"end_line": 41304
},
{
"start_line": 23131,
"end_line": 23144
}
]
6 changes: 6 additions & 0 deletions seeds/banis/Salok M9.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"start_line": 60435,
"end_line": 60551
}
]
6 changes: 6 additions & 0 deletions seeds/banis/Sohila Sahib.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"start_line": 534,
"end_line": 589
}
]
6 changes: 6 additions & 0 deletions seeds/banis/Sukhmani Sahib.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"start_line": 11590,
"end_line": 13616
}
]
Loading

0 comments on commit 8723433

Please sign in to comment.