Fix left barlines

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ireal-musicxml",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "iReal Pro to MusicXML converter.",
   "author": "Karim Ratib <[email protected]> (https://github.com/infojunkie)",
   "license": "GPL-3.0-only",

src/cli/cli.js

@@ -14,10 +14,6 @@ import { Playlist } from '../lib/parser.js';
 import { Converter } from '../lib/converter.js';
 
 const options = {
-  'ireal': {
-    type: 'string',
-    short: 'i',
-  },
   'output': {
     type: 'string',
     short: 'o',

src/lib/converter.js

@@ -359,7 +359,7 @@ export class Converter {
         }
 
         // Add starting barline.
-        this.measure.barlines.push(this.convertBarline(cell.bars, 'left'));
+        this.measure.barlines.push(this.convertBarline(cell.bars, 'left', (isNewSystem(cellIndex) || this.emptyCellNewSystem) ? 'regular' : undefined));
 
         // If we're still repeating bars, copy the previous bar now.
         if (this.barRepeat) {
@@ -754,8 +754,8 @@ export class Converter {
     };
   }
 
-  convertBarline(bars, location) {
-    let style = 'regular';
+  convertBarline(bars, location, forced = undefined) {
+    let style = location === 'left' ? 'none' : 'regular';
     let repeat = null;
     if (bars.match(/\[|\]/)) {
       style = 'light-light';
@@ -777,7 +777,7 @@ export class Converter {
       _name: 'barline',
       _attrs: { 'location': location },
       _content: [{
-        'bar-style': style
+        'bar-style': forced ?? style
       }, { ...(repeat && {
         _name: 'repeat',
         _attrs: { 'direction': repeat, ...(repeat === 'backward' && { 'times': this.repeats }) }

test/bugs.spec.js

@@ -10,7 +10,7 @@ import { Converter } from '../src/lib/converter.js';
 let jazz = null;
 
 before(() => {
-  jazz = new Playlist(fs.readFileSync('test/data/jazz.txt', 'utf-8'));
+  jazz = new Playlist(fs.readFileSync('test/data/jazz1460.txt', 'utf-8'));
 })
 
 describe('Bug Fixes', () => {

test/cli.spec.js

@@ -7,7 +7,7 @@ const exec = util.promisify(require('child_process').exec);
 
 describe('cli', () => {
   it('should run successfully', async () => {
-    const execResult = await exec('node src/cli/cli.js test/data/jazz.txt --songs=Blues');
+    const execResult = await exec('node src/cli/cli.js test/data/jazz1460.txt --songs=Blues');
     const output = execResult.stderr;
     console.log(output);
     assert.match(output, /Generating 502 Blues/g);

test/converter.spec.js

@@ -14,7 +14,7 @@ let blues = null;
 let pop = null;
 
 before(() => {
-  jazz = new Playlist(fs.readFileSync('test/data/jazz.txt', 'utf-8'));
+  jazz = new Playlist(fs.readFileSync('test/data/jazz1460.txt', 'utf-8'));
   playlist = new Playlist(fs.readFileSync('test/data/playlist.html', 'utf-8'));
   strange = new Playlist(fs.readFileSync('test/data/strange.html', 'utf-8'));
   blues = new Playlist(fs.readFileSync('test/data/blues.txt', 'utf-8'));

test/parser.spec.js

@@ -19,8 +19,8 @@ describe('Parser', function() {
   });
 
   it('should parse the iReal Pro Jazz playlist', function() {
-    const playlist = new Playlist(fs.readFileSync('test/data/jazz.txt', 'utf-8'));
-    assert.strictEqual(playlist.songs.length, 1409);
+    const playlist = new Playlist(fs.readFileSync('test/data/jazz1460.txt', 'utf-8'));
+    assert.strictEqual(playlist.songs.length, 1459);
   });
 
   it('should parse the irealbook:// format', function() {