Commit Graph

246 Commits

Author SHA1 Message Date
Phill
f79e8803c9 Word of Worship file importer fixes / rework 2019-06-28 19:09:25 +01:00
john
8a4c349f9e Tidy up auto verse order generation 2019-06-27 13:01:11 +01:00
john
66712873b4 Singing The Faith Importer - Add the importer, and tests 2019-06-17 09:44:34 +01:00
Phill
5482e70e6d Break out json and path refactors from fixes branch 2019-05-22 07:47:00 +01:00
Phill
15f3b0fcca Seperate some fixes out of annother branch 2019-05-04 10:13:29 +01:00
Bastian Germann
be1a398f7b License change to GPL-3.0-or-later 2019-04-13 15:00:22 +02:00
Phill
98f7c28d65 Add proxy settings to ftw. Option to skip sample data
bzr-revno: 2853
2019-03-28 22:03:32 +01:00
Philip Ridout
8789073eb3 Linting changes 2019-03-17 20:35:11 +00:00
Philip Ridout
50598e9058 pathlib cleanups 2019-03-10 21:01:39 +00:00
Philip Ridout
07ffb7c0d0 Fix choruses, bridges & etc. being imported as verses in CCLI txt files 2019-03-03 13:32:31 +00:00
Philip Ridout
670c06db60 Add proxy settings button to FTW, ftw refactors, a few fixes! 2019-02-27 21:12:16 +00:00
Tomas Groth
fa4ec96054 Updated to 2019 in copyright headers 2019-02-14 16:09:09 +01:00
Tomas Groth
e7526f1e59 merge trunk 2018-10-30 20:46:55 +01:00
dc5a9590ba Fix up some more linting issues 2018-10-26 21:13:33 -07:00
d1c4cea777 Fix linting issues 2018-10-26 18:40:20 -07:00
ec479e589b Fix a bunch of linting issues (which should also help resolve other circular dependencies) 2018-10-26 16:15:31 -07:00
aa3b0c4bcc HEAD 2018-10-01 21:39:42 -07:00
Tomas Groth
56a811c094 More pycodestyle fixes 2018-07-04 22:42:55 +02:00
Tomas Groth
318e90f893 Fixes for pycodestyle 2018-07-02 22:38:47 +02:00
Tim Bentley
41f35f52e3 End of 2017 2017-12-29 09:15:48 +00:00
Tim Bentley
5495ba8cf3 plugins done and tested 2017-12-28 08:08:12 +00:00
Phill Ridout
a866bc5499 Test fixes 2017-12-22 22:35:09 +00:00
Phill Ridout
f629504b5b Mostly minor path tidy-ups 2017-12-17 04:29:53 +00:00
Phill Ridout
a268c4476b Couple fixes for bugs caused by controll chars 2017-10-28 19:58:34 +01:00
Phill Ridout
960ddedc6f make tidy text part of core.\nRemove redundant (since py3) re.UNICODE flag
Fixes: https://launchpad.net/bugs/1727517
2017-10-28 11:04:09 +01:00
d5ab3340eb Move widgets to a widgets module 2017-10-23 15:09:57 -07:00
bc0ade07e0 HEAD 2017-10-09 19:29:56 -07:00
b406cfd5a8 Phase 1 complete 2017-10-07 00:05:07 -07:00
Philip Ridout
c5a6fd9e31 Pep fixes 2017-10-01 00:06:30 +01:00
Philip Ridout
76bbc4500a Pep fixes 2017-09-30 23:51:49 +01:00
Philip Ridout
70e50f4aaa Pep fixes 2017-09-30 23:45:24 +01:00
Philip Ridout
9bb2935208 Tidy ups 2017-09-30 22:45:54 +01:00
Philip Ridout
ab49b8b8ad pathlib changes for song plugin 2017-09-30 21:16:30 +01:00
Philip Ridout
f8a68c23d0 Enable JSON to handle unsupported objects and tests 2017-08-25 21:03:25 +01:00
Philip Ridout
b384e6f2fa Convert some more utility fuctions over to using the pathlib 2017-08-12 18:45:56 +01:00
Philip Ridout
63bd98372a Move applocation over to using pathlib 2017-08-01 21:59:41 +01:00
Philip Ridout
2915a8f0e7 Head 2017-06-01 07:18:47 +01:00
Tomas Groth
4a3e4e1ad4 Fix songshowplus encoding issue. 2017-05-30 22:05:18 +02:00
Philip Ridout
a4ffbce6c3 HEAD 2017-05-30 19:50:39 +01:00
Philip Ridout
a24d5f8f15 TODO's TODOne, and a few other cleanups 2017-05-30 19:42:35 +01:00
Gary Talent
549ec886a5 Add support for importing EasyWorship 6 databases
bzr-revno: 2741
Fixes: https://launchpad.net/bugs/1675641
2017-05-22 12:07:07 -07:00
Tomas Groth
3287027315 Unbreak the songimport tests... 2017-05-11 22:01:43 +02:00
Tomas Groth
ad94e7c19f Added some more comments for songbeamer import and added support for author type. 2017-05-11 21:53:47 +02:00
Tomas Groth
e00e8117a9 Added detection of songbeamer tags, if they are manually inserted or not. 2017-05-07 22:26:03 +02:00
Tomas Groth
d60ea23de6 Try to fix songbeamer chord imports 2017-05-05 20:48:01 +02:00
Tomas Groth
a39240badf Replace songbeamers flatnote representationwith the actual flatnote sign. 2017-05-01 21:16:39 +02:00
Tomas Groth
c97aaab763 Fix an issue with songbeamer import where chords were pushed a line. 2017-04-11 10:43:45 +02:00
Tomas Groth
111cff72a1 trunk 2017-04-11 10:05:13 +02:00
Gary Talent
80c8e5b71f Cleanup EW6 invalid directory messages. 2017-03-31 23:45:12 -05:00
Gary Talent
2cbf1422d1 Fix error message for invalid EasyWorship 6 database directories.
The old one was copied from the EasyWorship 2009 database importer.
2017-03-31 23:41:01 -05:00
Gary Talent
e07693c95f EW6 Importer: Cleanup array cropping. 2017-03-31 23:26:14 -05:00
Gary Talent
5a36232c93 Add option to import EasyWorship 6 database from any level in the database directory tree. 2017-03-30 19:53:31 -05:00
Gary Talent
76000b4e26 EW6 Importer: Replace appended string paths with os.path.join. 2017-03-30 15:48:23 -05:00
Gary Talent
3f56ca482e Remove empty lines from EW6 importer methods. 2017-03-30 14:45:38 -05:00
Gary Talent
b4f461c54f Fix EW6 changes to conform to PEP8. 2017-03-29 16:52:56 -05:00
Gary Talent
5209daab45 Update to trunk. 2017-03-29 16:40:54 -05:00
4f6afb71d1 Fix the author_type import properly 2017-03-27 22:15:05 -07:00
4183f186ce Various fixes and things:
- Update SongSelect importer to handle changes to the SongSelect site
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix OpenLP importer to support song numbers
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
...

bzr-revno: 2728
2017-03-24 19:33:45 -07:00
a2a51b95dd Various fixes:
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
- Fix song database upgrades by moving upgrades 4 and 5 into 6 and writing some damage control
- Add a CHANGELOG.rst file
2017-03-22 21:43:13 -07:00
Simon Hanna
172625b193 Make sure songbeamer songs are decoded correctly 2017-03-13 13:16:12 +01:00
324652c347 Port some bugfixes from 2.4 to trunk 2017-03-09 22:42:38 -07:00
Tomas Groth
dbdc4a6712 Made to possible to disable chord support completely. Now everything between [ and ] is considered a chord. 2017-02-26 22:14:49 +01:00
Tomas Groth
56d2eaa4c2 trunk 2017-01-25 22:17:27 +01:00
Tomas Groth
02ee7ac7dc Fix an issue with easyslide import not handling verse order correctly. 2017-01-12 22:31:01 +01:00
Tomas Groth
706d52ad5d Improve the songbeamer encoding detection. 2017-01-12 22:04:53 +01:00
Tomas Groth
32d3c0038e Handle a few videopsalm quirks 2017-01-12 22:03:06 +01:00
Tim Bentley
74ca42e220 Yet another year goes by 2016-12-31 11:01:36 +00:00
Tomas Groth
5468def937 pep8 fixes 2016-11-15 22:13:52 +01:00
Tomas Groth
bbc670cc36 trunk 2016-11-15 21:53:50 +01:00
Tomas Groth
88519e2cc1 Added a test for chordpro import. 2016-09-25 21:27:46 +02:00
Tomas Groth
1406224a8f Added support for import of ChordPro 2016-09-25 11:30:00 +02:00
Tomas Groth
453bd53657 Fix the tidy_text method to not insert linefeeds, which is not allowed in XML. 2016-09-23 23:46:43 +02:00
Gary Talent
ebbfd39dbd Add validity checking to EasyWorship 6 importer. 2016-09-22 01:19:46 -05:00
Gary Talent
08416db1d3 Fix unicode skip issue with the strip_rtf function.
Add doc comment to EasyWorship6 import method.
2016-09-20 22:10:28 -05:00
Tomas Groth
4754d1eb8b Try to fix a mediashout import issue by replacing the line tab char with 2 linebreaks. 2016-09-18 17:28:55 +02:00
Gary Talent
5435dfc5cc Add test for EasyWorship 6 importer. 2016-09-16 23:39:40 -05:00
Gary Talent
b5f08bf54c Add support for importing EasyWorship6 databases 2016-09-07 00:15:37 -05:00
Tomas Groth
825a703cd0 pep8 fixes 2016-08-19 17:05:44 +02:00
Tomas Groth
c463c46cf6 Fixed various bugs in the songbeamer chord import, and added a test. 2016-08-19 16:51:23 +02:00
Tomas Groth
b35d300708 Added support for importing chords and verseorder from songbeamer. 2016-08-18 21:55:22 +02:00
Tomas Groth
25c268145a merge trunk 2016-08-18 21:04:44 +02:00
Tomas Groth
449b46ab3d merge trunk 2016-07-27 21:01:57 +02:00
Tomas Groth
b781fa6169 some cleanups, comments and a test. 2016-07-26 21:02:35 +02:00
Tomas Groth
de54ec2715 merge trunk 2016-07-25 22:48:30 +02:00
Tomas Groth
611c970eb0 More work on chords 2016-07-25 22:07:07 +02:00
Tomas Groth
f5da7e2a2b Make easyslide importer try to recover when reading non-standard xml. Fixes bug 1588822.
Fixes: https://launchpad.net/bugs/1588822
2016-07-07 22:51:25 +02:00
Tomas Groth
69951133fe Fix handeling of control chars and escaped chars in VideoPsalm import. Fixes bug 1594945.
Fixes: https://launchpad.net/bugs/1594945
2016-07-07 22:47:57 +02:00
Tomas Groth
1992a51339 More pylint-fixes 2016-07-06 21:48:57 +02:00
Tomas Groth
99e6ab6657 Fix various issues as suggested by pylint 2016-07-05 22:31:29 +02:00
second@tgc.dk
45d2640159 "Fix various pyodbc related issues. Fixes bug 1590657.
Fix of tracback during SongPro import. Fixes bug 1582152.
Fix traceback during songshowplus import. Fixes bug 1585489.
Skip PresentationManager files we do not support."

bzr-revno: 2677
Fixes: https://launchpad.net/bugs/1582152, https://launchpad.net/bugs/1585489, https://launchpad.net/bugs/1590657
2016-06-16 22:12:27 +02:00
Tomas Groth
4fc4fa8969 pep8 fixes 2016-06-14 22:36:51 +02:00
Tomas Groth
41c0d3fcf9 Fix various pyodbc related issues. Fixes bug 1590657.
Fixes: https://launchpad.net/bugs/1590657
2016-06-14 21:11:57 +02:00
Tomas Groth
e89803a3ad merge trunk 2016-06-14 21:06:54 +02:00
0d2745a1d1 Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left. 2016-06-07 09:35:06 +02:00
9fdcd30c65 Convert strings from python2 to python3 in plugins part 3 2016-05-27 01:13:14 -07:00
Tomas Groth
3163d33543 Fix of tracback during SongPro import. Fixes bug 1582152.
Fixes: https://launchpad.net/bugs/1582152
2016-05-26 15:03:00 +02:00
Tomas Groth
fd4cfd1eaa Fix traceback during songshowplus import. Fixes bug 1585489.
Fixes: https://launchpad.net/bugs/1585489
2016-05-25 09:04:41 +02:00
Tomas Groth
72120d8b2f Skip PresentationManager files we do not support. 2016-05-24 13:49:08 +02:00
Tomas Groth
90f927ae7f Fix traceback while handling traceback in videopsalm import 2016-05-24 13:40:01 +02:00
7262345912 Fix bug #1557514 by auto-detecting the columns of the tables in the songs database
Fixes: https://launchpad.net/bugs/1557514
2016-04-27 20:58:35 +02:00