openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity
17,536 Commits 6 Branches 56 Tags 310 MiB
Commit Graph

169 Commits

Author SHA1 Message Date
Tomas Groth 7c0386b7c0 Fixes for mysql as db backend 
bzr-revno: 2504
 2015-02-17 19:50:18 +00:00
Phill Ridout b427e216f1 small fixes 2015-02-12 21:24:39 +00:00
Tomas Groth 8c8fbe45b2 Fixes to make mysql db work 2015-02-11 20:56:13 +00:00
Phill Ridout 6d2b1d958e Better handle failed downloads 2015-01-31 21:52:02 +00:00
Raoul Snyman de213b0f66 Copyright cleanup time, 
bzr-revno: 2479
 2015-01-19 08:34:29 +00:00
Raoul Snyman ffcea13021 Updated the copyright. 2015-01-18 15:39:21 +02:00
Tomas Groth cffad28749 Close session after upgrade. Fixes a filelock issue in windows tests. 2015-01-14 11:56:18 +01:00
Tim Bentley f3c09af379 Years go by 2014-12-31 10:58:13 +00:00
Ken Roberts 0227e0a2bd Initial projector code 2014-10-06 12:10:03 -07:00
Samuel Mehrbrodt 2613ad3076 Don't run upgrades on an up to date database 2014-07-17 23:04:58 +02:00
Samuel Mehrbrodt 69c32d91a4 Merge trunk 2014-03-30 19:13:26 +02:00
Raoul Snyman 6ad3fca88e Try to fix bug #1136278 by detecting if the upgrades have already run 
bzr-revno: 2343
Fixes: https://launchpad.net/bugs/1136278
 2014-03-30 13:02:25 +02:00
Samuel Mehrbrodt 71b34578d7 Add support for the Author type property 2014-03-28 17:06:16 +01:00
Raoul Snyman 35e3564655 Tests! 2014-03-18 23:03:53 +02:00
Tim Bentley 9610be5cd0 Fix up comments 2014-03-17 19:05:55 +00:00
Tim Bentley a74567b9f6 Bible database tests 2014-03-11 19:01:09 +00:00
Tim Bentley 6d8b5cadb4 Lib cleanup and 2014 2013-12-24 08:56:50 +00:00
Tim Bentley b9e2a2cdc1 Missed imports 2013-10-13 22:07:28 +01:00
Tim Bentley 63685cb29e Move Settings and translate 2013-10-13 21:36:42 +01:00
Tim Bentley 257fba8548 Start theme clean up 2013-10-13 14:51:13 +01:00
Andreas Preikschat 3e1a863bae 2to3 and resources.py 2013-08-31 20:17:38 +02:00
Raoul Snyman 9430e569f4 Fix one small issue with the songs upgrade scripts. 2013-04-04 10:02:47 +02:00
Raoul Snyman d88e8a0b02 Migrated to Alembic (if you'll excuse the pun) 2013-04-03 21:46:41 +02:00
Andreas Preikschat d77efd63d2 fixed double space 2013-03-22 21:35:59 +01:00
Andreas Preikschat e6e57b6c03 updated comments and docs to 120 characters per line 2013-03-22 21:29:52 +01:00
Tim Bentley 19c05a7fc0 Half plugin tabs done 2013-03-16 16:59:10 +00:00
Andreas Preikschat 8f5fe64d3e fixed short lines 2013-02-04 22:39:44 +01:00
Raoul Snyman 922c392ecb Slowly start moving names to PEP8 style names. 2013-02-02 22:54:34 +02:00
Raoul Snyman 18034a2f6a Linting cleanups. 2013-02-01 21:58:18 +02:00
Andreas Preikschat e762e3b672 r2151 + conflicts 2013-01-20 13:23:22 +01:00
Andreas Preikschat b91177f00b removed not needed imports 2013-01-19 00:31:02 +01:00
Andreas Preikschat 2616f63007 removed value parameter (still needs work) 2013-01-11 00:07:48 +01:00
Tim Bentley 4a0b3f90aa 2013 is comming 2012-12-29 20:56:56 +00:00
Tim Bentley ae576251bd Core lib 2012-12-28 22:06:43 +00:00
Andreas Preikschat fc38f62a17 trunk + conflicts 2012-12-04 22:50:14 +01:00
Tim Bentley a7294a8e8b Copyright and Translation updates from 2.0 2012-12-01 07:57:54 +00:00
Tim Bentley 5646183803 Fixes 2012-11-11 21:16:14 +00:00
Tim Bentley 55f4bc3a73 Fix name and add spearator 2012-11-11 19:33:53 +00:00
Raoul Snyman b76be3d6b8 Fixed bug #1077654 where there were more classes in the CSS, but we were specifically looking for only one class. Made the code less brittle. 
Fixes: https://launchpad.net/bugs/1077654
 2012-11-11 18:09:23 +02:00
Tim Bentley 47c9af348c Fix spelling - oops 2012-11-07 21:37:01 +00:00
Andreas Preikschat 3629c8a535 r2098 + conflict 2012-11-01 16:56:03 +01:00
Tim Bentley 716dc9ccf0 More updates 2012-10-21 15:07:57 +01:00
Tim Bentley cdbc1fd82e Copyrights 2012-10-21 14:16:22 +01:00
Andreas Preikschat 159f3ea9a2 r2074 + conflicts 2012-10-03 18:38:06 +02:00
Samuel Findlay 4510fdbede Added three names in Copyright headers and About window (Samuel Findlay, Edwin Lunando, Dave Warnock). Fixed consistency issues. 2012-06-23 00:14:53 +10:00
Dave Warnock e0c5fabc5a Amend DB Error OperationError 
bzr-revno: 1988
 2012-06-11 18:33:57 +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
Andreas Preikschat ed3b7660fa removed not neede unicode calls 2012-05-17 20:57:01 +02:00
Andreas Preikschat 4a979b49d9 continued to implement QString v2 api 2012-05-17 18:19:06 +02:00
Andreas Preikschat 2d99f59c84 started to use QString v2 api 2012-05-17 17:13:09 +02:00
Stevan Pettit f1586052a6 Added code to allow OpenLP to run portable 2012-05-11 08:22:34 -04:00
Jon Tibble 9785e7f1be Cleanups 2012-03-12 19:35:29 +00:00
Rastislav Pecik 8818256b2a Fixed code according to mrege proposal comments 2012-02-28 15:06:14 +01:00
Rastislav Pecik 271c4ef1a4 using QtCore.QVariant object as a second argument in settings.value method 2012-02-28 12:30:30 +01:00
Rastislav Pecik 6ec167ed83 QSettings.value() now uses second argument for default value, which is utf8 2012-02-28 12:12:52 +01:00
Rastislav Pecik c024e9e47d Exported mysql charset settings to configuration files and cleaned up the code 2012-02-27 19:18:52 +01:00
Rastislav Pecik b56d8d2a06 Fixed connection to mysql to use UTF8 encoding. 
Fixes: https://launchpad.net/bugs/941692
 2012-02-27 01:42:35 +01:00
Raoul Snyman bcad2c171f Added exception logging in case we need to confirm that we are actually getting the exception we think we are. 2012-02-16 21:05:16 +02:00
Raoul Snyman f8a8185eb0 Attempt to catch the OperationalError which is thrown when MySQL closes the connection without telling us. 2012-02-12 11:24:06 +02:00
Tim Bentley 2a5e8935bb New year merge 2011-12-27 10:33:55 +00:00
Tim Bentley 17bca693c6 Block song exports 2011-12-04 16:36:18 +00:00
Tim Bentley 456d7ec68e remove print 2011-12-04 07:27:49 +00:00
Tim Bentley 6698ce578d Change Data type 2011-12-03 19:08:02 +00:00
Tim Bentley add75e9c7f Head 1815 2011-12-03 17:02:11 +00:00
Tim Bentley 8c4397d380 Head 2011-12-03 17:01:57 +00:00
Tim Bentley 1239cd707c Fix database versions 2011-12-03 12:51:40 +00:00
Tim Bentley 624216a1b8 add field and usage 2011-12-03 09:05:01 +00:00
Raoul Snyman 46643ab832 Added the quoting to database fields. 2011-11-07 23:22:35 -07:00
Raoul Snyman 4d66954d62 - Fixed re-playing of previous audio file. 
- Fixed left-over files from previous song.
- Renamed a few more enumerations.
- Fixed some exception handling.
 2011-08-31 09:49:57 +02:00
Raoul Snyman 0b81824430 HEAD 2011-08-28 19:45:31 +02:00
Tim Bentley 67894aa8d9 Error Handling improvements 2011-08-27 19:43:05 +01:00
Tim Bentley c1a648900f Fix initial setup bug 2011-08-27 16:02:45 +01:00
Raoul Snyman f099329217 Up/Down buttons, Remove/Remove All buttons. 2011-08-27 01:04:54 +02:00
Tim Bentley 1e4b922bfa DB Fixed 2011-08-26 20:09:25 +01:00
Tim Bentley 2dd0aa234e remove prints 2011-08-26 19:07:44 +01:00
Tim Bentley f266485001 Add fields to database 2011-08-26 18:56:36 +01:00
Raoul Snyman bcf9b174ff Fixed a bug where the version number saved to the database was incorrect. Added the ability to throw an error message and not load the database if the db is too new or incorrect. 2011-08-25 22:02:55 +02:00
Raoul Snyman ddf148449d Now with exception handling. 2011-08-25 13:47:07 +02:00
Raoul Snyman 923261c59c Even better, got rid of 'upgrade_schema' function which is not really needed. 2011-08-25 11:22:48 +02:00
Raoul Snyman 7e572cd0c2 Database upgrading, revision 1. 2011-08-25 11:02:59 +02:00
Raoul Snyman 301993a3ea Fixed bug #825809 where SQLAlchemy 0.7 throws a 'ArgumentError: SQL expression object or string expected' when passed something other than an SQL expression object or a string. 
Fixes: https://launchpad.net/bugs/825809
 2011-08-16 21:53:52 +02:00
Tim Bentley 608910a098 Fix name 2011-06-12 17:02:52 +01:00
Tim Bentley c812770153 Copyright fixes 2011-06-12 16:41:01 +01:00
Armin Köhler 8caece6af0 HEAD r1588 2011-05-28 14:50:29 +02:00
Raoul Snyman 665fc82c94 Fix for bug #789285: OpenLP does not work with SQLAlchemy 0.7. 2011-05-27 21:25:03 +02:00
Armin Köhler d3148f90f8 fix Traceback like Jonathan recommand 2011-05-27 09:54:49 +02:00
Tim Bentley acdbefd922 Fixes 2011-05-26 18:11:22 +01:00
Tim Bentley 8f6ed366a1 Copyright updates 2011-05-26 17:25:54 +01:00
Raoul Snyman 7669643774 Updated the copyright notice, adding Jeffrey Smith back in after he accidentally got removed somewhere somehow. 2011-05-24 22:47:05 +02:00
Andreas Preikschat 3824c33607 use iteritems 2011-05-07 16:14:34 +02:00
Andreas Preikschat 307ef744dd - fixed not closed file 
- attempt to make FRW avoiding tracebacks when running more than once
- clean ups
 2011-05-04 09:29:16 +02:00
Raoul Snyman efbcfd0772 Updated copyright information. 2011-03-24 21:04:02 +02:00
Andreas Preikschat 123b1beded added missing lines 2011-02-25 18:27:06 +01:00
Andreas Preikschat 0ed7e259fc removed white spaces 2011-02-25 18:05:01 +01:00
Raoul Snyman 780a87e840 Updated copyright information. Removed .eric4project directory from version control. 2011-02-24 07:47:38 +02:00
Jon Tibble 943dcf1ffc Naming cleanups 2011-02-07 22:07:48 +00:00
Jon Tibble ecb97881a1 Refactor file deleting, cleanups 2011-01-14 18:58:47 +00:00
Tim Bentley e77ce3ffdb Bump values by 1 version or year 2010-12-26 11:04:47 +00:00
Tim Bentley 132c678569 Fix exit for non Sqlite Databases 2010-11-28 15:20:53 +00:00