[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372191 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] JavaScript Test Results: Passed
JavaScript tests passed! -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372194 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] macOS Test Results: Passed
macOS tests passed! -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372191 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linting: Failed
Linting failed, please see https://ci.openlp.io/job/MP-05-Linting/166/ for more details -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372191 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] Linting: Failed
> Linting failed, please see https://ci.openlp.io/job/MP-05-Linting/166/ for > more details now fixed - blank lines at end of test code -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372191 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp
John Lines has proposed merging lp:~john+ubuntu-g/openlp/singingthefaith into
lp:openlp.
Commit message:
Initial merge of SingingTheFaithImport, including update to importer.py
Requested reviews:
Raoul Snyman (raoul-snyman)
Tomas Groth (tomasgroth)
Phill (phill-ridout)
For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372194
Singing The Faith is the new Authorized Hymn book for the Methodist Church of
Great Britain.
There is an electronic version of the Hymn book, for Windows only, which can
export Hymns as text files.
This import module smooths the process of converting these text files into
OpenLP. The input format is messy and not intended for automatic processing so
the importer uses a combination of heuristics and a hints file. This version
has not been tested on all the hymns in Singing The Faith, but deals with most
of the, more than 600, hymns it has been tested with.
Documentation for the source format and hints file is at
https://wiki.openlp.org/Development:SingingTheFaith_Format
The change includes a test module, which works for the single verse case, and
for a whole song - both without use of hints, and another couple of cases using
hints.
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/songs/lib/importer.py'
--- openlp/plugins/songs/lib/importer.py 2019-04-13 13:00:22 +
+++ openlp/plugins/songs/lib/importer.py 2019-09-03 12:48:40 +
@@ -42,6 +42,7 @@
from .importers.powersong import PowerSongImport
from .importers.presentationmanager import PresentationManagerImport
from .importers.propresenter import ProPresenterImport
+from .importers.singingthefaith import SingingTheFaithImport
from .importers.songbeamer import SongBeamerImport
from .importers.songpro import SongProImport
from .importers.songshowplus import SongShowPlusImport
@@ -173,16 +174,17 @@
PowerSong = 16
PresentationManager = 17
ProPresenter = 18
-SongBeamer = 19
-SongPro = 20
-SongShowPlus = 21
-SongsOfFellowship = 22
-SundayPlus = 23
-VideoPsalm = 24
-WordsOfWorship = 25
-WorshipAssistant = 26
-WorshipCenterPro = 27
-ZionWorx = 28
+SingingTheFaith = 19
+SongBeamer = 20
+SongPro = 21
+SongShowPlus = 22
+SongsOfFellowship = 23
+SundayPlus = 24
+VideoPsalm = 25
+WordsOfWorship = 26
+WorshipAssistant = 27
+WorshipCenterPro = 28
+ZionWorx = 29
# Set optional attribute defaults
__defaults__ = {
@@ -343,6 +345,16 @@
'filter': '{text} (*.pro4 *.pro5 *.pro6)'.format(text=translate('SongsPlugin.ImportWizardForm',
'ProPresenter Song Files'))
},
+SingingTheFaith: {
+'class': SingingTheFaithImport,
+'name': 'SingingTheFaith',
+'prefix': 'singingTheFaith',
+'filter': '{text} (*.txt)'.format(text=translate('SongsPlugin.ImportWizardForm',
+ 'Singing The Faith Exported Files')),
+'descriptionText': translate('SongsPlugin.ImportWizardForm',
+ 'First use Singing The Faith Electonic edition to export '
+ 'the song(s) in Text format.')
+},
SongBeamer: {
'class': SongBeamerImport,
'name': 'SongBeamer',
@@ -462,6 +474,7 @@
SongFormat.PowerSong,
SongFormat.PresentationManager,
SongFormat.ProPresenter,
+SongFormat.SingingTheFaith,
SongFormat.SongBeamer,
SongFormat.SongPro,
SongFormat.SongShowPlus,
=== added file 'openlp/plugins/songs/lib/importers/singingthefaith.py'
--- openlp/plugins/songs/lib/importers/singingthefaith.py 1970-01-01 00:00:00 +
+++ openlp/plugins/songs/lib/importers/singingthefaith.py 2019-09-03 12:48:40 +
@@ -0,0 +1,427 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###
+# OpenLP - Open Source Lyrics Projection #
+# --- #
+# Copyright (c) 2008-2019 OpenLP Developers #
+# --- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 3 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the
[Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp
The proposal to merge lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372191 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372194 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] macOS Test Results: Passed
macOS tests passed! -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372194 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] JavaScript Test Results: Passed
JavaScript tests passed! -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372191 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linting: Passed
Linting passed! -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372194 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp
John Lines has proposed merging lp:~john+ubuntu-g/openlp/singingthefaith into
lp:openlp.
Commit message:
Initial merge of SingingTheFaithImport, including update to importer.py
Requested reviews:
Tomas Groth (tomasgroth)
Phill (phill-ridout)
Raoul Snyman (raoul-snyman)
For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372191
Singing The Faith is the new Authorized Hymn book for the Methodist Church of
Great Britain.
There is an electronic version of the Hymn book, for Windows only, which can
export Hymns as text files.
This import module smooths the process of converting these text files into
OpenLP. The input format is messy and not intended for automatic processing so
the importer uses a combination of heuristics and a hints file. This version
has not been tested on all the hymns in Singing The Faith, but deals with most
of the, more than 600, hymns it has been tested with.
Documentation for the source format and hints file is at
https://wiki.openlp.org/Development:SingingTheFaith_Format
The change includes a test module, which works for the single verse case, and
for a whole song.
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/plugins/songs/lib/importer.py'
--- openlp/plugins/songs/lib/importer.py 2019-04-13 13:00:22 +
+++ openlp/plugins/songs/lib/importer.py 2019-09-03 11:58:03 +
@@ -42,6 +42,7 @@
from .importers.powersong import PowerSongImport
from .importers.presentationmanager import PresentationManagerImport
from .importers.propresenter import ProPresenterImport
+from .importers.singingthefaith import SingingTheFaithImport
from .importers.songbeamer import SongBeamerImport
from .importers.songpro import SongProImport
from .importers.songshowplus import SongShowPlusImport
@@ -173,16 +174,17 @@
PowerSong = 16
PresentationManager = 17
ProPresenter = 18
-SongBeamer = 19
-SongPro = 20
-SongShowPlus = 21
-SongsOfFellowship = 22
-SundayPlus = 23
-VideoPsalm = 24
-WordsOfWorship = 25
-WorshipAssistant = 26
-WorshipCenterPro = 27
-ZionWorx = 28
+SingingTheFaith = 19
+SongBeamer = 20
+SongPro = 21
+SongShowPlus = 22
+SongsOfFellowship = 23
+SundayPlus = 24
+VideoPsalm = 25
+WordsOfWorship = 26
+WorshipAssistant = 27
+WorshipCenterPro = 28
+ZionWorx = 29
# Set optional attribute defaults
__defaults__ = {
@@ -343,6 +345,16 @@
'filter': '{text} (*.pro4 *.pro5 *.pro6)'.format(text=translate('SongsPlugin.ImportWizardForm',
'ProPresenter Song Files'))
},
+SingingTheFaith: {
+'class': SingingTheFaithImport,
+'name': 'SingingTheFaith',
+'prefix': 'singingTheFaith',
+'filter': '{text} (*.txt)'.format(text=translate('SongsPlugin.ImportWizardForm',
+ 'Singing The Faith Exported Files')),
+'descriptionText': translate('SongsPlugin.ImportWizardForm',
+ 'First use Singing The Faith Electonic edition to export '
+ 'the song(s) in Text format.')
+},
SongBeamer: {
'class': SongBeamerImport,
'name': 'SongBeamer',
@@ -462,6 +474,7 @@
SongFormat.PowerSong,
SongFormat.PresentationManager,
SongFormat.ProPresenter,
+SongFormat.SingingTheFaith,
SongFormat.SongBeamer,
SongFormat.SongPro,
SongFormat.SongShowPlus,
=== added file 'openlp/plugins/songs/lib/importers/singingthefaith.py'
--- openlp/plugins/songs/lib/importers/singingthefaith.py 1970-01-01 00:00:00 +
+++ openlp/plugins/songs/lib/importers/singingthefaith.py 2019-09-03 11:58:03 +
@@ -0,0 +1,427 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
+
+###
+# OpenLP - Open Source Lyrics Projection #
+# --- #
+# Copyright (c) 2008-2019 OpenLP Developers #
+# --- #
+# This program is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU General Public License as published by the Free #
+# Software Foundation; version 3 of the License. #
+# #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
+# FITNESS FOR A
[Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp
The proposal to merge lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372031 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp
Review: Needs Fixing Hi John, sorry for mentioning this before, but the hint file should be placed in the folder openlp/plugins/songs/lib/importers/ If the user does not supply a hint file you can then load it from this path: AppLocation.get_directory(AppLocation.PluginsDir) / 'songs' / 'lib' / 'importers' / 'singingthefaith-hints.tag' As you can see I would recommend renaming it to 'singingthefaith-hints.tag' or something similar to make it easy to see what it is used for. And please set 'SongbookNumberInTitle' in the default hint file to False. -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372194 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bastian-germann/openlp/main into lp:openlp
Hey! I would really like to see this merged before the alpha. See also https://www.python.org/dev/peps/pep-0423/#use-a-single-name on exporting only one package per module. If you merge this, I am going to provide an openlp package via PyPI and propose a new installation method that does not imply redistribution of third-party python libraries. -- https://code.launchpad.net/~bastian-germann/openlp/main/+merge/368590 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1842523] [NEW] trunk V2898 adding video file to Service causes errors
Public bug reported: Windows 10 32 bit trunk V2898 Single display with custom screen 1024x768 in OpenLP settings I loaded a small moving background in MPG format. I checked and the issue with not being able to edit a song is still valid. The media item was shown in the Library. I used Drag and Drop to add the media item to the middle of a service with multiple items in it. Error 1 The item was displayed in the ServiceEvery item in the Service below where I added the media item vanished. I double clicked the slide above the media item to send it to the live display. The slide was displayed as expected. Live display enabled. Unexpected Behavior I pressed the down arrow on the keyboard and the live display vanished and returned with the video playing. I pressed the Esc key to end the live screen and shut down OpenLP. Error 2 I was not asked to save the modified Service. When I restarted OpenLP the media items as still there, but the Service did not show the Media item... In the terminal the following information was displayed. Error 3? [16973d88] direct3d11 vout display error: Could not Create the D3D11 device. (hr=0x80004001) [16973d88] direct3d11 vout display error: Direct3D11 could not be opened [16973d88] direct3d11 vout display error: SetThumbNailClip failed: 0x800706f4 [mpeg2video @ 16fdabc0] get_buffer() failed [mpeg2video @ 16fdabc0] thread_get_buffer() failed [mpeg2video @ 16fdabc0] get_buffer() failed (-12 ) [16973d88] direct3d9 vout display error: SetThumbNailClip failed: 0x800706f4 I am including the OpenLP.log file as it shows a trace dump. The Error.log is blank ** Affects: openlp Importance: Undecided Status: New ** Attachment added: "Log file" https://bugs.launchpad.net/bugs/1842523/+attachment/5286594/+files/openlp.log -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1842523 Title: trunk V2898 adding video file to Service causes errors Status in OpenLP: New Bug description: Windows 10 32 bit trunk V2898 Single display with custom screen 1024x768 in OpenLP settings I loaded a small moving background in MPG format. I checked and the issue with not being able to edit a song is still valid. The media item was shown in the Library. I used Drag and Drop to add the media item to the middle of a service with multiple items in it. Error 1 The item was displayed in the ServiceEvery item in the Service below where I added the media item vanished. I double clicked the slide above the media item to send it to the live display. The slide was displayed as expected. Live display enabled. Unexpected Behavior I pressed the down arrow on the keyboard and the live display vanished and returned with the video playing. I pressed the Esc key to end the live screen and shut down OpenLP. Error 2 I was not asked to save the modified Service. When I restarted OpenLP the media items as still there, but the Service did not show the Media item... In the terminal the following information was displayed. Error 3? [16973d88] direct3d11 vout display error: Could not Create the D3D11 device. (hr=0x80004001) [16973d88] direct3d11 vout display error: Direct3D11 could not be opened [16973d88] direct3d11 vout display error: SetThumbNailClip failed: 0x800706f4 [mpeg2video @ 16fdabc0] get_buffer() failed [mpeg2video @ 16fdabc0] thread_get_buffer() failed [mpeg2video @ 16fdabc0] get_buffer() failed (-12 ) [16973d88] direct3d9 vout display error: SetThumbNailClip failed: 0x800706f4 I am including the OpenLP.log file as it shows a trace dump. The Error.log is blank To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1842523/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bastian-germann/openlp/main into lp:openlp
Review: Needs Fixing You have left the python3 construct in the openlp/__main__.py which leaves this as an entry point. Please confirm this is correct or remove. -- https://code.launchpad.net/~bastian-germann/openlp/main/+merge/368590 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
