vladsaveliev commited on
Commit
e0a5cc6
1 Parent(s): 4a3121a

Fix adding header to text

Browse files
Files changed (2) hide show
  1. README.md +2 -2
  2. guitar_tab.py +25 -18
README.md CHANGED
@@ -43,10 +43,10 @@ dataset_info:
43
  dtype: string
44
  splits:
45
  - name: train
46
- num_bytes: 955323858
47
  num_examples: 188297
48
  download_size: 75369951
49
- dataset_size: 955323858
50
  - config_name: all
51
  features:
52
  - name: file
 
43
  dtype: string
44
  splits:
45
  - name: train
46
+ num_bytes: 973765964
47
  num_examples: 188297
48
  download_size: 75369951
49
+ dataset_size: 973765964
50
  - config_name: all
51
  features:
52
  - name: file
guitar_tab.py CHANGED
@@ -165,7 +165,7 @@ class Example:
165
 
166
 
167
  class Builder(datasets.GeneratorBasedBuilder):
168
- VERSION = datasets.Version("1.4.0")
169
 
170
  def _info(self):
171
  return datasets.DatasetInfo(
@@ -212,7 +212,7 @@ def _parse_examples(tex: str) -> List[Example]:
212
  examples = []
213
  data = {}
214
 
215
- def _parse_track_header(k, v):
216
  if k == "instrument":
217
  data['instrument_name'] = INSTRUMENT_MAP.get(int(v), "unknown")
218
  data['instrument_number'] = int(v)
@@ -222,9 +222,9 @@ def _parse_examples(tex: str) -> List[Example]:
222
  data['frets'] = int(v)
223
 
224
  lines = (l_.strip() for l_ in tex.splitlines() if l_.strip())
225
- header_lines = list(itertools.takewhile(lambda l: l != ".", lines))
226
 
227
- for line in header_lines:
228
  assert line.startswith("\\")
229
  line = line.lstrip("\\")
230
  kv = line.split(" ", 1)
@@ -243,23 +243,27 @@ def _parse_examples(tex: str) -> List[Example]:
243
  elif k == "tempo":
244
  data['tempo'] = int(v)
245
  else:
246
- _parse_track_header(k, v)
247
 
248
  track_header_lines = []
249
  track_tex_lines = []
250
 
251
- def _add_example():
252
  nonlocal data, track_header_lines, track_tex_lines
253
- if track_tex_lines:
254
- data['track_number'] = (track_number := len(examples) + 1)
255
- data['track_name'] = v if v else f"Track {track_number}"
256
- data['text'] = (
257
- '\n'.join(track_header_lines + [" ".join(track_tex_lines)])
 
 
 
258
  )
259
- examples.append(Example(**data))
260
- data = {}
261
- track_header_lines = []
262
- track_tex_lines = []
 
263
 
264
  for line in lines:
265
  if line.startswith("\\"):
@@ -270,10 +274,13 @@ def _parse_examples(tex: str) -> List[Example]:
270
  k = kv[0]
271
  v = None
272
  if k == "track":
273
- _add_example()
 
274
  else:
275
- _parse_track_header(k, v)
 
276
  else:
277
  track_tex_lines.append(line)
278
- _add_example()
 
279
  return [t for t in examples if t.text]
 
165
 
166
 
167
  class Builder(datasets.GeneratorBasedBuilder):
168
+ VERSION = datasets.Version("1.4.1")
169
 
170
  def _info(self):
171
  return datasets.DatasetInfo(
 
212
  examples = []
213
  data = {}
214
 
215
+ def _parse_track_header_line(k, v):
216
  if k == "instrument":
217
  data['instrument_name'] = INSTRUMENT_MAP.get(int(v), "unknown")
218
  data['instrument_number'] = int(v)
 
222
  data['frets'] = int(v)
223
 
224
  lines = (l_.strip() for l_ in tex.splitlines() if l_.strip())
225
+ song_header_lines = list(itertools.takewhile(lambda l: l != ".", lines))
226
 
227
+ for line in song_header_lines:
228
  assert line.startswith("\\")
229
  line = line.lstrip("\\")
230
  kv = line.split(" ", 1)
 
243
  elif k == "tempo":
244
  data['tempo'] = int(v)
245
  else:
246
+ _parse_track_header_line(k, v)
247
 
248
  track_header_lines = []
249
  track_tex_lines = []
250
 
251
+ def _new_example():
252
  nonlocal data, track_header_lines, track_tex_lines
253
+ data['track_number'] = (track_number := len(examples) + 1)
254
+ data['track_name'] = v if v else f"Track {track_number}"
255
+ data['text'] = (
256
+ '\n'.join(
257
+ song_header_lines +
258
+ ["."] +
259
+ track_header_lines +
260
+ [" ".join(track_tex_lines)]
261
  )
262
+ )
263
+ examples.append(Example(**data))
264
+ data = {}
265
+ track_header_lines = []
266
+ track_tex_lines = []
267
 
268
  for line in lines:
269
  if line.startswith("\\"):
 
274
  k = kv[0]
275
  v = None
276
  if k == "track":
277
+ if track_tex_lines:
278
+ _new_example()
279
  else:
280
+ _parse_track_header_line(k, v)
281
+ track_header_lines.append(line)
282
  else:
283
  track_tex_lines.append(line)
284
+ if track_tex_lines:
285
+ _new_example()
286
  return [t for t in examples if t.text]