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

9286 Commits

Author SHA1 Message Date
Andreas Preikschat 661424d202 r1989 2012-06-15 17:28:16 +02:00
Raoul Snyman 0ad713407b Fixed bug #1013215: Catch a previously uncaught NotImplementedError and do nothing so that OpenLP realises that VLC is not available. 
Fixes: https://launchpad.net/bugs/1013215
 2012-06-14 23:20:55 +02:00
Andreas Preikschat 6a23b75b8c reverted changes 2012-06-14 17:46:47 +02:00
Raoul Snyman 0d3f425c5b Changed parsing of Bible Gateway HTML. 
bzr-revno: 1989
 2012-06-13 20:56:25 +01:00
Andreas Preikschat 21fc0f9533 fixed docstring 2012-06-13 17:53:54 +02:00
Andreas Preikschat 1f5ac7f483 fixed ticket 729 and fixed variables to camelCase 2012-06-13 17:44:33 +02:00
Raoul Snyman 4e0b9c30d3 Fixed bug #991150: BibleGateway has new HTML, so we need to change our parsing. This now parses the new HTML correctly. 
Fixes: https://launchpad.net/bugs/991150
 2012-06-12 23:25:31 +02:00
Dave Warnock e0c5fabc5a Amend DB Error OperationError 
bzr-revno: 1988
 2012-06-11 18:33:57 +01:00
Stevan Pettit 40daccfdb4 Added code to allow OpenLP to run as a portable app. 
bzr-revno: 1987
 2012-06-11 18:30:54 +01:00
Dave Warnock b9b0d83a00 renamed tryCount local variable to try_count 2012-06-11 15:11:53 +01:00
Dave Warnock 913b0433f6 This update is a tidy up of the code that fixed bug #927473 
Changes are made due to the following issues:

- the code assumed that exception OperationalError would only be thrown by  mySQL temporarily disappearing. However, other dbms can throw this exception and usually for errors that mean a retry will also fail.

- the code repeated the actual code of the method within the exception handler. This means code duplication and also that any new exceptions  are not handled by the same exception handler so for example their transaction will not get rolled back.

- not all potential dbms exceptions were caught and so in some cases the database transaction was not rolled back

The solution is to retry transactions where an OperationalError is thrown. Currently these are retried up to 3 times before the error is logged and the method returns false. By retrying the transaction we ensure that the same transaction code with the same exception handlers is used each time.

An additional catchall exception has been added where there is a transaction to ensure that it is rolled back. As with the OperationError this throws the exception back up the stack.
 2012-06-10 22:45:02 +01:00
Stevan Pettit c306573309 Minor changes to logging, variable name 2012-06-10 15:53:46 -04:00
Stevan Pettit 8365d6f589 Fixed some cosmedics 2012-06-10 10:29:50 -04:00
Andreas Preikschat 7281f44603 removed argument 2012-06-10 15:39:45 +02:00
Stevan Pettit 245c0acd89 Merge with trunk, resolve conflicts 2012-06-09 19:14:28 -04:00
Samuel Findlay f1afae1813 Added ZionWorx importer. Added descriptionLabel to song import wizard. 
bzr-revno: 1986
 2012-06-09 19:58:56 +01:00
Stevan Pettit 24bcc54d68 Provides the ability to change the data path storing the config files and databases. 
bzr-revno: 1985
 2012-06-09 19:50:56 +01:00
Andreas Preikschat 6c981afedc - clean ups 
bzr-revno: 1984
 2012-06-09 20:28:07 +02:00
Andreas Preikschat dc1ca0b96a - updated vlc.py 
bzr-revno: 1983
 2012-06-09 20:18:08 +02:00
Andreas Preikschat fcb7328cde various clean ups 2012-06-09 17:46:01 +02:00
Andreas Preikschat 328f918c9f r1982 2012-06-09 16:04:59 +02:00
Andreas Preikschat e8eb2e317d updated vlc.py 2012-06-09 15:46:34 +02:00
Stevan Pettit 67093ed65f Added code to call superclass cancel 2012-06-09 08:03:47 -04:00
Andreas Preikschat 5c5a1ab68f Reworked some renderer code. 
This improves the performance a bit. And improves code readability/clearness (at least that what I think). :-D

bzr-revno: 1982
 2012-06-09 10:33:16 +01:00
Stevan Pettit c4d3ba5559 Fixed indenting 2012-06-09 00:32:28 -04:00
Stevan Pettit cb50427af1 Merge branch. Fixed conflict 2012-06-09 00:23:24 -04:00
Stevan Pettit d00a3898e1 Merge with trunk. Fixed conflict 2012-06-08 19:19:03 -04:00
Samuel Findlay 413cfc3782 Change description label. dump->convert. Added link to manual 2012-06-09 07:03:18 +10:00
Samuel Findlay 598ef7fff3 Merge refactor-song-import 2012-06-09 06:31:15 +10:00
Samuel Findlay 6bf5f6d56f Change attributes from enumeration to strings. Double underscore class attributes 2012-06-09 05:30:33 +10:00
Stevan Pettit b8cd0dc7b3 Moved cancel button call to advancedtab 2012-06-08 15:27:08 -04:00
Samuel Findlay f02e886976 Clean import strings of ASCII control chars (user's db had x07 chars) 2012-06-09 04:30:34 +10:00
Andreas Preikschat f17f0dc8cf removed print statement, clean up 2012-06-08 15:27:40 +02:00
Samuel Findlay 398ac5afdf String correction 2012-06-07 22:49:33 +10:00
Samuel Findlay c219665e1c Formatting 2012-06-07 22:30:41 +10:00
Samuel Findlay cc90096534 Added optional descriptionLabel for song format to import wizard 2012-06-07 22:11:47 +10:00
Samuel Findlay 837fc1c726 Merge refactor-song-import r1994 2012-06-07 00:55:42 +10:00
Samuel Findlay 818e46fba7 Formatting and comments 2012-06-06 19:14:53 +10:00
Samuel Findlay bf991a1af3 2012-06-06 00:20:53 +10:00
Samuel Findlay 0385996f43 Merge refactor-song-import r1993 2012-06-06 00:19:28 +10:00
Samuel Findlay a79419d715 Formatting 2012-06-06 00:14:50 +10:00
Samuel Findlay 34de12040f Refactor exception handling 2012-06-06 00:12:19 +10:00
Samuel Findlay a9f97bf771 r1981 2012-06-05 19:34:00 +10:00
Samuel Findlay 2ccf92f543 Improved isComplete() validation for single file/folder. 2012-06-05 19:20:07 +10:00
Samuel Findlay 2fb09b2462 Working ZionWorxImport 2012-06-05 19:16:24 +10:00
Stevan Pettit 1c53207a77 Changed variable names 2012-06-04 09:18:46 -04:00
Andreas Preikschat ad3edd4e10 changed attributes to camelCase 2012-06-04 12:51:50 +02:00
Andreas Preikschat b43004aced r1981 + conflict 2012-06-04 12:47:36 +02:00
Andreas Preikschat d16e64f11a fixed ticket 502 and another fix 
bzr-revno: 1981
 2012-06-04 12:39:38 +02:00
Andreas Preikschat a12dc37d70 - stop the imageManager when closing OpenLP 
bzr-revno: 1980
 2012-06-04 12:37:46 +02:00