Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/ws 243 export favourites as openlp service #244

Merged
merged 30 commits into from
Apr 15, 2021
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
03579bf
#243 Added support to build the general service info json.
sskjames Mar 19, 2021
022e948
#243 Renamed the json file and moved it to a folder.
sskjames Mar 19, 2021
ada60fd
#243 Added support to construct most of the items in the service item…
sskjames Mar 19, 2021
030eaa7
#243 Added support to include a single author in footer, audit and da…
sskjames Mar 19, 2021
918a79d
#243 Updated the songs database to ensure that there are songs with m…
sskjames Mar 19, 2021
16dcd47
#243 Added support to build the "title" and "author" elements in serv…
sskjames Mar 22, 2021
dfda48f
#243 Added support to format the footer authors in the expected format
sskjames Mar 22, 2021
7634ef0
#243 Added support to build the properties element in the xml version…
sskjames Mar 24, 2021
8e7da67
#243 Added support to build lyrics element in the xml version of song
sskjames Mar 24, 2021
79f7cd7
#243 Minor refactoring
sskjames Mar 25, 2021
e1f9342
#243 Added support to construct the "data" element in service item.
sskjames Mar 25, 2021
7400ca9
#234 Improved acceptance tests.
sskjames Mar 25, 2021
755c007
#243 Added support to include the "modifiedDate" in the xml vesion of…
sskjames Mar 26, 2021
81b343b
#243 Ensured that the xml version of the song is compact without newl…
sskjames Mar 26, 2021
a82d4a9
#243 Improved the acceptance test
sskjames Mar 30, 2021
7f8bab8
WS-243 Added an action to export favourite list as OpenLP Service fil…
sskjames Apr 6, 2021
26229e8
WS-243 Added support to encode more text as ascii.
sskjames Apr 6, 2021
e634921
WS-243 Encoded authors in ascii
sskjames Apr 6, 2021
2616656
#243 Added support to compress the service data file as oszl zip file.
sskjames Apr 7, 2021
9fc2e34
#243 Removed the extra escape characters "\\" added by SwiftyJSON.
sskjames Apr 9, 2021
738669b
#243 Ensured that the characters "<", ">" and apostrophe are not esca…
sskjames Apr 9, 2021
5ff0db5
#243 Ensured that [header][data][title] is formatted exactly like how…
sskjames Apr 14, 2021
b0f9955
#243 Added support to clean the simulator to remove it's cached content.
sskjames Apr 14, 2021
0a34502
#243 Merged changes from master
sskjames Apr 14, 2021
58a568c
#243 Initialized the DI container and injected required service in Fa…
sskjames Apr 15, 2021
a1ebfdf
#243 Used a logger to log the messages in the new classes we introduced.
sskjames Apr 15, 2021
7743828
#243 Bumped minor version
sskjames Apr 15, 2021
f15f648
#243 Fixed code smells in OpenLPServiceConverter
sskjames Apr 15, 2021
77fae4a
#243 Fixed code smells in DatabaseHelper
sskjames Apr 15, 2021
65b3266
#243 Minor code refactoring for clarity and consistence. Improved cod…
sskjames Apr 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ pipeline {

post {
always {
fastlane("clean_simulator")
terminateSimulator()
archiveUnitTestsReport()
}
Expand Down
1 change: 1 addition & 0 deletions Jenkinsfile-publish
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ pipeline {

post {
always {
fastlane("clean_simulator")
terminateSimulator()
archiveUnitTestsReport()
}
Expand Down
9 changes: 9 additions & 0 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,19 @@ def common_pods
pod 'FMDB'
pod 'YouTubePlayer'
pod 'Floaty'
pod 'Swinject', '~> 2.7.1'
pod 'SwinjectAutoregistration', '~> 2.7.0'
pod 'SwinjectStoryboard', :git => 'https://github.com/Swinject/SwinjectStoryboard.git', :commit => '0ca45c83a8aa398c153d8a036c95abb4343cfa0c'
pod 'SwiftyJSON', '~> 4.0'
pod 'AEXML'
pod 'Zip', '~> 2.1'
end

def test_pods
pod 'SwiftLint'
pod 'Quick', '~> 3.0.0'
pod 'Nimble', '~> 9.0.0'
pod 'Cuckoo', '~> 1.4.1'
end

target "worshipsongs" do
Expand Down
51 changes: 50 additions & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,30 +1,79 @@
PODS:
- AEXML (4.6.0)
- Cuckoo (1.4.1):
- Cuckoo/Swift (= 1.4.1)
- Cuckoo/Swift (1.4.1)
- Floaty (4.1.0)
- FMDB (2.7.5):
- FMDB/standard (= 2.7.5)
- FMDB/standard (2.7.5)
- Nimble (9.0.0)
- Quick (3.0.1)
- SwiftLint (0.43.1)
- SwiftyJSON (4.3.0)
- Swinject (2.7.1)
- SwinjectAutoregistration (2.7.0):
- Swinject (~> 2.7)
- SwinjectStoryboard (2.2.0):
- Swinject (~> 2.7.1)
- YouTubePlayer (0.7.2)
- Zip (2.1.1)

DEPENDENCIES:
- AEXML
- Cuckoo (~> 1.4.1)
- Floaty
- FMDB
- Nimble (~> 9.0.0)
- Quick (~> 3.0.0)
- SwiftLint
- SwiftyJSON (~> 4.0)
- Swinject (~> 2.7.1)
- SwinjectAutoregistration (~> 2.7.0)
- SwinjectStoryboard (from `https://github.com/Swinject/SwinjectStoryboard.git`, commit `0ca45c83a8aa398c153d8a036c95abb4343cfa0c`)
- YouTubePlayer
- Zip (~> 2.1)

SPEC REPOS:
trunk:
- AEXML
- Cuckoo
- Floaty
- FMDB
- Nimble
- Quick
- SwiftLint
- SwiftyJSON
- Swinject
- SwinjectAutoregistration
- YouTubePlayer
- Zip

EXTERNAL SOURCES:
SwinjectStoryboard:
:commit: 0ca45c83a8aa398c153d8a036c95abb4343cfa0c
:git: https://github.com/Swinject/SwinjectStoryboard.git

CHECKOUT OPTIONS:
SwinjectStoryboard:
:commit: 0ca45c83a8aa398c153d8a036c95abb4343cfa0c
:git: https://github.com/Swinject/SwinjectStoryboard.git

SPEC CHECKSUMS:
AEXML: 2fbb73d8724797ed2cde888731e176fa4d44dd83
Cuckoo: 4625f7f54d9bb880123270e8969898d6c1d036b5
Floaty: 1a4e213f3512cf3045ef9cb0c1ff456226d1f66a
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
Nimble: 3b4ec3fd40f1dc178058e0981107721c615643d8
Quick: 947834f0d0f43fc933d0e9dd00086a76e783e4fb
SwiftLint: 99f82d07b837b942dd563c668de129a03fc3fb52
SwiftyJSON: 6faa0040f8b59dead0ee07436cbf76b73c08fd08
Swinject: ddf78b8486dd9b71a667b852cad919ab4484478e
SwinjectAutoregistration: 330f5012642a8b5c89a8a4adb0c5e52df07382c0
SwinjectStoryboard: f0d5b1c16459949d6ff1cbb6610107946b18e1f8
YouTubePlayer: 2b5f2830d8f9b2cde942083211291e382c9e6bd5
Zip: 414f59909701fda9a84ab774ebe0f5449b1082cc

PODFILE CHECKSUM: 3716037c5bdd373db6ce39bd15f8bb05601b47ad
PODFILE CHECKSUM: a2b437dcb490915e48d67c42504a8c082742d407

COCOAPODS: 1.10.1
5 changes: 5 additions & 0 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ platform :ios do
lane :clean do
clear_derived_data
end

desc "Cleans the simulator"
lane :clean_simulator do
reset_simulator_contents
end

##### Development ######
desc "Automatically bumps the major version"
Expand Down
126 changes: 118 additions & 8 deletions worshipsongs.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

36 changes: 36 additions & 0 deletions worshipsongs/AppLogger.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
//
// Author: Vignesh (Adapted from the Furiend project)
// Since: 3.1.0
// Copyright © 2021 mCruncher. All rights reserved.
//

import Foundation
import OSLog

struct AppLogger {

static func log(level: LogLevel, _ message: String) {
if #available(iOS 14.0, *) {
let logger = Logger()
switch level {
case .info:
logger.info("\(message)")
case .debug:
logger.debug("\(message)")
case .error:
logger.error("\(message)")
case .fault:
logger.fault("\(message)")
}
} else {
print(level.rawValue + ": " + message)
}
}
}

enum LogLevel : String {
case info = "Info"
case debug = "Debug"
case error = "Error"
case fault = "Fault"
}
1 change: 1 addition & 0 deletions worshipsongs/Base.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
"choose_options" = "Choose options";
"share" = "Share";
"share_as_pdf"="Share as PDF";
"shareAsOpenLPService"="Share as OpenLP Service";

"song_books"="Song books";
"songno"="Song no";
Expand Down
Loading