raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity
15,709 Commits 5 Branches 0 Tags 296 MiB
efa1114fa6
Commit Graph

15709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raoul Snyman
c4681e60e3 Major overhaul of how threading in OpenLP works. Rather than messing around with threads yourself, you create a worker object descended from ThreadWorker, implement start() (and stop() if it's a long-running thread), and run it using run_thread(). 
Changes related to thread API:

- WebSocket was refactored (mostly into the worker)
- HttpServer was refactored a bit
- CheckMediaWorker was refactored a bit
- Version check refactored
- SongSelect search refactored
- New _wait_for_threads() method...

bzr-revno: 2807
 2018-01-07 12:27:26 -07:00
Raoul Snyman
c5b7b46a55 Fix the tests I now added back in 2018-01-07 11:07:22 -07:00
Raoul Snyman
7e99381dba Fix some issues highlighted by Tim and Phill, and added a file that was erroneously removed 2018-01-07 10:50:29 -07:00
Raoul Snyman
4fae7f829d Fix the tests I broke 2018-01-06 22:24:55 -07:00
Raoul Snyman
35fd553024 If XDG is available, log files belong in the real cache dir 2018-01-06 21:45:13 -07:00
Raoul Snyman
738e8e0283 Remove the Qt style option - it never worked anyway 2018-01-06 21:40:40 -07:00
Raoul Snyman
954d1618bc Fix the direction of the '--no-web-server' command line option 2018-01-06 21:36:45 -07:00
Raoul Snyman
7b28262987 Fix a mismatch of arguments in a call to reload_bibles() 2018-01-06 21:36:17 -07:00
Phill Ridout
dd6887d388 HEAD 2018-01-06 09:56:10 +00:00
Phill Ridout
e1400dc227 Finally merge the save lite method in to the 'standard' save method' 2018-01-06 09:55:19 +00:00
Raoul Snyman
5612be1b5a Stop the HTTP server properly too 2018-01-06 00:02:45 -07:00
Raoul Snyman
f693d3aa37 Call close() to stop everything properly 2018-01-05 21:41:49 -07:00
Raoul Snyman
3e9073275a Fix an issue with versions of websockets > 4.0 2018-01-04 22:32:12 -07:00
Raoul Snyman
2d009f1884 Change a log.error to a log.exception 2018-01-04 14:13:24 -07:00
Raoul Snyman
0601cf1543 Move cleanup to after thread wait; Figured out why the webserver was exiting early 2018-01-04 14:03:15 -07:00
Raoul Snyman
db7ff02abb Move the thread code to after the event has been accepted 2018-01-04 10:17:20 -07:00
Raoul Snyman
544c396bbc Fix some linting issues 2018-01-04 00:00:55 -07:00
Raoul Snyman
64b26774a1 For some reason, the thumbnail downloader was still using a string path 2018-01-03 23:37:59 -07:00
Raoul Snyman
13885b1a39 HEAD 2018-01-03 23:10:20 -07:00
Raoul Snyman
f1575dd50b Updated various thread usages 2018-01-03 23:01:35 -07:00
Ken Roberts
ce88f70c01 -------------------------------------------------------------------------------- 
lp:~alisonken1/openlp/pjlink2-n (revision 2806)
https://ci.openlp.io/job/Branch-01-Pull/2409/                          [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2310/                  [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/105/                   [SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/29/                   [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-ma...

bzr-revno: 2806
 2018-01-03 18:15:49 +00:00
Ken Roberts
d97ca9e54b Merge trunk 2018-01-02 16:35:14 -08:00
Simon Hanna
399b40745d Fixed the version checking to be more robust 
* Strip the response so empty responses that contain whitespace are in fact empty
* Change http to https to result in one less query
* Add test for responses containing white space
* Add .cache to bzrignore (generated by pytest when tests fail)

bzr-revno: 2805
 2018-01-02 21:00:54 +00:00
Tim Bentley
02d9daa5dc Update the year to 2018 
Add some missing copyright files
Reorder and fix the imports for all files.
Fix a timing issue with the mac build which makes it fail all the time.

lp:~trb143/openlp/textcleanups (revision 2812)
https://ci.openlp.io/job/Branch-01-Pull/2406/                          [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2307/                  [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/102/                   [SUCCESS]
https://ci.openlp.io/job/Branch-03...

bzr-revno: 2804
 2018-01-01 17:18:46 +00:00
Phill Ridout
a1ea35c4e7 continued refactor of saving packaged files 2017-12-30 08:08:10 +00:00
Simon Hanna
d490a32f94 Remove sleep statement 2017-12-29 14:59:08 +01:00
Simon Hanna
3bbfd4dfc1 Add .cache to bzrignore 2017-12-29 11:40:07 +01:00
Simon Hanna
9c45e4afdf Add test for fix 2017-12-29 11:38:51 +01:00
Simon Hanna
0f23d12d72 Fix version checking if response is empty 2017-12-29 11:27:58 +01:00
Tim Bentley
162742927e head fixes 2017-12-29 10:19:33 +00:00
Tim Bentley
2edfe63a59 pep8 2017-12-29 10:02:13 +00:00
Tim Bentley
acb309c54a more fixes 2017-12-29 09:52:58 +00:00
Tim Bentley
8997fc07e0 ci fixes 2017-12-29 09:40:15 +00:00
Tim Bentley
41f35f52e3 End of 2017 2017-12-29 09:15:48 +00:00
Tim Bentley
367f8f9315 add missing text 2017-12-28 09:34:04 +00:00
Tim Bentley
b503634e7c missing copyrights 2017-12-28 08:31:35 +00:00
Tim Bentley
cfc487d623 tests 2017-12-28 08:27:44 +00:00
Tim Bentley
f9e20e2108 tests 2017-12-28 08:22:55 +00:00
Tim Bentley
5495ba8cf3 plugins done and tested 2017-12-28 08:08:12 +00:00
Phill Ridout
4b1965520c Start on refactoring file saving 2017-12-27 16:06:36 +00:00
Ken Roberts
33da95371f Cleanups and assert updates 2017-12-25 20:14:39 -08:00
Ken Roberts
598a373929 PJLink Updates N 2017-12-25 00:44:30 -08:00
Phill
6e2bc427a7 Move song test resources 
lp:~phill-ridout/openlp/moar_test_cleanups (revision 2809)
https://ci.openlp.io/job/Branch-01-Pull/2390/                          [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2291/                  [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/86/                    [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/11/                   [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Bra...

bzr-revno: 2803
 2017-12-24 09:57:44 +00:00
Phill Ridout
bbc1bf3732 few missed changes 2017-12-24 08:52:53 +00:00
Phill Ridout
a4054d3c2c Move song test resources to a 'song' sub directory' 
A few other minor changes
 2017-12-24 08:42:46 +00:00
Phill Ridout
b87a797b39 Move song test resource files 2017-12-24 08:22:41 +00:00
Phill
71c3c715bf Some more pathlib refactors. 
Test tidy ups

lp:~phill-ridout/openlp/pathlib11 (revision 2806)
https://ci.openlp.io/job/Branch-01-Pull/2384/                          [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2285/                  [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/80/                    [WAITING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03a-Build-Source/5/                    [WAITING]
[SUCCESS]
https://ci.openlp.i...

bzr-revno: 2802
 2017-12-24 08:01:43 +00:00
Phill Ridout
cb53a266ce HEAD 2017-12-24 07:40:07 +00:00
Phill Ridout
5f1212b68e Pep8 2017-12-24 07:33:22 +00:00
Tim Bentley
43f4a9b6ee All tests migrated to assert from self.assert except projection 
All tests pass on linux with pytest and nose2

lp:~trb143/openlp/asserts2 (revision 2839)
https://ci.openlp.io/job/Branch-01-Pull/2381/                          [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2282/                  [SUCCESS]
  File "./scripts/jenkins_script.py", line 256, in <module>
    main()
  File "./scripts/jenkins_script.py", line 252, in main
    jenkins_trigger.print_output(can_continue=args.alw...

bzr-revno: 2801
 2017-12-24 07:27:40 +00:00