Support multiple library folders. #21

kain88-de · 2013-06-22T14:20:51Z

Enable Mixxx to handle several Library Folders and add an option to move them to another location without dataloss.

Directories can also be added from the browse-view

… untested

Because Fieldscaper add '' marks around a direcotry entry Qt can't work with them straight after I get them out of the library. To make everything work again I just need to replace ' with an empty string

kain88-de · 2013-06-22T14:22:46Z

src/library/dao/directorydao.cpp

+                  "REPLACE(location," %escaper.escapeString(oldFolder)%","% escaper.escapeString(newFolder)%")"
+                  ", directory="
+                  "REPLACE(directory,"% escaper.escapeString(oldFolder)%","% escaper.escapeString(newFolder)%") "
+                  "WHERE track_locations.maindir_id = "%QString::number(dirId) );


I'm having problems with this part of the code. When I run the relocation query inside of mixxx it does not work. But when I use the generated query directly with sqlite3 everything is fine. This worked before so I have no clue what the error might be

You're probably hitting issues because the column values are double-escaped (see my other comments on using FieldEscaper).

(Also, the commented bindValues below don't need FieldEscaper)

The new algorithm walks up the directory tree and check if he finds the possible parent. This is better and easier then the old version. I also adopted the tests to create real temporary folders.

kain88-de · 2013-12-05T00:06:08Z

I already fixed some of you comments. I'll do the rest tomorrow. Before we merge this I would really like to run my tests on windows and for this I need the libchromaprint binary from the buildserver. According to the docs Qt handles the differences in Windows and Unix style filepaths but I want to be sure before merging this.

Also for the corner case it would be really nice if you can explain it. I figure since I'm the dev for this feature I should understand possible corner cases

rryan · 2013-12-05T02:43:15Z

Thanks! I think you can test the symlinks using QFile::link to create links between your temp directories.

As for the slashes, Qt definitely handles this for us. This is slightly embarrassing but I couldn't figure out how to push the latest winlib with TortoiseBzr. It kept failing and I gave up a few months ago. I'll try again.

rryan · 2013-12-05T03:18:28Z

OK, I pushed the latest 1.12 dependencies here: https://github.com/mixxxdj/winlib. It was high time we ditched Bazaar for hosting winlib anyway.

kain88-de · 2013-12-05T08:36:35Z

Ah nice. I updated the wiki with the new location of winlib. I'll have time on the weekend to test everything

rryan · 2013-12-05T15:59:40Z

Cool - I actually think it'd be fine if you merge it now (after fixing the other minor comments I made). Qt definitely handles the path separators for us (we would have had tons of other problems if it didn't). Plus any fixes there wouldn't be to the data model so it wouldn't risk corrupting user data for those running at HEAD.

I'd like to merge this before features_key so that you don't have to deal w/ merge conflicts :).

kain88-de · 2013-12-05T19:20:37Z

Ok I fixed your last comments. You can merge it if you want. It will take me some time to get the tests running on windows.

rryan · 2013-12-05T20:32:01Z

Great, thanks!

Support multiple library folders.

daschuer · 2013-12-05T21:13:26Z

src/dlgprefplaylistdlg.ui

@@ -272,6 +283,7 @@
  <tabstop>checkbox_ID3_sync</tabstop>
  <tabstop>checkBox_use_relative_path</tabstop>
  <tabstop>checkBox_show_rhythmbox</tabstop>
+  <tabstop>checkBox_show_banshee</tabstop>
  <tabstop>checkBox_show_itunes</tabstop>
  <tabstop>checkBox_show_traktor</tabstop>
 </tabstops>


Hi @kain88-de,

It looks like we have merge issues on this file in master now.
Can you have a look at it?

What is:
Support Mixxx by counting and sharing bundled song playback and outbound link statistics

Haven't we removed it?

what merge conflict? for me everything works fine.

Ah, you have fixed the promo issues in master. I have now fixes the external library alignment as well. So this issue is solved.

QT < 5.6 compatible getDevicePixelRatioF()

equalizer section

Update downloads page with RC1 links and analytics conversions.

Max Linke and others added 25 commits May 24, 2013 17:55

multiply Library Folders feature from library_features branch, builds…

096fe2f

… untested

fixed update code and removed useless stuff from initial patch

6155f3f

dlgprefplaylist uses library instance instead of sql connection

36d5dfd

basic track adding works

5981597

directoryDAO query don't work with bindvalue

d605e8c

directory doa works with bindValue now

6cd27e2

Because Fieldscaper add '' marks around a direcotry entry Qt can't work with them straight after I get them out of the library. To make everything work again I just need to replace ' with an empty string

remove checksums from schema.xml

667d90e

code clean up

23c4611

remove relocate feature

afa8e43

Merge branch 'master' into multiplyFolders

588e6cc

remove more code

de9357a

remove more code

ee2019b

added MAINDIR_ID to missingtablemodel.cpp

a103513

clean up mess

edec5e2

Merge branch 'master' into multiplyFolders

2ca37f0

remove old merge conflicts

2f48da4

still problems with relocating a directory

63b1349

Merge branch 'master' into multiplyFolders

fc4217a

Merge branch 'master' into multiplyFolders

e7155e8

merge with master branch

31457ec

Merge branch 'master' into multiplyFolders

168a445

Merge branch 'master' into multiplyFolders

e28c83b

Merge remote-tracking branch 'upstream/master' into multiplyFolders

e34367b

readd library scheme to allow for several directories

c6fc3b3

try to fix relocate query

8e6434a

kain88-de reviewed Jun 22, 2013
View reviewed changes

change algorithm to detect child folders

4de6580

The new algorithm walks up the directory tree and check if he finds the possible parent. This is better and easier then the old version. I also adopted the tests to create real temporary folders.

Use QSet instead of Qlist to avoid duplicates

5a38b92

rryan added a commit that referenced this pull request Dec 5, 2013

Merge pull request #21 from kain88-de/multiplyFolders

6c15845

Support multiple library folders.

rryan merged commit 6c15845 into mixxxdj:master Dec 5, 2013

daschuer reviewed Dec 5, 2013
View reviewed changes

kain88-de deleted the multiplyFolders branch December 7, 2013 14:40

ywwg mentioned this pull request Dec 20, 2013

Refactor the engine to process samples in the range of [-1.0, 1.0]. Fixes Bug #1204039. #126

Merged

esbrandt added a commit to mixxxdj/manual that referenced this pull request Feb 2, 2014

Support multiple library folders. Follow up to mixxxdj/mixxx#21

dbf8c4f

daschuer mentioned this pull request Dec 28, 2014

Spinny updates #440

Merged

daschuer mentioned this pull request Jul 23, 2015

Library concurency refactoring #629

Closed

daschuer mentioned this pull request Aug 13, 2017

Multi-broadcasting #1300

Merged

19 tasks

daschuer mentioned this pull request Jun 11, 2018

Library Layout Redesign Single pane #1117

Closed

11 tasks

Be-ing added a commit that referenced this pull request May 15, 2019

Merge pull request #21 from daschuer/rgb_overview_scaling

246f136

QT < 5.6 compatible getDevicePixelRatioF()

uklotzde mentioned this pull request Jan 16, 2020

Replace deprecated QSignalMapper with lambda expressions #2427

Merged

Holzhaus referenced this pull request in Holzhaus/mixxx Aug 23, 2020

Merge pull request #21 from daschuer/eq_pref

bb37b28

equalizer section

ronso0 mentioned this pull request Sep 4, 2022

Effects: allow clearing chains with empty '---' preset #10859

Merged

ronso0 mentioned this pull request May 9, 2023

qopenglwindow-based replacement of qglwidget, full glsl shader based waveforms, vumeters and spinnies #10989

Merged

Swiftb0y mentioned this pull request Aug 7, 2023

GNOME 44 (Wayland): Context menu on tree items in side bar closes immediately #11576

Closed

m0dB pushed a commit to m0dB/mixxx that referenced this pull request Jan 21, 2024

Merge pull request mixxxdj#21 from mixxxdj/2.1rc

91e1986

Update downloads page with RC1 links and analytics conversions.

acolombier mentioned this pull request May 22, 2024

Simplify waveform preferences panel #13226

Open

m0dB mentioned this pull request Nov 10, 2024

thread sanitizer warning BrowseThread / BrowseTableModel #13861

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support multiple library folders. #21

Support multiple library folders. #21

kain88-de commented Jun 22, 2013

kain88-de Jun 22, 2013

rryan Jun 25, 2013

kain88-de commented Dec 5, 2013

rryan commented Dec 5, 2013

rryan commented Dec 5, 2013

kain88-de commented Dec 5, 2013

rryan commented Dec 5, 2013

kain88-de commented Dec 5, 2013

rryan commented Dec 5, 2013

daschuer Dec 5, 2013

kain88-de Dec 5, 2013

daschuer Dec 5, 2013

Support multiple library folders. #21

Support multiple library folders. #21

Conversation

kain88-de commented Jun 22, 2013

kain88-de Jun 22, 2013

Choose a reason for hiding this comment

rryan Jun 25, 2013

Choose a reason for hiding this comment

kain88-de commented Dec 5, 2013

rryan commented Dec 5, 2013

rryan commented Dec 5, 2013

kain88-de commented Dec 5, 2013

rryan commented Dec 5, 2013

kain88-de commented Dec 5, 2013

rryan commented Dec 5, 2013

daschuer Dec 5, 2013

Choose a reason for hiding this comment

kain88-de Dec 5, 2013

Choose a reason for hiding this comment

daschuer Dec 5, 2013

Choose a reason for hiding this comment