openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #28698
[Merge] lp:~tomasgroth/openlp/remove-copyrighted-songs into lp:openlp
Tomas Groth has proposed merging lp:~tomasgroth/openlp/remove-copyrighted-songs into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~tomasgroth/openlp/remove-copyrighted-songs/+merge/286111
Removed songs used in tests that is not in public domain.
--
Your team OpenLP Core is requested to review the proposed merge of lp:~tomasgroth/openlp/remove-copyrighted-songs into lp:openlp.
=== modified file 'tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py'
--- tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py 2015-12-31 22:46:06 +0000
+++ tests/functional/openlp_plugins/songs/test_presentationmanagerimport.py 2016-02-15 21:21:26 +0000
@@ -44,7 +44,5 @@
"""
self.file_import([os.path.join(TEST_PATH, 'Great Is Thy Faithfulness.sng')],
self.load_external_result_data(os.path.join(TEST_PATH, 'Great Is Thy Faithfulness.json')))
- self.file_import([os.path.join(TEST_PATH, 'Agnus Dei.sng')],
- self.load_external_result_data(os.path.join(TEST_PATH, 'Agnus Dei.json')))
self.file_import([os.path.join(TEST_PATH, 'Amazing Grace.sng')],
self.load_external_result_data(os.path.join(TEST_PATH, 'Amazing Grace.json')))
=== modified file 'tests/functional/openlp_plugins/songs/test_propresenterimport.py'
--- tests/functional/openlp_plugins/songs/test_propresenterimport.py 2015-12-31 22:46:06 +0000
+++ tests/functional/openlp_plugins/songs/test_propresenterimport.py 2016-02-15 21:21:26 +0000
@@ -45,5 +45,3 @@
"""
self.file_import([os.path.join(TEST_PATH, 'Amazing Grace.pro4')],
self.load_external_result_data(os.path.join(TEST_PATH, 'Amazing Grace.json')))
- self.file_import([os.path.join(TEST_PATH, 'Vaste Grond.pro4')],
- self.load_external_result_data(os.path.join(TEST_PATH, 'Vaste Grond.json')))
=== modified file 'tests/functional/openlp_plugins/songs/test_sundayplusimport.py'
--- tests/functional/openlp_plugins/songs/test_sundayplusimport.py 2016-01-09 09:09:29 +0000
+++ tests/functional/openlp_plugins/songs/test_sundayplusimport.py 2016-02-15 21:21:26 +0000
@@ -45,7 +45,5 @@
with patch('openlp.plugins.songs.lib.importers.sundayplus.retrieve_windows_encoding') as \
mocked_retrieve_windows_encoding:
mocked_retrieve_windows_encoding.return_value = 'cp1252'
- self.file_import([os.path.join(TEST_PATH, 'Abba Fader.ptf')],
- self.load_external_result_data(os.path.join(TEST_PATH, 'abba-fader.json')))
self.file_import([os.path.join(TEST_PATH, 'Amazing Grace.ptf')],
self.load_external_result_data(os.path.join(TEST_PATH, 'Amazing Grace.json')))
=== modified file 'tests/functional/openlp_plugins/songs/test_worshipassistantimport.py'
--- tests/functional/openlp_plugins/songs/test_worshipassistantimport.py 2015-12-31 22:46:06 +0000
+++ tests/functional/openlp_plugins/songs/test_worshipassistantimport.py 2016-02-15 21:21:26 +0000
@@ -49,5 +49,3 @@
self.load_external_result_data(os.path.join(TEST_PATH, 'would_you_be_free.json')))
self.file_import(os.path.join(TEST_PATH, 'would_you_be_free2.csv'),
self.load_external_result_data(os.path.join(TEST_PATH, 'would_you_be_free.json')))
- self.file_import(os.path.join(TEST_PATH, 'lift_up_your_heads.csv'),
- self.load_external_result_data(os.path.join(TEST_PATH, 'lift_up_your_heads.json')))
=== modified file 'tests/interfaces/openlp_core_ui/test_projectorsourceform.py'
--- tests/interfaces/openlp_core_ui/test_projectorsourceform.py 2016-01-15 19:41:14 +0000
+++ tests/interfaces/openlp_core_ui/test_projectorsourceform.py 2016-02-15 21:21:26 +0000
@@ -28,6 +28,7 @@
log = logging.getLogger(__name__)
log.debug('test_projectorsourceform loaded')
import os
+import time
from unittest import TestCase
from PyQt5.QtWidgets import QDialog
=== removed file 'tests/resources/presentationmanagersongs/Agnus Dei.json'
--- tests/resources/presentationmanagersongs/Agnus Dei.json 2014-10-13 11:38:13 +0000
+++ tests/resources/presentationmanagersongs/Agnus Dei.json 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-{
- "title": "Agnus Dei",
- "verse_order_list": ["v1", "v2"],
- "verses": [
- [
- "Alleluia Alleluluia \nfor the Lord almighty reigns \nAlleluia Alleluluia \nHoly holy are you Lord God Almighty \nWorthy is the lamb \nWorthy is the lamb \nHoly holy are you Lord God Almighty",
- "v1"
- ],
- [
- "Worthy is the lamb \nWorthy is the lamb \nYou are holy holy \nAre you lamb \nWorthy is the lamb \nYou are holy holy \nYou are holy holy",
- "v2"
- ]
- ]
-}
=== removed file 'tests/resources/presentationmanagersongs/Agnus Dei.sng'
--- tests/resources/presentationmanagersongs/Agnus Dei.sng 2014-10-13 11:38:13 +0000
+++ tests/resources/presentationmanagersongs/Agnus Dei.sng 1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<song xmlns="creativelifestyles/song">
-<attributes>
-<title>Agnus Dei</title>
-<author></author>
-<copyright></copyright>
-<ccli_number></ccli_number>
-<comments></comments>
-</attributes>
-<verses>
-<verse id="Verse 1">
-Alleluia Alleluluia
-for the Lord almighty reigns
-Alleluia Alleluluia
-Holy holy are you Lord God Almighty
-Worthy is the lamb
-Worthy is the lamb
-Holy holy are you Lord God Almighty
-
-
-</verse>
-<verse id="Verse 2">
-Worthy is the lamb
-Worthy is the lamb
-You are holy holy
-Are you lamb
-Worthy is the lamb
-You are holy holy
-You are holy holy
-
-
-</verse>
-</verses>
-</song>
=== removed file 'tests/resources/propresentersongs/Vaste Grond.json'
--- tests/resources/propresentersongs/Vaste Grond.json 2014-08-18 19:15:23 +0000
+++ tests/resources/propresentersongs/Vaste Grond.json 1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-{
- "title": "Vaste Grond",
- "verse_order_list": [],
- "verses": [
- [
- "God voor U is niets onmogelijk\nHoe ongelofelijk\nU heeft alles in de hand",
- "v1"
- ],
- [
- "U bent God en trekt Uw eigen plan\nU bent voor niemand bang\nVoor niets en niemand bang",
- "v2"
- ],
- [
- "U houd me vast en geeft me moed\nOm door te gaan als ik niet durf\nIk wil van U zijn",
- "v3"
- ],
- [
- "U geeft me kracht, en bent de vaste grond\nwaarop ik stevig sta\nik wil van U zijn, voor altijd van U zijn\nO God.",
- "v4"
- ],
- [
- "Grote God, U bent uitzonderlijk\nen ondoorgrondelijk\nU biedt Uw liefde aan",
- "v5"
- ],
- [
- "Wie ben ik, dat U mij ziet staan\nen met mij om wilt gaan?\nIk kan U niet weerstaan",
- "v6"
- ],
- [
- "Onweerstaanbaar,\nonweerstaanbare God",
- "v7"
- ]
- ]
-}
=== removed file 'tests/resources/propresentersongs/Vaste Grond.pro4'
--- tests/resources/propresentersongs/Vaste Grond.pro4 2014-08-18 19:04:46 +0000
+++ tests/resources/propresentersongs/Vaste Grond.pro4 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-<RVPresentationDocument height="870" width="1152" versionNumber="400" docType="0" creatorCode="1349676880" lastDateUsed="2011-01-09T09:34:05" usedCount="0" category="Presentation" resourcesDirectory="" backgroundColor="0 0 0 1" drawingBackgroundColor="0" notes="" artist="" author="" album="" CCLIDisplay="0" CCLIArtistCredits="" CCLISongTitle="" CCLIPublisher="" CCLICopyrightInfo="" CCLILicenseNumber=""><slides containerClass="NSMutableArray"><RVDisplaySlide backgroundColor="0 0 0 1" enabled="1" highlightColor="0 0 0 0" hotKey="" label="" notes="" slideType="1" sort_index="0" UUID="01ED5EA2-1674-4B9D-A277-9E114BACA802" drawingBackgroundColor="0" serialization-array-index="0"><cues containerClass="NSMutableArray"></cues><displayElements containerClass="NSMutableArray"><RVTextElement displayDelay="0" displayName="" locked="0" persistent="0" typeID="0" fromTemplate="0" bezelRadius="0" drawingFill="0" drawingShadow="0" drawingStroke="0" fillColor="1 1 1 1" rotation="0" source="" adjustsHeightToFit="0" verticalAlignment="1" RTFData="e1xydGYxXGFuc2lcYW5zaWNwZzEyNTJcY29jb2FydGY5NDlcY29jb2FzdWJydGY1NDAKe1xmb250dGJsXGYwXGZzd2lzc1xmY2hhcnNldDAgSGVsdmV0aWNhO30Ke1xjb2xvcnRibDtccmVkMjU1XGdyZWVuMjU1XGJsdWUyNTU7fQpccGFyZFx0eDU2MFx0eDExMjBcdHgxNjgwXHR4MjI0MFx0eDI4MDBcdHgzMzYwXHR4MzkyMFx0eDQ0ODBcdHg1MDQwXHR4NTYwMFx0eDYxNjBcdHg2NzIwXHFjXHBhcmRpcm5hdHVyYWwKClxmMFxmczk2IFxjZjEgR29kIHZvb3IgVSBpcyBuaWV0cyBvbm1vZ2VsaWprXApIb2Ugb25nZWxvZmVsaWprXApVIGhlZWZ0IGFsbGVzIGluIGRlIGhhbmR9" serialization-array-index="0"><_-RVRect3D-_position x="32.37209" y="29" z="0" width="1074.349" height="818.7442"></_-RVRect3D-_position><_-D-_serializedShadow containerClass="NSMutableDictionary"><NSCalibratedRGBColor serialization-native-value="0 0 0 0.3333333432674408" serialization-dictionary-key="shadowColor"></NSCalibratedRGBColor><NSCFString serialization-native-value="{5, -5}" serialization-dictionary-key="shadowOffset"></NSCFString><NSCFNumber serialization-native-value="0" serialization-dictionary-key="shadowBlurRadius"></NSCFNumber></_-D-_serializedShadow><stroke containerClass="NSMutableDictionary"><NSCachedRGBColor serialization-native-value="0 0 0 1" serialization-dictionary-key="RVShapeElementStrokeColorKey"></NSCachedRGBColor><NSCFNumber serialization-native-value="1" serialization-dictionary-key="RVShapeElementStrokeWidthKey"></NSCFNumber></stroke></RVTextElement></displayElements></RVDisplaySlide><RVDisplaySlide backgroundColor="0 0 0 1" enabled="1" highlightColor="0 0 0 0" hotKey="" label="" notes="" slideType="1" sort_index="1" UUID="95517344-C447-4FDA-AEDB-48334E59CE47" drawingBackgroundColor="0" serialization-array-index="1"><cues containerClass="NSMutableArray"></cues><displayElements containerClass="NSMutableArray"><RVTextElement displayDelay="0" displayName="" locked="0" persistent="0" typeID="0" fromTemplate="0" bezelRadius="0" drawingFill="0" drawingShadow="0" drawingStroke="0" fillColor="1 1 1 1" rotation="0" source="" adjustsHeightToFit="0" verticalAlignment="1" RTFData="e1xydGYxXGFuc2lcYW5zaWNwZzEyNTJcY29jb2FydGY5NDlcY29jb2FzdWJydGY1NDAKe1xmb250dGJsXGYwXGZzd2lzc1xmY2hhcnNldDAgSGVsdmV0aWNhO30Ke1xjb2xvcnRibDtccmVkMjU1XGdyZWVuMjU1XGJsdWUyNTU7fQpccGFyZFx0eDU2MFx0eDExMjBcdHgxNjgwXHR4MjI0MFx0eDI4MDBcdHgzMzYwXHR4MzkyMFx0eDQ0ODBcdHg1MDQwXHR4NTYwMFx0eDYxNjBcdHg2NzIwXHFjXHBhcmRpcm5hdHVyYWwKClxmMFxmczk2IFxjZjEgVSBiZW50IEdvZCBlbiB0cmVrdCBVdyBlaWdlbiBwbGFuXApVIGJlbnQgdm9vciBuaWVtYW5kIGJhbmdcClZvb3IgbmlldHMgZW4gbmllbWFuZCBiYW5nfQ==" serialization-array-index="0"><_-RVRect3D-_position x="32.37209" y="29" z="0" width="1074.349" height="818.7442"></_-RVRect3D-_position><_-D-_serializedShadow containerClass="NSMutableDictionary"><NSCalibratedRGBColor serialization-native-value="0 0 0 0.3333333432674408" serialization-dictionary-key="shadowColor"></NSCalibratedRGBColor><NSCFString serialization-native-value="{5, -5}" serialization-dictionary-key="shadowOffset"></NSCFString><NSCFNumber serialization-native-value="0" serialization-dictionary-key="shadowBlurRadius"></NSCFNumber></_-D-_serializedShadow><stroke containerClass="NSMutableDictionary"><NSCachedRGBColor serialization-native-value="0 0 0 1" serialization-dictionary-key="RVShapeElementStrokeColorKey"></NSCachedRGBColor><NSCFNumber serialization-native-value="1" serialization-dictionary-key="RVShapeElementStrokeWidthKey"></NSCFNumber></stroke></RVTextElement></displayElements></RVDisplaySlide><RVDisplaySlide backgroundColor="0 0 0 1" enabled="1" highlightColor="0 0 0 0" hotKey="" label="" notes="" slideType="1" sort_index="2" UUID="931010EB-1B70-4F57-9D19-D2957D96D853" drawingBackgroundColor="0" serialization-array-index="2"><cues containerClass="NSMutableArray"></cues><displayElements containerClass="NSMutableArray"><RVTextElement displayDelay="0" displayName="" locked="0" persistent="0" typeID="0" fromTemplate="0" bezelRadius="0" drawingFill="0" drawingShadow="0" drawingStroke="0" fillColor="1 1 1 1" rotation="0" source="" adjustsHeightToFit="0" verticalAlignment="1" RTFData="e1xydGYxXGFuc2lcYW5zaWNwZzEyNTJcY29jb2FydGY5NDlcY29jb2FzdWJydGY1NDAKe1xmb250dGJsXGYwXGZzd2lzc1xmY2hhcnNldDAgSGVsdmV0aWNhO30Ke1xjb2xvcnRibDtccmVkMjU1XGdyZWVuMjU1XGJsdWUyNTU7fQpccGFyZFx0eDU2MFx0eDExMjBcdHgxNjgwXHR4MjI0MFx0eDI4MDBcdHgzMzYwXHR4MzkyMFx0eDQ0ODBcdHg1MDQwXHR4NTYwMFx0eDYxNjBcdHg2NzIwXHFjXHBhcmRpcm5hdHVyYWwKClxmMFxmczk2IFxjZjEgVSBob3VkIG1lIHZhc3QgZW4gZ2VlZnQgbWUgbW9lZFwKT20gZG9vciB0ZSBnYWFuIGFscyBpayBuaWV0IGR1cmZcCklrIHdpbCB2YW4gVSB6aWpufQ==" serialization-array-index="0"><_-RVRect3D-_position x="32.37209" y="29" z="0" width="1074.349" height="818.7442"></_-RVRect3D-_position><_-D-_serializedShadow containerClass="NSMutableDictionary"><NSCalibratedRGBColor serialization-native-value="0 0 0 0.3333333432674408" serialization-dictionary-key="shadowColor"></NSCalibratedRGBColor><NSCFString serialization-native-value="{5, -5}" serialization-dictionary-key="shadowOffset"></NSCFString><NSCFNumber serialization-native-value="0" serialization-dictionary-key="shadowBlurRadius"></NSCFNumber></_-D-_serializedShadow><stroke containerClass="NSMutableDictionary"><NSCachedRGBColor serialization-native-value="0 0 0 1" serialization-dictionary-key="RVShapeElementStrokeColorKey"></NSCachedRGBColor><NSCFNumber serialization-native-value="1" serialization-dictionary-key="RVShapeElementStrokeWidthKey"></NSCFNumber></stroke></RVTextElement></displayElements></RVDisplaySlide><RVDisplaySlide backgroundColor="0 0 0 1" enabled="1" highlightColor="0 0 0 0" hotKey="" label="" notes="" slideType="1" sort_index="3" UUID="3D241B4F-026E-4EC9-9A7F-A5DAC287BF11" drawingBackgroundColor="0" serialization-array-index="3"><cues containerClass="NSMutableArray"></cues><displayElements containerClass="NSMutableArray"><RVTextElement displayDelay="0" displayName="" locked="0" persistent="0" typeID="0" fromTemplate="0" bezelRadius="0" drawingFill="0" drawingShadow="0" drawingStroke="0" fillColor="1 1 1 1" rotation="0" source="" adjustsHeightToFit="0" verticalAlignment="1" RTFData="e1xydGYxXGFuc2lcYW5zaWNwZzEyNTJcY29jb2FydGY5NDlcY29jb2FzdWJydGY1NDAKe1xmb250dGJsXGYwXGZzd2lzc1xmY2hhcnNldDAgSGVsdmV0aWNhO30Ke1xjb2xvcnRibDtccmVkMjU1XGdyZWVuMjU1XGJsdWUyNTU7fQpccGFyZFx0eDU2MFx0eDExMjBcdHgxNjgwXHR4MjI0MFx0eDI4MDBcdHgzMzYwXHR4MzkyMFx0eDQ0ODBcdHg1MDQwXHR4NTYwMFx0eDYxNjBcdHg2NzIwXHFjXHBhcmRpcm5hdHVyYWwKClxmMFxmczk2IFxjZjEgVSBnZWVmdCBtZSBrcmFjaHQsIGVuIGJlbnQgZGUgdmFzdGUgZ3JvbmRcCndhYXJvcCBpayBzdGV2aWcgc3RhXAppayB3aWwgdmFuIFUgemlqbiwgdm9vciBhbHRpamQgdmFuIFUgemlqblwKTyBHb2QufQ==" serialization-array-index="0"><_-RVRect3D-_position x="32.37209" y="29" z="0" width="1074.349" height="818.7442"></_-RVRect3D-_position><_-D-_serializedShadow containerClass="NSMutableDictionary"><NSCalibratedRGBColor serialization-native-value="0 0 0 0.3333333432674408" serialization-dictionary-key="shadowColor"></NSCalibratedRGBColor><NSCFString serialization-native-value="{5, -5}" serialization-dictionary-key="shadowOffset"></NSCFString><NSCFNumber serialization-native-value="0" serialization-dictionary-key="shadowBlurRadius"></NSCFNumber></_-D-_serializedShadow><stroke containerClass="NSMutableDictionary"><NSCachedRGBColor serialization-native-value="0 0 0 1" serialization-dictionary-key="RVShapeElementStrokeColorKey"></NSCachedRGBColor><NSCFNumber serialization-native-value="1" serialization-dictionary-key="RVShapeElementStrokeWidthKey"></NSCFNumber></stroke></RVTextElement></displayElements></RVDisplaySlide><RVDisplaySlide backgroundColor="0 0 0 1" enabled="1" highlightColor="0 0 0 0" hotKey="" label="" notes="" slideType="1" sort_index="4" UUID="C257A8B6-1685-42BD-91B1-36EFF4D9572A" drawingBackgroundColor="0" serialization-array-index="4"><cues containerClass="NSMutableArray"></cues><displayElements containerClass="NSMutableArray"><RVTextElement displayDelay="0" displayName="" locked="0" persistent="0" typeID="0" fromTemplate="0" bezelRadius="0" drawingFill="0" drawingShadow="0" drawingStroke="0" fillColor="1 1 1 1" rotation="0" source="" adjustsHeightToFit="0" verticalAlignment="1" RTFData="e1xydGYxXGFuc2lcYW5zaWNwZzEyNTJcY29jb2FydGY5NDlcY29jb2FzdWJydGY1NDAKe1xmb250dGJsXGYwXGZzd2lzc1xmY2hhcnNldDAgSGVsdmV0aWNhO30Ke1xjb2xvcnRibDtccmVkMjU1XGdyZWVuMjU1XGJsdWUyNTU7fQpccGFyZFx0eDU2MFx0eDExMjBcdHgxNjgwXHR4MjI0MFx0eDI4MDBcdHgzMzYwXHR4MzkyMFx0eDQ0ODBcdHg1MDQwXHR4NTYwMFx0eDYxNjBcdHg2NzIwXHFjXHBhcmRpcm5hdHVyYWwKClxmMFxmczk2IFxjZjEgR3JvdGUgR29kLCBVIGJlbnQgdWl0em9uZGVybGlqa1wKZW4gb25kb29yZ3JvbmRlbGlqa1wKVSBiaWVkdCBVdyBsaWVmZGUgYWFufQ==" serialization-array-index="0"><_-RVRect3D-_position x="32.37209" y="29" z="0" width="1074.349" height="818.7442"></_-RVRect3D-_position><_-D-_serializedShadow containerClass="NSMutableDictionary"><NSCalibratedRGBColor serialization-native-value="0 0 0 0.3333333432674408" serialization-dictionary-key="shadowColor"></NSCalibratedRGBColor><NSCFString serialization-native-value="{5, -5}" serialization-dictionary-key="shadowOffset"></NSCFString><NSCFNumber serialization-native-value="0" serialization-dictionary-key="shadowBlurRadius"></NSCFNumber></_-D-_serializedShadow><stroke containerClass="NSMutableDictionary"><NSCachedRGBColor serialization-native-value="0 0 0 1" serialization-dictionary-key="RVShapeElementStrokeColorKey"></NSCachedRGBColor><NSCFNumber serialization-native-value="1" serialization-dictionary-key="RVShapeElementStrokeWidthKey"></NSCFNumber></stroke></RVTextElement></displayElements></RVDisplaySlide><RVDisplaySlide backgroundColor="0 0 0 1" enabled="1" highlightColor="0 0 0 0" hotKey="" label="" notes="" slideType="1" sort_index="5" UUID="F4B3AF43-BC5B-4A0E-A365-C4A745E97C33" drawingBackgroundColor="0" serialization-array-index="5"><cues containerClass="NSMutableArray"></cues><displayElements containerClass="NSMutableArray"><RVTextElement displayDelay="0" displayName="" locked="0" persistent="0" typeID="0" fromTemplate="0" bezelRadius="0" drawingFill="0" drawingShadow="0" drawingStroke="0" fillColor="1 1 1 1" rotation="0" source="" adjustsHeightToFit="0" verticalAlignment="1" RTFData="e1xydGYxXGFuc2lcYW5zaWNwZzEyNTJcY29jb2FydGY5NDlcY29jb2FzdWJydGY1NDAKe1xmb250dGJsXGYwXGZzd2lzc1xmY2hhcnNldDAgSGVsdmV0aWNhO30Ke1xjb2xvcnRibDtccmVkMjU1XGdyZWVuMjU1XGJsdWUyNTU7fQpccGFyZFx0eDU2MFx0eDExMjBcdHgxNjgwXHR4MjI0MFx0eDI4MDBcdHgzMzYwXHR4MzkyMFx0eDQ0ODBcdHg1MDQwXHR4NTYwMFx0eDYxNjBcdHg2NzIwXHFjXHBhcmRpcm5hdHVyYWwKClxmMFxmczk2IFxjZjEgV2llIGJlbiBpaywgZGF0IFUgbWlqIHppZXQgc3RhYW5cCmVuIG1ldCBtaWogb20gd2lsdCBnYWFuP1wKSWsga2FuIFUgbmlldCB3ZWVyc3RhYW59" serialization-array-index="0"><_-RVRect3D-_position x="32.37209" y="29" z="0" width="1074.349" height="818.7442"></_-RVRect3D-_position><_-D-_serializedShadow containerClass="NSMutableDictionary"><NSCalibratedRGBColor serialization-native-value="0 0 0 0.3333333432674408" serialization-dictionary-key="shadowColor"></NSCalibratedRGBColor><NSCFString serialization-native-value="{5, -5}" serialization-dictionary-key="shadowOffset"></NSCFString><NSCFNumber serialization-native-value="0" serialization-dictionary-key="shadowBlurRadius"></NSCFNumber></_-D-_serializedShadow><stroke containerClass="NSMutableDictionary"><NSCachedRGBColor serialization-native-value="0 0 0 1" serialization-dictionary-key="RVShapeElementStrokeColorKey"></NSCachedRGBColor><NSCFNumber serialization-native-value="1" serialization-dictionary-key="RVShapeElementStrokeWidthKey"></NSCFNumber></stroke></RVTextElement></displayElements></RVDisplaySlide><RVDisplaySlide backgroundColor="0 0 0 1" enabled="1" highlightColor="0 0 0 0" hotKey="" label="" notes="" slideType="1" sort_index="6" UUID="6BEEF0BC-E0C3-43CF-A33D-C5EAC5534244" drawingBackgroundColor="0" serialization-array-index="6"><cues containerClass="NSMutableArray"></cues><displayElements containerClass="NSMutableArray"><RVTextElement displayDelay="0" displayName="" locked="0" persistent="0" typeID="0" fromTemplate="0" bezelRadius="0" drawingFill="0" drawingShadow="0" drawingStroke="0" fillColor="1 1 1 1" rotation="0" source="" adjustsHeightToFit="0" verticalAlignment="1" RTFData="e1xydGYxXGFuc2lcYW5zaWNwZzEyNTJcY29jb2FydGY5NDlcY29jb2FzdWJydGY1NDAKe1xmb250dGJsXGYwXGZzd2lzc1xmY2hhcnNldDAgSGVsdmV0aWNhO30Ke1xjb2xvcnRibDtccmVkMjU1XGdyZWVuMjU1XGJsdWUyNTU7fQpccGFyZFx0eDU2MFx0eDExMjBcdHgxNjgwXHR4MjI0MFx0eDI4MDBcdHgzMzYwXHR4MzkyMFx0eDQ0ODBcdHg1MDQwXHR4NTYwMFx0eDYxNjBcdHg2NzIwXHFjXHBhcmRpcm5hdHVyYWwKClxmMFxmczk2IFxjZjEgT253ZWVyc3RhYW5iYWFyLFwKb253ZWVyc3RhYW5iYXJlIEdvZH0=" serialization-array-index="0"><_-RVRect3D-_position x="32.37209" y="29" z="0" width="1074.349" height="818.7442"></_-RVRect3D-_position><_-D-_serializedShadow containerClass="NSMutableDictionary"><NSCalibratedRGBColor serialization-native-value="0 0 0 0.3333333432674408" serialization-dictionary-key="shadowColor"></NSCalibratedRGBColor><NSCFString serialization-native-value="{5, -5}" serialization-dictionary-key="shadowOffset"></NSCFString><NSCFNumber serialization-native-value="0" serialization-dictionary-key="shadowBlurRadius"></NSCFNumber></_-D-_serializedShadow><stroke containerClass="NSMutableDictionary"><NSCachedRGBColor serialization-native-value="0 0 0 1" serialization-dictionary-key="RVShapeElementStrokeColorKey"></NSCachedRGBColor><NSCFNumber serialization-native-value="1" serialization-dictionary-key="RVShapeElementStrokeWidthKey"></NSCFNumber></stroke></RVTextElement></displayElements></RVDisplaySlide></slides><timeline timeOffSet="0" selectedMediaTrackIndex="0" unitOfMeasure="60" duration="0" loop="0"><timeCues containerClass="NSMutableArray"></timeCues><mediaTracks containerClass="NSMutableArray"></mediaTracks></timeline><bibleReference containerClass="NSMutableDictionary"></bibleReference></RVPresentationDocument>
\ No newline at end of file
=== removed file 'tests/resources/sundayplussongs/Abba Fader.ptf'
--- tests/resources/sundayplussongs/Abba Fader.ptf 2016-01-08 19:51:03 +0000
+++ tests/resources/sundayplussongs/Abba Fader.ptf 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[#PTFVersion: 2, #GLOBAL_RECT: rect(47,2,1026,770), #opacity: 100, #SHADOW_ON: 0, #SHADOW_COLOR: rgb( 0, 0, 0), #SHADOW_OPACITY: 100, #SHADOW_POSITION: "RB", #SHADOW_OFFSET: [0, 0], #FILE_TYPE: "Song", #title: "Abba Fader", #Author: "Ok�", #Copyright: "ccc", #CELL1: [#MARKER_NAME: "Abba Fader", #Hotkey: "1", #rtf: "{\rtf1\ansi\ansicpg1252\deff0\deflang1053{\fonttbl{\f0\froman\fprq2\fcharset0 Verdana;}{\f1\froman\fcharset0 Verdana;}}
-{\colortbl ;\red255\green255\blue0;\red224\green223\blue227;}
-\viewkind4\uc1\pard\cf1\b\f0\fs86 Abba Fader\par
-\par
-Vi \^e4r h\^e4r f\^f6r att prisa Dig\line Vi \^e4r h\^e4r med f\^f6rv\^e4ntan\line Vi \^e4r h\^e4r som ett enat folk\line Vi kommer fram till Dig\line Med v\^e5r lovs\^e5ng\line\fs59\line\fs86 Vi ropar Abba Fader\line Du som har all makt\line Vi ropar Abba Fader\line Till Dig st\^e5r allt v\^e5rt hopp\line Vi ropar Abba Fader\line V\^e5r fr\^e4lsare, befriare \^e4r Du\b0\line\pard\tx720\f1\par
-\cf2\par
-}
-", #Align: #Left]]
\ No newline at end of file
=== removed file 'tests/resources/sundayplussongs/abba-fader.json'
--- tests/resources/sundayplussongs/abba-fader.json 2016-01-08 19:51:03 +0000
+++ tests/resources/sundayplussongs/abba-fader.json 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-{
- "authors": [
- ["Okänd"]
- ],
- "title": "Abba Fader",
- "verse_order_list": [],
- "verses": [
- [
- "Abba Fader\n\nVi är här för att prisa Dig\nVi är här med förväntan\nVi är här som ett enat folk\nVi kommer fram till Dig\nMed vår lovsång\n\nVi ropar Abba Fader\nDu som har all makt\nVi ropar Abba Fader\nTill Dig står allt vårt hopp\nVi ropar Abba Fader\nVår frälsare, befriare är Du",
- "v1"
- ]
- ]
-}
=== removed file 'tests/resources/worshipassistantsongs/lift_up_your_heads.csv'
--- tests/resources/worshipassistantsongs/lift_up_your_heads.csv 2015-05-25 11:11:04 +0000
+++ tests/resources/worshipassistantsongs/lift_up_your_heads.csv 1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-"SongID","SongNr","Title","Author","Copyright","FirstLine","PriKey","AltKey","Tempo","Focus","Theme","Scripture","Active","Songbook","TimeSig","Introduced","LastUsed","TimesUsed","CCLINr","User1","User2","User3","User4","User5","Roadmap","Overmap","FileLink1","FileLink2","Updated","Lyrics","Info","Lyrics2","Background"
-"000013ab-0000-0000-0000-000000000000","0","Lift Up Your Heads"," Bryan Mierau","Public Domain","Lift up your heads and the doors","Em","NULL","NULL","NULL","NULL","NULL","1","1","NULL","NULL","NULL","0","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","NULL","2004-04-07 06:36:18.952",".Em D C D
- Lift up your heads and the doors of your heart
-. Am B7 Em
- And the King of glory will come in
-(Repeat)
-
-.G Am D
- Who is this King of Glory?
-. B7 Em
- The Lord strong and mighty!
-.G Am D
- Who is this King of Glory?
-. B7
- The Lord, mighty in battle!
-
-.G Am D
- Who is this King of Glory?
-.B7 Em
- Jesus our Messiah!
-.G Am D
- Who is this King of Glory?
-.B7 Em
- Jesus, Lord of Lords!
-
-","NULL","Lift up your heads and the doors of your heart
-And the King of glory will come in
-(Repeat)
-
-Who is this King of Glory?
-The Lord strong and mighty!
-Who is this King of Glory?
-The Lord, mighty in battle!
-
-Who is this King of Glory?
-Jesus our Messiah!
-Who is this King of Glory?
-Jesus, Lord of Lords!
-
-","NULL"
=== removed file 'tests/resources/worshipassistantsongs/lift_up_your_heads.json'
--- tests/resources/worshipassistantsongs/lift_up_your_heads.json 2015-05-25 11:11:04 +0000
+++ tests/resources/worshipassistantsongs/lift_up_your_heads.json 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-{
- "authors": [
- "Bryan Mierau"
- ],
- "title": "Lift Up Your Heads",
- "verse_order_list": [],
- "verses": [
- [
- "Lift up your heads and the doors of your heart\nAnd the King of glory will come in\n(Repeat)\n\nWho is this King of Glory?\nThe Lord strong and mighty!\nWho is this King of Glory?\nThe Lord, mighty in battle!\n\nWho is this King of Glory?\nJesus our Messiah!\nWho is this King of Glory?\nJesus, Lord of Lords!\n",
- "v1"
- ]
- ]
-}
References
