Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-l into lp:openlp
Review: Approve -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-l/+merge/333860 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:~alisonken1/openlp/pjlink2-l into lp:openlp
The proposal to merge lp:~alisonken1/openlp/pjlink2-l into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~alisonken1/openlp/pjlink2-l/+merge/333832 -- 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 1625087] Re: Image insertion doesn't respect natural order
** Changed in: openlp Milestone: None => 2.5.1 ** Changed in: openlp Status: In Progress => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1625087 Title: Image insertion doesn't respect natural order Status in OpenLP: Fix Committed Bug description: When inserting images (when creating a image slideshow in OpenLP) with filenames like 1.jpg 2.jpg 3.jpg ... 10.jpg 11.jpg They don't get inserted in their natural order. Instead they are inserted like 10.jpg 11.jpg 1.jpg 2.jpg 3.jpg ... To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1625087/+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
[Openlp-core] [Bug 1650358] Re: Replace Live background item right click uses wrong icon
** Changed in: openlp Milestone: None => 2.5.1 ** Changed in: openlp Status: In Progress => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1650358 Title: Replace Live background item right click uses wrong icon Status in OpenLP: Fix Committed Bug description: "Replace live background" icon was changed from black to theme.' Black icon is still used on right click menus for library items. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1650358/+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
[Openlp-core] [Bug 1692187] Re: [Regression] Presentations/Images with same name gets the same thumbnail
** Changed in: openlp Milestone: None => 2.5.1 ** Changed in: openlp Status: In Progress => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1692187 Title: [Regression] Presentations/Images with same name gets the same thumbnail Status in OpenLP: Fix Committed Bug description: Part of this bug has been regressed! In the presentations plugin, openlp.plugins.presentations.lib.presentationcontroller.PresentationDocument#get_thumbnail_folder and openlp.plugins.presentations.lib.presentationcontroller.PresentationDocument#get_temp_folder where not changed when the when the other md5 thumbnail code was removed! To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1692187/+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
[Openlp-core] [Bug 1673251] Re: Incorrect file type suggested for Save As
** Changed in: openlp Milestone: None => 2.5.1 ** Changed in: openlp Status: In Progress => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1673251 Title: Incorrect file type suggested for Save As Status in OpenLP: Fix Committed Bug description: Platform: OS: Windows 10 Home OpenLP: 2.4.5 Severity: Minor What happened: When a Save As dialog is presented, the new filetype defaults to OSZ regardless of the filetype of the currently opened service. What I expected to happen: I expected the filetype to default to the same type as the currently open file (OSZL for an OSZL file). To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1673251/+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
[Openlp-core] [Bug 1672777] Re: Right click menu on expanded Service item always sends the first slide to Live
** Changed in: openlp Milestone: None => 2.5.1 ** Changed in: openlp Status: In Progress => Fix Released ** Changed in: openlp Status: Fix Released => Fix Committed -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1672777 Title: Right click menu on expanded Service item always sends the first slide to Live Status in OpenLP: Fix Committed Bug description: Steps to re-produce. 1) Add expandable item to the Service 2) Select a slide with right click (other than 1st) 3) Send the selected item to live. (1st slide will be sent to live) This works if the wanted slide is sent to Live by double click, but not if its sent to Live by right click menu. 2.4.5 Windows 10 To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1672777/+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
[Openlp-core] [Bug 1732348] Re: MediaInfo's XML output has changed
** Changed in: openlp
Milestone: None => 2.5.1
** Changed in: openlp
Assignee: Tim Bentley (trb143) => (unassigned)
** Changed in: openlp
Status: New => Fix Committed
--
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1732348
Title:
MediaInfo's XML output has changed
Status in OpenLP:
Fix Committed
Bug description:
As of version 17.10, MediaInfo's XML output has changed, causing tests
to fail (and no doubt OpenLP as well). Unfortunately while the
changelog says that you can still use the old XML, the command line
utility itself does not seem to support that option (I can't figure
out how to give it the option).
Changelog: https://mediaarea.net/MediaInfo/ChangeLog
Test output:
==
ERROR: test_media_length
(tests.interfaces.openlp_core.ui.media.vendor.test_mediainfoWrapper.TestMediainfoWrapper)
--
Traceback (most recent call last):
File
"OpenLP/tests/interfaces/openlp_core/ui/media/vendor/test_mediainfoWrapper.py",
line 48, in test_media_length
self.assertEqual(results.tracks[0].duration, test_data[1], 'The correct
duration is returned for ' +
File "OpenLP/openlp/core/ui/media/vendor/mediainfoWrapper.py", line 130, in
tracks
self._populate_tracks()
File "OpenLP/openlp/core/ui/media/vendor/mediainfoWrapper.py", line 122, in
_populate_tracks
for xml_track in self.xml_dom.Mediainfo.File.find_all("track"):
AttributeError: 'NoneType' object has no attribute 'File'
--
To manage notifications about this bug go to:
https://bugs.launchpad.net/openlp/+bug/1732348/+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
[Openlp-core] [Merge] lp:~phill-ridout/openlp/fixes-mkIII into lp:openlp
The proposal to merge lp:~phill-ridout/openlp/fixes-mkIII into lp:openlp has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~phill-ridout/openlp/fixes-mkIII/+merge/333835 -- 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:~raoul-snyman/openlp/settings-upgrade into lp:openlp
The proposal to merge lp:~raoul-snyman/openlp/settings-upgrade into lp:openlp has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/settings-upgrade/+merge/333788 -- 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:~phill-ridout/openlp/fixes-mkIII into lp:openlp
Review: Approve -- https://code.launchpad.net/~phill-ridout/openlp/fixes-mkIII/+merge/333835 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:~raoul-snyman/openlp/settings-upgrade into lp:openlp
Review: Approve -- https://code.launchpad.net/~raoul-snyman/openlp/settings-upgrade/+merge/333788 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:~phill-ridout/openlp/fixes-mkIII into lp:openlp
Review: Approve -- https://code.launchpad.net/~phill-ridout/openlp/fixes-mkIII/+merge/333835 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:~phill-ridout/openlp/fixes-mkIII into lp:openlp
Phill has proposed merging lp:~phill-ridout/openlp/fixes-mkIII into lp:openlp.
Requested reviews:
Raoul Snyman (raoul-snyman)
Related bugs:
Bug #1625087 in OpenLP: "Image insertion doesn't respect natural order"
https://bugs.launchpad.net/openlp/+bug/1625087
Bug #1650358 in OpenLP: "Replace Live background item right click uses wrong
icon"
https://bugs.launchpad.net/openlp/+bug/1650358
Bug #1672777 in OpenLP: "Right click menu on expanded Service item always
sends the first slide to Live"
https://bugs.launchpad.net/openlp/+bug/1672777
Bug #1673251 in OpenLP: "Incorrect file type suggested for Save As"
https://bugs.launchpad.net/openlp/+bug/1673251
Bug #1692187 in OpenLP: "[Regression] Presentations/Images with same name
gets the same thumbnail"
https://bugs.launchpad.net/openlp/+bug/1692187
Bug #1732348 in OpenLP: "MediaInfo's XML output has changed"
https://bugs.launchpad.net/openlp/+bug/1732348
For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/fixes-mkIII/+merge/333835
Various fixes
lp:~phill-ridout/openlp/fixes-mkIII (revision 2794)
https://ci.openlp.io/job/Branch-01-Pull/2301/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2202/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2080/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1406/[WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test_Coverage/1230/[WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04c-Code_Analysis2/360/[WAITING]
[RUNNING]
[SUCCESS]
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/ui/media/vendor/mediainfoWrapper.py'
--- openlp/core/ui/media/vendor/mediainfoWrapper.py 2016-12-31 11:01:36 +
+++ openlp/core/ui/media/vendor/mediainfoWrapper.py 2017-11-16 17:43:39 +
@@ -25,10 +25,8 @@
"""
import json
import os
-from subprocess import Popen
-from tempfile import mkstemp
+from subprocess import check_output
-import six
from bs4 import BeautifulSoup, NavigableString
ENV_DICT = os.environ
@@ -80,7 +78,7 @@
def to_data(self):
data = {}
-for k, v in six.iteritems(self.__dict__):
+for k, v in self.__dict__.items():
if k != 'xml_dom_fragment':
data[k] = v
return data
@@ -100,20 +98,10 @@
@staticmethod
def parse(filename, environment=ENV_DICT):
-command = ["mediainfo", "-f", "--Output=XML", filename]
-fileno_out, fname_out = mkstemp(suffix=".xml", prefix="media-")
-fileno_err, fname_err = mkstemp(suffix=".err", prefix="media-")
-fp_out = os.fdopen(fileno_out, 'r+b')
-fp_err = os.fdopen(fileno_err, 'r+b')
-p = Popen(command, stdout=fp_out, stderr=fp_err, env=environment)
-p.wait()
-fp_out.seek(0)
-
-xml_dom = MediaInfoWrapper.parse_xml_data_into_dom(fp_out.read())
-fp_out.close()
-fp_err.close()
-os.unlink(fname_out)
-os.unlink(fname_err)
+xml = check_output(['mediainfo', '-f', '--Output=XML', '--Inform=OLDXML', filename])
+if not xml.startswith(b'___
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:~phill-ridout/openlp/fixes-mkIII into lp:openlp
The proposal to merge lp:~phill-ridout/openlp/fixes-mkIII into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~phill-ridout/openlp/fixes-mkIII/+merge/333834 -- 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:~phill-ridout/openlp/fixes-mkIII into lp:openlp
Review: Needs Information
I have one question, but otherwise all good.
Diff comments:
> === modified file 'openlp/core/ui/media/vendor/mediainfoWrapper.py'
> --- openlp/core/ui/media/vendor/mediainfoWrapper.py 2016-12-31 11:01:36
> +
> +++ openlp/core/ui/media/vendor/mediainfoWrapper.py 2017-11-16 17:32:21
> +
> @@ -25,10 +25,10 @@
> """
> import json
> import os
> -from subprocess import Popen
> +import re
> +from subprocess import Popen, check_output
Is Popen still used? I only see you using check_output.
> from tempfile import mkstemp
>
> -import six
> from bs4 import BeautifulSoup, NavigableString
>
> ENV_DICT = os.environ
> @@ -100,20 +100,10 @@
>
> @staticmethod
> def parse(filename, environment=ENV_DICT):
> -command = ["mediainfo", "-f", "--Output=XML", filename]
> -fileno_out, fname_out = mkstemp(suffix=".xml", prefix="media-")
> -fileno_err, fname_err = mkstemp(suffix=".err", prefix="media-")
> -fp_out = os.fdopen(fileno_out, 'r+b')
> -fp_err = os.fdopen(fileno_err, 'r+b')
> -p = Popen(command, stdout=fp_out, stderr=fp_err, env=environment)
> -p.wait()
> -fp_out.seek(0)
> -
> -xml_dom = MediaInfoWrapper.parse_xml_data_into_dom(fp_out.read())
> -fp_out.close()
> -fp_err.close()
> -os.unlink(fname_out)
> -os.unlink(fname_err)
> +xml = check_output(['mediainfo', '-f', '--Output=XML',
> '--Inform=OLDXML', filename])
> +if not xml.startswith(b' +xml = check_output(['mediainfo', '-f', '--Output=XML', filename])
Haha! I see what you did there, clever!
> +xml_dom = MediaInfoWrapper.parse_xml_data_into_dom(xml)
> return MediaInfoWrapper(xml_dom)
>
> def _populate_tracks(self):
>
> === modified file
> 'tests/functional/openlp_plugins/presentations/test_mediaitem.py'
> --- tests/functional/openlp_plugins/presentations/test_mediaitem.py
> 2017-10-07 07:05:07 +
> +++ tests/functional/openlp_plugins/presentations/test_mediaitem.py
> 2017-11-16 17:32:21 +
> @@ -133,3 +133,27 @@
>
> # THEN: doc.presentation_deleted should have been called since the
> presentation file did not exists.
> mocked_doc.assert_has_calls([call.get_thumbnail_path(1, True),
> call.presentation_deleted()], True)
> +
> +
> @patch('openlp.plugins.presentations.lib.mediaitem.MediaManagerItem._setup')
> +
> @patch('openlp.plugins.presentations.lib.mediaitem.PresentationMediaItem.setup_item')
> +@patch('openlp.plugins.presentations.lib.mediaitem.Settings')
> +def test_search(self, mocked_settings, *unreferenced_mocks):
*unreferenced_mocks - another clever. I need to remember this.
> +"""
> +Test that the search method finds the correct results
> +"""
> +# GIVEN: A mocked Settings class which returns a list of Path
> objects,
> +#and an instance of the PresentationMediaItem
> +path_1 = Path('some_dir', 'Impress_file_1')
> +path_2 = Path('some_other_dir', 'impress_file_2')
> +path_3 = Path('another_dir', 'ppt_file')
> +mocked_returned_settings = MagicMock()
> +mocked_returned_settings.value.return_value = [path_1, path_2,
> path_3]
> +mocked_settings.return_value = mocked_returned_settings
> +media_item = PresentationMediaItem(None, MagicMock(), None)
> +media_item.settings_section = ''
> +
> +# WHEN: Calling search
> +results = media_item.search('IMPRE', False)
> +
> +# THEN: The first two results should have been returned
> +assert results == [[str(path_1), 'Impress_file_1'], [str(path_2),
> 'impress_file_2']]
--
https://code.launchpad.net/~phill-ridout/openlp/fixes-mkIII/+merge/333834
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:~phill-ridout/openlp/fixes-mkIII into lp:openlp
Phill has proposed merging lp:~phill-ridout/openlp/fixes-mkIII into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #1625087 in OpenLP: "Image insertion doesn't respect natural order"
https://bugs.launchpad.net/openlp/+bug/1625087
Bug #1650358 in OpenLP: "Replace Live background item right click uses wrong
icon"
https://bugs.launchpad.net/openlp/+bug/1650358
Bug #1672777 in OpenLP: "Right click menu on expanded Service item always
sends the first slide to Live"
https://bugs.launchpad.net/openlp/+bug/1672777
Bug #1673251 in OpenLP: "Incorrect file type suggested for Save As"
https://bugs.launchpad.net/openlp/+bug/1673251
Bug #1692187 in OpenLP: "[Regression] Presentations/Images with same name
gets the same thumbnail"
https://bugs.launchpad.net/openlp/+bug/1692187
Bug #1732348 in OpenLP: "MediaInfo's XML output has changed"
https://bugs.launchpad.net/openlp/+bug/1732348
For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/fixes-mkIII/+merge/333834
Various fixes
lp:~phill-ridout/openlp/fixes-mkIII (revision 2794)
https://ci.openlp.io/job/Branch-01-Pull/2301/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-02-Functional-Tests/2202/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-03-Interface-Tests/2080/ [WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code_Analysis/1406/[WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test_Coverage/1230/[WAITING]
[RUNNING]
[SUCCESS]
https://ci.openlp.io/job/Branch-04c-Code_Analysis2/360/[WAITING]
[RUNNING]
[SUCCESS]
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~phill-ridout/openlp/fixes-mkIII into lp:openlp.
=== modified file 'openlp/core/ui/media/vendor/mediainfoWrapper.py'
--- openlp/core/ui/media/vendor/mediainfoWrapper.py 2016-12-31 11:01:36 +
+++ openlp/core/ui/media/vendor/mediainfoWrapper.py 2017-11-16 17:32:21 +
@@ -25,10 +25,10 @@
"""
import json
import os
-from subprocess import Popen
+import re
+from subprocess import Popen, check_output
from tempfile import mkstemp
-import six
from bs4 import BeautifulSoup, NavigableString
ENV_DICT = os.environ
@@ -80,7 +80,7 @@
def to_data(self):
data = {}
-for k, v in six.iteritems(self.__dict__):
+for k, v in self.__dict__.items():
if k != 'xml_dom_fragment':
data[k] = v
return data
@@ -100,20 +100,10 @@
@staticmethod
def parse(filename, environment=ENV_DICT):
-command = ["mediainfo", "-f", "--Output=XML", filename]
-fileno_out, fname_out = mkstemp(suffix=".xml", prefix="media-")
-fileno_err, fname_err = mkstemp(suffix=".err", prefix="media-")
-fp_out = os.fdopen(fileno_out, 'r+b')
-fp_err = os.fdopen(fileno_err, 'r+b')
-p = Popen(command, stdout=fp_out, stderr=fp_err, env=environment)
-p.wait()
-fp_out.seek(0)
-
-xml_dom = MediaInfoWrapper.parse_xml_data_into_dom(fp_out.read())
-fp_out.close()
-fp_err.close()
-os.unlink(fname_out)
-os.unlink(fname_err)
+xml = check_output(['mediainfo', '-f', '--Output=XML', '--Inform=OLDXML', filename])
+if not xml.startswith(b'___
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:~alisonken1/openlp/pjlink2-l into lp:openlp
Review: Needs Fixing Just one last tweak. Diff comments: > > === removed directory 'openlp/core/lib/projector' > === added directory 'openlp/core/projectors' > === renamed file 'openlp/core/lib/projector/__init__.py' => > 'openlp/core/projectors/__init__.py' > --- openlp/core/lib/projector/__init__.py 2016-12-31 11:01:36 + > +++ openlp/core/projectors/__init__.py2017-11-16 16:58:32 + > @@ -25,7 +25,10 @@ > Initialization for the openlp.core.ui.projector modules. > """ > > - > +from .constants import PJLINK_PORT, ERROR_MSG, ERROR_STRING Make this a fully qualified import if possible please? from openlp.core.projectors.constants import ... > + > + > +# Due to circular dependencies, put the imports after defines I'm guessing this was the comment you were talking about in IRC? > class DialogSourceStyle(object): > """ > An enumeration for projector dialog box type. -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-l/+merge/333832 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:~alisonken1/openlp/pjlink2-l into lp:openlp
The proposal to merge lp:~alisonken1/openlp/pjlink2-l into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~alisonken1/openlp/pjlink2-l/+merge/333537 -- 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 1473670] Re: Remove current clock time from default save name
I agree with Tim. ** Changed in: openlp Status: New => Won't Fix -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1473670 Title: Remove current clock time from default save name Status in OpenLP: Won't Fix Bug description: I feel like the current clock time when the service list is saved for the first time is irrelevant. It also creates problems for translating because : is used as default h:m separator in many countries. (Windows does not support : in filenames) So instead of d/m/y h/m it could be just d/m/y . I know this can be shortened via the options menu, but for me (h/m) seems something the majority of users don’t need. (And there is also those users who don’t really change any settings and just go with it anyways). h/m might be handy if you are saving multiple service files during one day and don’t want to rename them, but I can’t think of many other reasons. If there are any, please enlighten me. Blessings and thank you for the effort! To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1473670/+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:~raoul-snyman/openlp/settings-upgrade into lp:openlp
Review: Approve
Seems good to me, 1 minor comment, but I'd be happy for this to be merged
Diff comments:
>
> === modified file 'openlp/core/common/settings.py'
> --- openlp/core/common/settings.py2017-11-10 22:50:04 +
> +++ openlp/core/common/settings.py2017-11-16 05:12:46 +
> @@ -467,32 +468,38 @@
> for version in range(current_version, __version__):
> version += 1
> upgrade_list = getattr(self,
> '__setting_upgrade_{version}__'.format(version=version))
> -for old_key, new_key, rules in upgrade_list:
> +for old_keys, new_key, rules in upgrade_list:
> # Once removed we don't have to do this again. - Can be
> removed once fully switched to the versioning
> # system.
> -if not self.contains(old_key):
> +if not isinstance(old_keys, (tuple, list)):
> +old_keys = [old_keys]
> +if any([not self.contains(old_key) for old_key in old_keys]):
> +log.warning('One of {} does not exist, skipping
> upgrade'.format(old_keys))
> continue
> if new_key:
> # Get the value of the old_key.
> -old_value = super(Settings, self).value(old_key)
> +old_values = [super(Settings, self).value(old_key) for
> old_key in old_keys]
super().value(old_key) is more concise
> # When we want to convert the value, we have to figure
> out the default value (because we cannot get
> # the default value from the central settings dict.
> if rules:
> -default_value = rules[0][1]
> -old_value = self._convert_value(old_value,
> default_value)
> +default_values = rules[0][1]
> +if not isinstance(default_values, (list, tuple)):
> +default_values = [default_values]
> +old_values = [self._convert_value(old_value,
> default_value)
> + for old_value, default_value in
> zip(old_values, default_values)]
> # Iterate over our rules and check what the old_value
> should be "converted" to.
> -for new, old in rules:
> +new_value = None
> +for new_rule, old_rule in rules:
> # If the value matches with the condition (rule),
> then use the provided value. This is used to
> # convert values. E. g. an old value 1 results in
> True, and 0 in False.
> -if callable(new):
> -old_value = new(old_value)
> -elif old == old_value:
> -old_value = new
> +if callable(new_rule):
> +new_value = new_rule(*old_values)
> +elif old_rule in old_values:
> +new_value = new_rule
> break
> -self.setValue(new_key, old_value)
> -if new_key != old_key:
> -self.remove(old_key)
> -self.setValue('settings/version', version)
> +self.setValue(new_key, new_value)
> +[self.remove(old_key) for old_key in old_keys if old_key !=
> new_key]
> +self.setValue('settings/version', version)
>
> def value(self, key):
> """
--
https://code.launchpad.net/~raoul-snyman/openlp/settings-upgrade/+merge/333788
Your team OpenLP Core is requested to review the proposed merge of
lp:~raoul-snyman/openlp/settings-upgrade into 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
