[Openlp-core] [Merge] lp:~trb143/openlp/cleanups02182 into lp:openlp

2018-03-16 Thread Tim Bentley
Tim Bentley has proposed merging lp:~trb143/openlp/cleanups02182 into lp:openlp.

Requested reviews:
  Raoul Snyman (raoul-snyman)
Related bugs:
  Bug #1016078 in OpenLP: "Can't clear preview pane"
  https://bugs.launchpad.net/openlp/+bug/1016078
  Bug #1449477 in OpenLP: "lyric title via api contoller text"
  https://bugs.launchpad.net/openlp/+bug/1449477
  Bug #1512689 in OpenLP: "automatically created slides"
  https://bugs.launchpad.net/openlp/+bug/1512689
  Bug #1544260 in OpenLP: "Moving Song in Service Manager, Hover Text says 
"Service Manager""
  https://bugs.launchpad.net/openlp/+bug/1544260
  Bug #1651823 in OpenLP: "Make it possible to clone a Custom Slide"
  https://bugs.launchpad.net/openlp/+bug/1651823
  Bug #1755822 in OpenLP: "translate source string #1237"
  https://bugs.launchpad.net/openlp/+bug/1755822

For more details, see:
https://code.launchpad.net/~trb143/openlp/cleanups02182/+merge/341547

Add some small items from wish lists
Various cleanups.


lp:~trb143/openlp/cleanups02182 (revision 2834)
https://ci.openlp.io/job/Branch-01-Pull/2476/  [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2377/  [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/164/   [FAILURE]
https://ci.openlp.io/job/Branch-03a-Build-Source/86/   [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/79/[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code-Analysis/1548/[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test-Coverage/1361/[SUCCESS]
-- 
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/api/endpoint/controller.py'
--- openlp/core/api/endpoint/controller.py	2017-12-29 09:15:48 +
+++ openlp/core/api/endpoint/controller.py	2018-03-16 20:48:40 +
@@ -91,6 +91,7 @@
 item['text'] = str(frame['title'])
 item['html'] = str(frame['title'])
 item['selected'] = (live_controller.selected_row == index)
+item['title'] = current_item.title
 data.append(item)
 json_data = {'results': {'slides': data}}
 if current_item:
@@ -117,12 +118,11 @@
 return {'results': {'success': True}}
 
 
-@controller_endpoint.route('{action:next|previous}')
+@controller_endpoint.route('{controller}/{action:next|previous}')
 @requires_auth
 def controller_direction(request, controller, action):
 """
 Handles requests for setting service items in the slide controller
-11
 :param request: The http request object.
 :param controller: the controller slides forward or backward.
 :param action: the controller slides forward or backward.
@@ -137,7 +137,7 @@
 def controller_direction_api(request, controller, action):
 """
 Handles requests for setting service items in the slide controller
-11
+
 :param request: The http request object.
 :param controller: the controller slides forward or backward.
 :param action: the controller slides forward or backward.

=== modified file 'openlp/core/common/__init__.py'
--- openlp/core/common/__init__.py	2018-02-11 21:52:04 +
+++ openlp/core/common/__init__.py	2018-03-16 20:48:40 +
@@ -62,7 +62,7 @@
 """
 # Get the local IPv4 active address(es) that are NOT localhost (lo or '127.0.0.1')
 log.debug('Getting local IPv4 interface(es) information')
-MY_IP4 = {}
+my_ip4 = {}
 for iface in QNetworkInterface.allInterfaces():
 if not iface.isValid() or not (iface.flags() & (QNetworkInterface.IsUp | QNetworkInterface.IsRunning)):
 continue
@@ -70,25 +70,25 @@
 ip = address.ip()
 # NOTE: Next line will skip if interface is localhost - keep for now until we decide about it later
 # if (ip.protocol() == QAbstractSocket.IPv4Protocol) and (ip != QHostAddress.LocalHost):
-if (ip.protocol() == QAbstractSocket.IPv4Protocol):
-MY_IP4[iface.name()] = {'ip': ip.toString(),
+if ip.protocol() == QAbstractSocket.IPv4Protocol:
+my_ip4[iface.name()] = {'ip': ip.toString(),
 'broadcast': address.broadcast().toString(),
 'netmask': address.netmask().toString(),
 'prefix': address.prefixLength(),
 'localnet': QHostAddress(address.netmask().toIPv4Address() &
-ip.toIPv4Address()).toString()
+ ip.toIPv4Address()).toString()
 }
 log.debug('Adding {iface} to active list'.format(iface=iface.name()))
-if len(MY_IP4) == 1:
-if 'lo' in MY_IP4:
+if len(my_ip4) == 1:
+if 

[Openlp-core] [Merge] lp:~trb143/openlp/cleanups02182 into lp:openlp

2018-03-16 Thread Tim Bentley
The proposal to merge lp:~trb143/openlp/cleanups02182 into lp:openlp has been 
updated.

Status: Needs review => Superseded

For more details, see:
https://code.launchpad.net/~trb143/openlp/cleanups02182/+merge/341270
-- 
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 1756390] [NEW] error message when trying to download lyrics from CCLI SongSelect

2018-03-16 Thread Robert Taylor
Public bug reported:

Running Windows 10 on a dell Laptop, basic edition
Running OpenLP version 2.4.6
I emailed Open LP and reported it there, as well. Ticket #803009 dated 3/16/18 
around 9 AM

The files that triggered the problem are:

Traceback (most recent call last)
  File "openlp\plugins\forms\songselectform.py", line 59, in start  
  File "openlp\plugins\songs\lib\songselect.py", line 166, in search
  File "html\__init__.py", line 130, in unescape
TypeError : argument of type 'NoneType is not iterable

This error message occurred when I was looking up the hymn "How Firm A
Foundation" with text from Rippon's Selection of Hymns, 1787 (according
to our hymnal, "The Celebration Hymnal" publish by Word Music /
Integrity Music, 1997 Edition, page 408. I opened SongSelect and typed
in the title of the hymn. Four lines on the search screen filled in and
then the error message came up. I tried to click on the box with the
four lines on it and the program would not let me do it. I tried to copy
and paste the list of files that caused the problem into an email to
send to you and it would not allow me to do that. I went to the Task
Master screen and closed the program, then opened OpenLP again and went
to SongSelect once more. I typed in "How Firm A" and started the search
again with the same results and the error message popped up again
immediately after the four titles came up in the search box, like what
happened before when I attempted it with the entire title.

Not giving up, I went to the Task Master screen and closed OpenLP, then
opened OpenLP again and went to SongSelect once more. This time I typed
in "My Faith Has Found a Resting Place," another of the hymns that we
are doing on Sunday. This time when I hit "search" the listing of
versions of that hymn opened like normal, unfurled a list of versions by
different authors and I hit "Stop" and chose the one by the original
author of the hymn. I closed song select and went back into OpenLP and
the song was there in the listing of hymns on the hard drive. I double
clicked on it and it opened in the preview window like always before. I
edited the hymn by adding the chorus after each verse and saved it like
always then inserted it into the program.

I will try to manually type the  lyrics to "How Firm a Foundation into
Open LP so that I might be able to add it to our program. I certainly
hope that you can recreate this problem when you try to open the hymn
and that you can cure the problem. :) Thanks, in advance, for making
every effort to find a fix for this bug so that we will have no further
problems with this in the future.

Rob Taylor

** Affects: openlp
 Importance: Undecided
 Status: New

-- 
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1756390

Title:
  error message when trying to download lyrics from CCLI SongSelect

Status in OpenLP:
  New

Bug description:
  Running Windows 10 on a dell Laptop, basic edition
  Running OpenLP version 2.4.6
  I emailed Open LP and reported it there, as well. Ticket #803009 dated 
3/16/18 around 9 AM

  The files that triggered the problem are:

  Traceback (most recent call last)
File "openlp\plugins\forms\songselectform.py", line 59, in start  
File "openlp\plugins\songs\lib\songselect.py", line 166, in search
File "html\__init__.py", line 130, in unescape
  TypeError : argument of type 'NoneType is not iterable

  This error message occurred when I was looking up the hymn "How Firm A
  Foundation" with text from Rippon's Selection of Hymns, 1787
  (according to our hymnal, "The Celebration Hymnal" publish by Word
  Music / Integrity Music, 1997 Edition, page 408. I opened SongSelect
  and typed in the title of the hymn. Four lines on the search screen
  filled in and then the error message came up. I tried to click on the
  box with the four lines on it and the program would not let me do it.
  I tried to copy and paste the list of files that caused the problem
  into an email to send to you and it would not allow me to do that. I
  went to the Task Master screen and closed the program, then opened
  OpenLP again and went to SongSelect once more. I typed in "How Firm A"
  and started the search again with the same results and the error
  message popped up again immediately after the four titles came up in
  the search box, like what happened before when I attempted it with the
  entire title.

  Not giving up, I went to the Task Master screen and closed OpenLP,
  then opened OpenLP again and went to SongSelect once more. This time I
  typed in "My Faith Has Found a Resting Place," another of the hymns
  that we are doing on Sunday. This time when I hit "search" the listing
  of versions of that hymn opened like normal, unfurled a list of
  versions by different authors and I hit "Stop" and chose the one by
  the original author of the hymn. I closed song select and went back
  into OpenLP and the