OpenLP

Merge lp://qastaging/~phill-ridout/openlp/saved_bible_verses into lp://qastaging/openlp

  1. saved_bible_verses
  2. Merge into trunk
Proposed by Phill
Status: Merged
Merged at revision: 2743
Proposed branch: lp://qastaging/~phill-ridout/openlp/saved_bible_verses
Merge into: lp://qastaging/openlp
Diff against target: 1076 lines (+324/-202)
12 files modified
openlp/core/ui/lib/listwidgetwithdnd.py (+10/-4)
openlp/core/ui/lib/pathedit.py (+4/-4)
openlp/plugins/bibles/lib/__init__.py (+3/-3)
openlp/plugins/bibles/lib/db.py (+13/-0)
openlp/plugins/bibles/lib/manager.py (+15/-43)
openlp/plugins/bibles/lib/mediaitem.py (+178/-63)
openlp/plugins/presentations/presentationplugin.py (+1/-1)
openlp/plugins/songusage/forms/songusagedetaildialog.py (+1/-1)
resources/images/openlp-2.qrc (+2/-4)
tests/functional/openlp_core_ui_lib/test_listwidgetwithdnd.py (+33/-31)
tests/functional/openlp_plugins/bibles/test_mediaitem.py (+63/-47)
tests/interfaces/openlp_plugins/bibles/test_lib_parse_reference.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~phill-ridout/openlp/saved_bible_verses
Reviewer Review Type Date Requested Status
Tomas Groth Approve
Tim Bentley Pending
Review via email: mp+324674@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2017-05-07.

Description of the change

Merged in trunk

Adds more flexibility to 'locking' bible verses.
fixes #1625681 "If Bible search results are locked, duplicated results are listed"

lp:~phill-ridout/openlp/saved_bible_verses (revision 2746)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2030/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1940/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1871/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1251/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1105/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/234/
[FAILURE] https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/81/
Stopping after failure

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote : Posted in a previous version of this proposal

Please can you remove the resource file as this makes it difficult to see the changes.
The resource file can be merged in the next request,

review: Needs Fixing
Revision history for this message
Tim Bentley (trb143) wrote : Posted in a previous version of this proposal

Traceback (most recent call last):
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 789, in on_search_timer_timeout
    self.text_search()
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 765, in text_search
    self.display_results()
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 798, in display_results
    self.current_results = self.build_display_results(self.bible, self.second_bible, self.search_results)
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 814, in build_display_results
    version = self.plugin.manager.get_meta_data(self.bible.name, 'name').value
AttributeError: 'NoneType' object has no attribute 'name'

downloaded and started to no bibles loaded !!!!!!!

Loaded a new bible and started to type. Search as type fired and downloaded the chapter and gave me a message saying search as you type is not available!

Then a traceback
Traceback (most recent call last):
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 789, in on_search_timer_timeout
    self.text_search()
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 768, in text_search
    self.on_text_search(text)
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 732, in on_text_search
    self.display_results()
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 798, in display_results
    self.current_results = self.build_display_results(self.bible, self.second_bible, self.search_results)
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 828, in build_display_results
    for count, verse in enumerate(search_results):
TypeError: 'NoneType' object is not iterable

On the select UI I only have 2 lines of search as the options is large and takes up most the the space.

review: Needs Fixing
Revision history for this message
Tim Bentley (trb143) wrote : Posted in a previous version of this proposal

Traceback (most recent call last):
  File "./openlp.py", line 44, in <module>
    main()
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/core/__init__.py", line 439, in main
    sys.exit(application.run(qt_args))
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/core/__init__.py", line 145, in run
    self.main_window.show()
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/core/ui/mainwindow.py", line 626, in show
    self.service_manager_contents.load_last_file()
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/core/ui/servicemanager.py", line 841, in load_last_file
    self.load_file(file_name)
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/core/ui/servicemanager.py", line 770, in load_file
    self.process_service_items(items)
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/core/ui/servicemanager.py", line 829, in process_service_items
    new_item = Registry().get(service_item.name).service_load(service_item)
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/songs/lib/mediaitem.py", line 712, in service_load
    self.generate_footer(item, song)
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/songs/lib/mediaitem.py", line 663, in generate_footer
    if self.display_copyright_symbol:
AttributeError: 'SongMediaItem' object has no attribute 'display_copyright_symbol'

on start up!

review: Needs Fixing
Revision history for this message
Tim Bentley (trb143) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Tomas Groth (tomasgroth) wrote :

I just did a quick test, where I using ESV:
 * Searched for "wrath", saved the verses.
 * Searched for "wrath of" and again saved the verses.

This causes the a lot of duplicates in the saved verse lists since the second list of saved verses seems to be appended to the existing list, without any duplicate checks. Is this intended behavior? Maybe removing duplicates and inserting new saved verses into list so that they are chronologically ordered, should be considered?

Revision history for this message
Phill (phill-ridout) wrote :

> I just did a quick test, where I using ESV:
> * Searched for "wrath", saved the verses.
> * Searched for "wrath of" and again saved the verses.
>
> This causes the a lot of duplicates in the saved verse lists since the second
> list of saved verses seems to be appended to the existing list, without any
> duplicate checks. Is this intended behavior? Maybe removing duplicates and
> inserting new saved verses into list so that they are chronologically ordered,
> should be considered?

Only verses that are selected should be saved. The idea being is that you could build up a list of verses, possibly from different places in the bible, and present them as one item.

I think it should be down to the user to decided if they want to add duplicate verses. How often would you add all the search results as a service item?

Revision history for this message
Tomas Groth (tomasgroth) wrote :

Ok, I'm convinced :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.