Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #23458: Batch conversion silently fails when the output is an array of files #26229

Conversation

pacebes
Copy link
Contributor

@pacebes pacebes commented Jan 24, 2025

Fix a bunch of different issue connected to local time signatures

Resolves: #23458

This PR allow json batch conversion files including an array of output files such as:

[
    {
        "in":"Score_23458.mscz",
	     "out":[
			"Score_23458_4.mp3",
			"Score_23458_1.pdf",
			"Score_23458_2.pdf",
			"Score_23458_3.pdf"
			]
    }
]
  • I signed the CLA
  • The title of the PR describes the problem it addresses
  • Each commit's message describes its purpose and effects, and references the issue it resolves
  • If changes are extensive, there is a sequence of easily reviewable commits
  • The code in the PR follows the coding rules
  • There are no unnecessary changes
  • The code compiles and runs on my machine, preferably after each commit individually
  • [] I created a unit test or vtest to verify the changes I made (if applicable)

@pacebes
Copy link
Contributor Author

pacebes commented Jan 24, 2025

HI
I only changed convertercontroller.cpp. I didn't change check.cpp, cmd.cpp, edit.cpp, systemlayout.cpp, timeSig-11.mscz, timesig_tests.cpp. I presume there were changed by a previous commit by [miiizen].

I don't know if I have done something wrong, sorry. I would appreciate any feedback about what I should do now !

Thanks

@cbjeukendrup
Copy link
Contributor

It looks like you accidentally amended the topmost commit on/from the master branch, instead of creating a new commit. To fix, you could rebase your branch again on top of the latest master; after that, the topmost commit should contain only your own changes, but still have the wrong commit message and author. I'd say the easiest way to fix that, is undoing the commit, using git reset HEAD~1 --soft, so that your changes are preserved in the working directory; then re-commit those changes with the appropriate message. Finally, once everything seems okay locally, do a force-push.

@pacebes pacebes force-pushed the 23458-Batchconversionsilentlyfails_ArrayOfOuputFiles branch from df32bb7 to add7f2a Compare January 24, 2025 20:59
@cbjeukendrup
Copy link
Contributor

Hm... it looks like the same thing happened again, now with a different commit. Are you perhaps using some Git software that somehow got stuck in "amend" commit mode?

@pacebes
Copy link
Contributor Author

pacebes commented Jan 24, 2025

I'm affraid I have even worsened the problem. Again, I don't know how
¿ Is there a way to delete this PR so I can create a new one ??

@cbjeukendrup
Copy link
Contributor

Deleting a PR isn't possible, but you can close this on and create a new one. But I don't expect that will change much.

But how are you creating the commit, are you using the command line, or a GUI program?

@pacebes
Copy link
Contributor Author

pacebes commented Jan 24, 2025

Hm... it looks like the same thing happened again, now with a different commit. Are you perhaps using some Git software that somehow got stuck in "amend" commit mode?

I don't know. I have used the same software as always. It's the first time I have had this problem. I will start again with a new MuseScore instance recreated from zero to avoid any problem.

Please, delete, or whatever necessary, this PR

@cbjeukendrup
Copy link
Contributor

You could do that, but that's probably unnecessarily time-consuming. Which software are you using?

@pacebes pacebes closed this Jan 24, 2025
@pacebes pacebes deleted the 23458-Batchconversionsilentlyfails_ArrayOfOuputFiles branch January 24, 2025 21:17
@pacebes
Copy link
Contributor Author

pacebes commented Jan 24, 2025

You could do that, but that's probably unnecessarily time-consuming. Which software are you using?

The same as always. I don't know what was my mistake. Anyway I have created a different pull request which has worked.


pacebes@cozuelos:/C/D/MS_23458$ git --version
git version 2.44.0.windows.1


Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Batch conversion silently fails (and buggy MSCX conversion)
3 participants