kae/musicmuster
1
0
Fork 0
Code Issues 28 Pull Requests Projects Releases 1 Activity
712 Commits 6 Branches 172 Tags 17 MiB
986257bef6
Commit Graph

352 Commits

Author SHA1 Message Date
Keith Edmunds
f2f99b5f79 Don't clear selection after adding as track 2022-08-24 17:51:01 +01:00
Keith Edmunds
f3ccab513b Put section headers in row 2 
Bug in Qt means automatically setting row height doesn't take into
account row spans, so putting headers in narrow column makes for tall
rows.
 2022-08-24 17:33:22 +01:00
Keith Edmunds
9f6eb2554a close edit box with return 2022-08-24 14:35:01 +01:00
Keith Edmunds
140722217b Add bitrates to database and display 2022-08-22 17:30:30 +01:00
Keith Edmunds
16b9ac19f0 Reset colours for each track on update_display 2022-08-21 17:00:42 +01:00
Keith Edmunds
1bae79265d Only adjust height of track rows with notes, not header rows 2022-08-17 22:18:25 +01:00
Keith Edmunds
c9cdbe2eb2 Remove commented code 2022-08-17 21:30:04 +01:00
Keith Edmunds
dfcdc0b9e8 Only resize track rows that have notes 2022-08-17 21:28:32 +01:00
Keith Edmunds
957450c0f6 Use QPlainTextEdit to edit cells 2022-08-17 21:28:15 +01:00
Keith Edmunds
d267b32c0d WIP trying things 2022-08-17 13:30:45 +01:00
Keith Edmunds
7b2b7fada5 WIP: replace notes TableWidgetItem with TextEdit 2022-08-17 12:52:09 +01:00
Keith Edmunds
4fad05db6b QTextEdit WIP 2022-08-16 12:30:03 +01:00
Keith Edmunds
c4be0b55d4 Make rows tall enough for notes, notes not bold 2022-08-16 10:46:42 +01:00
Keith Edmunds
88d0c11cbc Add track to header working 2022-08-15 21:36:04 +01:00
Keith Edmunds
a67b295f33 Reorder functions 2022-08-15 17:16:06 +01:00
Keith Edmunds
01a9ce342a Open wikipedia and songfacts from right click menu. 
Also reorganised right click menu.
 2022-08-15 17:06:01 +01:00
Keith Edmunds
8ec0911ce4 Insert commented placeholders for column sorting 2022-08-15 15:33:12 +01:00
Keith Edmunds
87e2f33f59 Scroll to put next, not current, track at top 2022-08-15 15:31:26 +01:00
Keith Edmunds
92bdf216ca Remove unused code 2022-08-15 14:19:56 +01:00
Keith Edmunds
73e728177e Import track working 2022-08-15 14:16:46 +01:00
Keith Edmunds
3b4cf5320d Remove unused code 2022-08-15 12:45:45 +01:00
Keith Edmunds
d5950ab29a Move selected / move unplayed working 2022-08-15 12:29:36 +01:00
Keith Edmunds
49bef912d2 Refactor playlist searching 2022-08-15 09:10:26 +01:00
Keith Edmunds
8fedb394a4 Fix artist search and match on row zero 2022-08-14 22:45:00 +01:00
Keith Edmunds
23af906d95 Remove all linting errors 2022-08-14 22:33:14 +01:00
Keith Edmunds
ebdb0d0a82 Much improved search now working 2022-08-14 22:19:15 +01:00
Keith Edmunds
b7c0fa94dd Fixed up some editing oddities 2022-08-14 13:22:54 +01:00
Keith Edmunds
29857e1185 Section timing now works 2022-08-14 11:40:17 +01:00
Keith Edmunds
56fb1aeb3d Add section header working 2022-08-14 11:01:20 +01:00
Keith Edmunds
dfc1344c69 Insert track working 2022-08-14 10:25:10 +01:00
Keith Edmunds
bdf7b0979d Cell editing rewrite 
Simplied, commented, no longer using custom signals, all functions
have type information.
 2022-08-13 22:12:22 +01:00
Keith Edmunds
cee84563fb WIP re editing 2022-08-13 21:13:03 +01:00
Keith Edmunds
0f8c648d1c Reorder functions alphabetically 2022-08-13 16:05:12 +01:00
Keith Edmunds
930efbbe6e Select next/prev row working 2022-08-13 15:21:09 +01:00
Keith Edmunds
c7034cf35a Create playlist working 2022-08-13 14:19:08 +01:00
Keith Edmunds
436f6b4fa9 Export playlist working 2022-08-13 13:32:25 +01:00
Keith Edmunds
066b20a571 Close playlist from menubar 2022-08-13 12:03:35 +01:00
Keith Edmunds
f1796451ae Refine save_playlist 2022-08-13 11:06:52 +01:00
Keith Edmunds
5ba70c9c6f Copy escaped track path 2022-08-13 11:06:20 +01:00
Keith Edmunds
7d71e8ce64 WIP: clocks working 2022-08-12 21:25:59 +01:00
Keith Edmunds
afc27c988d Move info tabs to below playlist 2022-08-12 11:57:34 +01:00
Keith Edmunds
70c2c18fb3 WIP (working on marking next track) 2022-08-11 14:43:19 +01:00
Keith Edmunds
c8194fad80 WIP: Implement move rows to playlist 2022-08-09 20:33:06 +01:00
Keith Edmunds
12541e1ff7 WIP: delete playlist rows working 2022-08-09 17:08:18 +01:00
Keith Edmunds
99409e8626 Right-click menu mostly working 
Still to implement:
 - Move to playlist
 - Remove row
 2022-08-07 20:20:56 +01:00
Keith Edmunds
89781c0a94 Revise menu, selected tracks duration summing OK 2022-08-07 16:15:11 +01:00
Keith Edmunds
91841cfc18 Clear drag mode with clear selection 2022-08-07 11:54:18 +01:00
Keith Edmunds
96255e83ea Enable drag-select, then drag selection 2022-08-06 22:41:18 +01:00
Keith Edmunds
32e81fb074 Save of new style playlist implemented but not tested 2022-08-06 21:17:11 +01:00
Keith Edmunds
7a14651bd7 Add function type hints. Section headers and note colours working 2022-08-05 21:52:17 +01:00
Keith Edmunds
4f03306aff SQLA2: WIP, playlists load 2022-08-03 21:11:02 +01:00
Keith Edmunds
b7111d8a3b SQLA2: WIP 2022-07-31 21:11:34 +01:00
Keith Edmunds
374a312797 SQLA2.0 schema updates, column width saves 2022-07-04 21:32:23 +01:00
Keith Edmunds
ab47bb0ab4 SQLA2.0 playlist column headers display 2022-07-03 20:59:10 +01:00
Keith Edmunds
bef4507ef6 SQLA2.0 rewrote logging 2022-07-03 15:17:25 +01:00
Keith Edmunds
ff2f0d576c SQLA2.0 main window displays 2022-07-02 21:47:42 +01:00
Keith Edmunds
8192e79d42 Make search case insensitive 2022-06-19 13:57:39 +01:00
Keith Edmunds
ce21322117 Clean up last played time in update_display 2022-06-18 18:34:06 +01:00
Keith Edmunds
cc395ea0df Move notes with tracks 
Fixes #106
 2022-06-18 18:24:09 +01:00
Keith Edmunds
709347db6b WIP: move notes with tracks 2022-06-18 11:09:47 +01:00
Keith Edmunds
8558de82b4 Fix bug stopping right-click menu 2022-06-10 15:28:12 +01:00
Keith Edmunds
b05e6d156d Add 'play with mplayer' to right click menu 
Fixes #118
 2022-06-10 14:57:01 +01:00
Keith Edmunds
c6d55344c7 Add 'move track to playlist' to right-click menu 
Fixes #117
 2022-06-05 14:30:29 +01:00
Keith Edmunds
fbe9c2ba94 Fix deleting multiple rows 
Also allow mass delete to be cancelled.

Fixes #115
 2022-06-04 22:56:38 +01:00
Keith Edmunds
70287d15a6 Implement search of playlist 2022-04-17 13:10:21 +01:00
Keith Edmunds
871598efe6 Code cleanup 2022-04-17 11:30:49 +01:00
Keith Edmunds
9e65eef621 Fix next start times 
Fixes #113
 2022-04-17 10:42:20 +01:00
Keith Edmunds
dd86c60636 Fix background color of row 1 on play 2022-04-08 22:53:48 +01:00
Keith Edmunds
79e1fdde27 Update note row number in db when it changes 2022-04-06 19:37:10 +01:00
Keith Edmunds
558a283e73 Detect music playing better 2022-04-05 21:03:28 +01:00
Keith Edmunds
805053b795 Improve performance selecting multiple tracks 2022-04-04 21:30:49 +01:00
Keith Edmunds
976eb91e30 Fix move selected tracks 2022-03-20 22:40:38 +00:00
Keith Edmunds
ebfdf98612 Polish typing, explicit returns to terminate context managers 2022-03-20 18:56:59 +00:00
Keith Edmunds
0fb1536055 Add section timing 2022-03-20 11:42:05 +00:00
Keith Edmunds
47f53428f6 Session fixes, MSS colour 2022-03-19 20:20:22 +00:00
Keith Edmunds
87f9e1e81b Merge 2022-03-14 20:10:59 +00:00
Keith Edmunds
f0b9ab4256 Fix up remove track from playlist 2022-03-09 21:40:47 +00:00
Keith Edmunds
a882d409cb Session sanity 2022-03-04 22:59:01 +00:00
Keith Edmunds
2186b3eb09 Record playlist opening and closing 
Also fixes #95
 2022-03-04 18:55:02 +00:00
Keith Edmunds
9c0371d41c Scroll current row to top; improve session handling 2022-03-04 18:17:57 +00:00
Keith Edmunds
f22f209bee Fix some type hints 2022-03-03 18:30:13 +00:00
Keith Edmunds
ca1b11b545 Fix select all (un)played tracks 2022-03-03 17:30:37 +00:00
Keith Edmunds
f22f2780a3 Fix move tracks 2022-03-02 20:37:27 +00:00
Keith Edmunds
a2fb6baba8 Rebase dev onto v2_id 2022-03-02 09:30:26 +00:00
Keith Edmunds
e8211414f9 V2 using ids rather than objects. Looking good. 2022-03-02 09:27:12 +00:00
Keith Edmunds
bc6a4c11cf Rebase dev onto v2_id 2022-03-02 09:27:10 +00:00
Keith Edmunds
a91309477b Rebase dev onto v2_id 2022-03-02 09:25:59 +00:00
Keith Edmunds
3a7b09f025 Code cleanups 2022-03-02 09:24:40 +00:00
Keith Edmunds
7f2dd68bce Rebase dev onto v2_id 2022-03-02 09:24:35 +00:00
Keith Edmunds
281a1d40bf Rebase dev onto v2_id 2022-03-02 09:23:56 +00:00
Keith Edmunds
cf58932fca Rebase dev onto v2_id 2022-03-02 09:16:07 +00:00
Keith Edmunds
ab9955b88a v2 tidy/refactor 2022-03-02 09:14:52 +00:00
Keith Edmunds
04c3c2efbc Refactoring 2022-03-02 09:13:11 +00:00
Keith Edmunds
a164f4c962 Rebase dev onto v2_id branch 2022-03-02 09:10:46 +00:00
Keith Edmunds
b283a3db07 Warn if colon in track path 2022-02-26 09:26:13 +00:00
Keith Edmunds
0ae5a99346 Merge branch 'notecolours' into dev 2022-02-05 21:33:25 +00:00
Keith Edmunds
441c47bdc2 Improve closing of playist tabs 
Fixes #90
 2022-02-05 20:00:10 +00:00
Keith Edmunds
1de7cefe72 Start configurable note colours 2022-02-05 18:42:35 +00:00
Keith Edmunds
80126440c8 Have notes span all columns 
Fixes #88
 2022-02-05 16:30:52 +00:00
Keith Edmunds
e256ceee0f Fixups from PyCharm 2022-02-05 16:14:10 +00:00
Keith Edmunds
62364fdaf1 Don't automatically select previously played tracks 
Fixes #89
 2021-10-17 12:08:13 +01:00
Keith Edmunds
1a4f842f1f Set last played time when playing track 
Fixes #83
 2021-09-26 08:47:00 +01:00
Keith Edmunds
69dd0235a0 Improve note colouring 
- Make case insensitive
 - If not starts with key, it's a match

Fixes #71
 2021-09-25 22:33:17 +01:00
Keith Edmunds
01b531aabf Scroll to show moved tracks on drag and drop 
Fixes #75
 2021-09-24 15:10:17 +01:00
Keith Edmunds
6ccfae0ab1 Add note colouring by keyword 
Fixes #71
 2021-09-24 14:58:35 +01:00
Keith Edmunds
d5d4361ec5 Further fixes to moving tracks between playlists 
Fixes: #38
 2021-09-10 11:48:30 +01:00
Keith Edmunds
c69aefef92 Save playlist after moving tracks to another list 
Fixes: #38
 2021-09-10 09:25:06 +01:00
Keith Edmunds
b46830f010 Tab text colours implemented 
Fixes #61
 2021-08-24 16:41:50 +01:00
Keith Edmunds
0a4730e5a7 Start implementing coloured text on tabs 2021-08-24 15:13:03 +01:00
Keith Edmunds
e4fe4b576e Clear start/end time for unplayed tracks above current 
Fixes #53
 2021-08-23 19:25:47 +01:00
Keith Edmunds
54cfb1191a Set start correctly when note edited 2021-08-23 15:19:52 +01:00
Keith Edmunds
d2e2144148 Remove inapplicable right-click menu items 2021-08-22 20:40:41 +01:00
Keith Edmunds
4267901630 Tweak right-click menu order 2021-08-22 19:13:33 +01:00
Keith Edmunds
c5f094443a Enable editing with Audacity 
Fixes #28
 2021-08-22 17:42:31 +01:00
Keith Edmunds
70d986f4ac Delete multiple rows 
Fixes #22
 2021-08-22 16:42:33 +01:00
Keith Edmunds
d9ccaf7caa Allow in-playist editing of title, artist and notes 
Fixes #27 #23
 2021-08-22 13:52:22 +01:00
Keith Edmunds
d767c879c6 Improve track info dialog box 2021-08-22 13:02:03 +01:00
Keith Edmunds
15ec91e446 Implement track rescanning 
Fixes #29
 2021-08-21 23:34:33 +01:00
Keith Edmunds
04788ef923 Implement copy track path 
Fixes #30
 2021-08-21 22:58:01 +01:00
Keith Edmunds
762a41bec6 Add total time of selected tracks to status bar 2021-08-21 14:22:55 +01:00
Keith Edmunds
d4f542cc29 Warn when trying to delete playing or next track 2021-08-15 11:17:09 +01:00
Keith Edmunds
2c9f041838 Show last track in playlist as playing when it is 
Fixes #52
 2021-08-15 11:06:08 +01:00
Keith Edmunds
90a8209551 Clean up of musicmuster.py 2021-08-15 10:40:28 +01:00
Keith Edmunds
c0752407b9 Handle next track not found consistently 
Highlight in red, don't set as next track.
Fixes #51
 2021-08-15 10:13:42 +01:00
Keith Edmunds
89d49f3e34 Merge 2021-08-14 18:44:05 +01:00
Keith Edmunds
e813a01e14 Improve track info box 2021-08-14 18:29:29 +01:00
Keith Edmunds
0e4de857d4 Update last played time during show 
Fixes #43
 2021-08-14 09:05:14 +01:00
Keith Edmunds
f0b59b8d23 Improve track info box. Fixes #46 2021-08-14 08:03:03 +01:00
Keith Edmunds
bc54be237b Check tracks for readability 
Check on load and on setting next track. Also provide info popup that
shows path.
 2021-08-10 08:18:05 +01:00
Keith Edmunds
a6a0b905d8 Put "last played" in place of "path" in playlist 2021-08-06 10:23:30 +01:00
Keith Edmunds
79f1a6afa3 Set track end time when setting next track. Fixes #33 2021-07-24 17:38:53 +01:00
Keith Edmunds
194306bc1d Order functions alphabetically 2021-07-24 17:29:59 +01:00
Keith Edmunds
199dada246 Save playlist column widths correctly 2021-07-03 10:15:39 +01:00
Keith Edmunds
8838c23c59 Add end times column. Fixes #24 2021-07-03 10:15:08 +01:00
Keith Edmunds
019e9f6cf3 Warn if leading silence over 500ms. Helps #11 2021-06-12 13:19:33 +01:00
Keith Edmunds
a80dc3f165 Select and move (un)played tracks. Fixes #4 2021-06-10 15:24:31 +01:00
Keith Edmunds
20bd178cf1 Differentiate between playlist tabs and db objects. Fixes #17 2021-06-06 16:40:10 +01:00
Keith Edmunds
0ca9bfec0a Segregate adding notes, tracks to onscreen playlist and database 2021-06-06 14:47:14 +01:00
Keith Edmunds
c5f5155332 Remove link to database object from playlist. Fixes #16 2021-06-06 11:36:27 +01:00
Keith Edmunds
5847345cdd Fix dimming of played tracks 2021-06-04 17:25:59 +01:00
Keith Edmunds
0cf649bb01 More 'detached session' fixes 2021-06-04 16:29:16 +01:00
Keith Edmunds
4bae0b8548 Hugely simplify save_playlist 
Don't try to work out how tracks may have moved. Instead, delete all
track from current playlist and re-add them.
 2021-06-04 15:45:29 +01:00
Keith Edmunds
a4bdbfccd0 Explicitly save playlist id in playlist 2021-06-04 15:44:29 +01:00
Keith Edmunds
6efc103ba5 More session fixups 2021-06-04 14:46:59 +01:00
Keith Edmunds
1abe377b4c Workaround for issue #10 2021-06-04 12:38:33 +01:00
Keith Edmunds
9eac5caf09 Separate out sessions. Starts addressing issue #10 
We were creating a session in the "Add from database" dialog, and then
creating another session (with the first still active) in _repaint().

Separated out sessions; also don't call _save_playlist from _repaint
as it doesn't really have any connection.
 2021-06-04 12:37:37 +01:00
Keith Edmunds
ad717aeb2c Fix error inserting note (and track?) above selected row 2021-06-02 08:27:45 +01:00
Keith Edmunds
4984ddec98 Use sessions correctly (fixes #5) 2021-06-02 08:26:54 +01:00
Keith Edmunds
326dc3655e Remove superfluous print statement 2021-06-01 18:32:32 +01:00
Keith Edmunds
4a24640666 Select next/previous non-note row with j/k 2021-05-31 12:08:50 +01:00
Keith Edmunds
453fe87bf9 Co-ordinate right-click play next - Fixes #2 2021-05-30 21:51:23 +01:00
Keith Edmunds
8366fed1be Fix no path being shown in playlist 2021-05-30 20:02:31 +01:00
Keith Edmunds
5d61b514b5 Remove current track highlighting when track ends 2021-05-30 19:48:26 +01:00
Keith Edmunds
30e3332795 Fix issue #1: Add playlist table headers 2021-05-29 12:55:51 +01:00
Keith Edmunds
21c7b234fb Fix adding a new note 2021-05-26 21:19:09 +01:00
Keith Edmunds
0465fb45c4 Move tracks between playlists 2021-05-16 22:56:11 +01:00
Keith Edmunds
51cc3bfbca Add database reference to playlist 
Also lots of cleaning up so that headers and playlist track colours
correct follow which playlist has the current/next track.
 2021-05-16 12:39:19 +01:00
Keith Edmunds
ca9d0c75f8 proof of concept 2021-05-04 19:32:39 +01:00
Keith Edmunds
cc273f305b update requirements 2021-05-03 17:01:49 +01:00
Keith Edmunds
ffef3cd1c7 Close playlists; refine opening playlists 2021-05-02 23:35:00 +01:00
Keith Edmunds
cc9b168e81 Add buttons for Wikipedia and Songfacts 2021-05-02 16:10:44 +01:00
Keith Edmunds
ca995c8794 Change playlist menu names 2021-05-02 09:04:34 +01:00
Keith Edmunds
90b322f282 Scroll current track to centre of screen when played 2021-04-30 02:55:54 +01:00
Keith Edmunds
51b2dd43e5 Tabbed playlists working 2021-04-29 22:20:24 +01:00
Keith Edmunds
4d852f7a4e Tabbed playlist proof-of-concept (via menu Test) 2021-04-27 18:34:03 +01:00
Keith Edmunds
e086dd35c6 Improve behaviour of select playlist dialog 2021-04-25 18:39:47 +01:00
Keith Edmunds
839f550e4a Rewrite of save_playlist (extensive) 2021-04-25 17:23:36 +01:00
Keith Edmunds
d113b9fc20 Name internal functions with underscore in playlists.py 2021-04-25 09:44:32 +01:00
Keith Edmunds
b2fe5f6f38 Maintain track headers when changing playlists 2021-04-25 00:04:01 +01:00
Keith Edmunds
d157dbd7c0 Check next track is readable 2021-04-25 00:02:41 +01:00
Keith Edmunds
7fb76417d0 Fix showing track start times 2021-04-21 08:40:30 +01:00
Keith Edmunds
f452362c2a Add volume and stop, improve fading 2021-04-21 08:39:49 +01:00
Keith Edmunds
1c078a2d69 Show track start times rather than end times 2021-04-19 22:22:02 +01:00
Keith Edmunds
04f5a07c3e Better DEBUG messages 2021-04-19 21:01:27 +01:00
Keith Edmunds
2f991da6ea Handle window closes better 2021-04-19 21:00:38 +01:00
Keith Edmunds
bb4d1d466c Rework buttons for main window 2021-04-19 07:53:39 +01:00
Keith Edmunds
c9c7331bb2 Use Python 3.8 f strings for DEBUG log 2021-04-16 06:06:08 +01:00
Keith Edmunds
00fbfa334e Ensure tracks are visible when added to playlist 2021-04-11 15:40:01 +01:00
Keith Edmunds
b049f3207d Ensure all rows in playlist are updated. 2021-04-11 15:13:39 +01:00
Keith Edmunds
3f7cac07e3 Bug fix: inserting timed note didn't refresh times 2021-04-10 23:12:01 +01:00
Keith Edmunds
5d65bebd1e Cleaned up save_playlist(); improved DEBUG logging. 2021-04-10 19:57:51 +01:00
Keith Edmunds
f61c6fd74f Implement deleting of notes 2021-04-10 17:45:54 +01:00
Keith Edmunds
62f6775e90 Let notes have times 2021-04-10 17:20:09 +01:00
Keith Edmunds
00ebcb09ea Implement test menu and functions 2021-04-10 13:54:04 +01:00
Keith Edmunds
8d3c989c18 Keep row selection when adding tracks/notes 2021-04-10 12:54:32 +01:00
Keith Edmunds
2d247db543 Correctly handle determining whether a playlist row is selected. 2021-04-10 12:54:08 +01:00
Keith Edmunds
9ee5730b14 Fix up add from database dialog 2021-04-10 12:25:21 +01:00
Keith Edmunds
301bee4ba5 Reinstate row spanning after note move 2021-04-10 11:25:36 +01:00
Keith Edmunds
69ba659d73 Improve DEBUG messages 2021-04-10 11:22:34 +01:00
Keith Edmunds
ee0bfceeae Code review for V1.0.0 2021-04-09 23:21:42 +01:00
Keith Edmunds
9068f46d40 Add file to db and playlist 2021-04-08 07:38:10 +01:00
Keith Edmunds
67b3b804e1 Playlist creation and changing fragilely working 2021-04-07 22:07:53 +01:00
Keith Edmunds
15a540234e Update headers as part of repaint 2021-04-06 23:57:20 +01:00
Keith Edmunds
5dc3575ce3 Implement right click delete 2021-04-06 23:51:47 +01:00
Keith Edmunds
5a446919e3 Store playlist order; allow reordering and save 2021-04-06 16:40:54 +01:00
Keith Edmunds
8ccded2a57 Can add notes, not saved to db 2021-04-04 23:25:31 +01:00
Keith Edmunds
8f749fa78d Add stop command; some refactoring 2021-04-04 22:17:09 +01:00
Keith Edmunds
8cdeb3d1a9 Implement end times in playlist 2021-04-04 21:50:20 +01:00
Keith Edmunds
233cce7800 Headers, timer colours, all looking good 2021-04-04 19:49:33 +01:00
Keith Edmunds
ba9b9cc936 Dim played tracks 2021-04-04 13:25:55 +01:00