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

library/serato/seratofeature: Fix relative paths on OSX (and on Linux) #2659

Merged
merged 2 commits into from
Apr 16, 2020

Conversation

Holzhaus
Copy link
Member

Fixes the path issue on OSX that was reported here: #2480 (comment)

@bengl3rt
Copy link

Unfortunately still not able to load tracks from the main Serato DB on the boot drive. Loading one from the external drive still works.

Attaching a debug log where I first tried to load a track from the main DB, then from the external.
serato.txt

@Holzhaus
Copy link
Member Author

Thanks for checking. You can right click the column headers in the serato library view and un-hide the location column to see the file path detected by mixxx. It's incorrect I assume?

@Holzhaus
Copy link
Member Author

Btw, if you're not using CMake please try a clean build to make sure it builds the correct version.

@bengl3rt
Copy link

Yep, all clean all the time now - though I'm not even sure I trust that (it's scons -c, right?) because the following rebuilds complete suspiciously quickly.

Unhiding the location column makes all the tracks listed in the Serato library disappear, along with some scary looking errors coming out in the console. Debug log attached.
serato-2.txt

@Holzhaus
Copy link
Member Author

Unhiding the location column makes all the tracks listed in the Serato library disappear, along with some scary looking errors coming out in the console. Debug log attached.
serato-2.txt

Ouch. This query looks like it comes from BaseTrackCache. @uklotzde Any ideas what causes them?

@Holzhaus
Copy link
Member Author

Unhiding the location column makes all the tracks listed in the Serato library disappear, along with some scary looking errors coming out in the console. Debug log attached.
serato-2.txt

Ouch. This query looks like it comes from BaseTrackCache. @uklotzde Any ideas what causes them?

Ping @uklotzde

@Holzhaus
Copy link
Member Author

@bengl3rt Yikes, I used the wrong ifdef. Despite OSX being a unix system, we actually only set the __UNIX__ compile definition for Linux and BSD only. No wonder it doesn't work for you.

@Holzhaus
Copy link
Member Author

@bengl3rt please retest

@bengl3rt
Copy link

@bengl3rt please retest

Done and working as expected. Location column shows the correct path for files on internal and external drives, and they play and load as expected.

I think a previous version of this patch, or possibly all the hopping around between different branches I've been doing, severely mangled my database so I did blow out ~/Library/Application Support/Mixxx and let it rescan everything. Upon doing that the scary SQL database error went away.

@Be-ing Be-ing merged commit 36276a3 into mixxxdj:master Apr 16, 2020
@Be-ing
Copy link
Contributor

Be-ing commented Apr 16, 2020

Yay! Thanks for testing @bengl3rt!

@@ -450,10 +450,25 @@ QString parseDatabase(mixxx::DbConnectionPoolPtr dbConnectionPool, TreeItem* dat
databaseRootDir.cdUp();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is unnecessary now, right?

Copy link
Member Author

@Holzhaus Holzhaus Apr 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. QDir:root() is a static method and always returns the system drive letter. I think you can move your home directory onto a different drive on Windows, right?

@uklotzde
Copy link
Contributor

Unhiding the location column makes all the tracks listed in the Serato library disappear, along with some scary looking errors coming out in the console. Debug log attached.
serato-2.txt

Ouch. This query looks like it comes from BaseTrackCache. @uklotzde Any ideas what causes them?

Ping @uklotzde

Is this issue still unresolved?

@Holzhaus
Copy link
Member Author

Holzhaus commented Apr 16, 2020

Unhiding the location column makes all the tracks listed in the Serato library disappear, along with some scary looking errors coming out in the console. Debug log attached.
serato-2.txt

Ouch. This query looks like it comes from BaseTrackCache. @uklotzde Any ideas what causes them?

Ping @uklotzde

Is this issue still unresolved?

@bengl3rt:

Upon doing that the scary SQL database error went away.

I think not, although it might indicate a potential problem for users that update from 2.2. If your still have a 2.2 database lying around, it might be a good idea to check that the upgrade doesn't cause any issues.

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

Successfully merging this pull request may close these issues.

4 participants