Skip to content
Merged

v2.1 #19

Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion DiscoveryProject/DarkModeDiscovery/AppGlobals.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ struct AppGlobals {
static var currentLocation: GeoPoint? {
didSet {
let location = currentLocation?.description ?? "current location is erased"
log.message("[\(type(of: self))] \(location)")
log.message("\(location) \(#function)", .info)
geolog.message("\(location) \(#function)", .debug, .custom)
}
}

Expand Down Expand Up @@ -66,6 +67,7 @@ struct AppGlobals {
GeoCoordinator.shared.locationUpdatesRecieved = { updates in
if let lastone = updates.last {
log.message("Location Updates: \(updates.count)")
geolog.message("Location Updates: \(updates.count)", .debug, .custom)
AppGlobals.currentLocation = lastone
}
}
Expand Down
15 changes: 15 additions & 0 deletions DiscoveryProject/DarkModeDiscovery/Configuration/CPLConfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"subsystem" : "Perseus",
"category" : "Lover",
"turned" : "off",
"level" : 5,
"output" : "standard",
"subsecond" : "nanosecond",
"tidnumber" : "decimal",
"format" : "short",
"marks" : true,
"time" : false,
"owner" : false,
"directives" : false,
"debugIsInfo" : true
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.0</string>
<string>2.1</string>
<key>CFBundleVersion</key>
<string>0</string>
<key>LSRequiresIPhoneOS</key>
Expand Down
31 changes: 18 additions & 13 deletions DiscoveryProject/DarkModeDiscovery/main.swift
Original file line number Diff line number Diff line change
Expand Up @@ -45,36 +45,41 @@ class LogReport: NSObject {
private let newline = "\r\n--\r\n"
}

typealias LogLevel = ConsolePerseusLogger.PerseusLogger.Level
typealias LogLevel = PerseusGeoKit.PerseusLogger.Level

func reportGeoEvent(_ text: String, _ type: LogLevel, _ localTime: LocalTime) {
func report(_ text: String, _ type: LogLevel, _ localTime: LocalTime, _ owner: PIDandTID) {
geoReport.lastMessage = "[\(localTime.date)] [\(localTime.time)]\r\n> \(text)"
}

let geoReport = LogReport()

// MARK: - Logger

geolog.customActionOnMessage = report(_:_:_:_:)

// log.turned = .off
dmlog.turned = .off
// dmlog.turned = .off
// geolog.turned = .off

// log.output = .consoleapp
// dmlog.output = .consoleapp
// geolog.output = .consoleapp

// geolog.format = .textonly
// geolog.output = .custom
var isLoadedInfo = ""

log.customActionOnMessage = reportGeoEvent(_:_:_:)
if let path = Bundle.main.url(forResource: "CPLConfig", withExtension: "json") {
if log.loadConfig(path), dmlog.loadConfig(path), geolog.loadConfig(path) {
isLoadedInfo = "Options successfully reseted!"
} else {
isLoadedInfo = "Failed to reset options!"
}
} else {
isLoadedInfo = "Failed to create URL!"
}

// log.time = true
log.message(isLoadedInfo)
log.message("The app's start point...", .info)

let globals = AppGlobals()

// MARK: - Run the app

let globals = AppGlobals()

// Determine the app run purpose
let appPurpose: AnyClass = NSClassFromString("TestingAppDelegate") ?? AppDelegate.self

Expand Down
10 changes: 7 additions & 3 deletions DiscoveryProject/TheOneRing.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
2EA971BB2D88790C00E564CA /* LocationViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2EA971BA2D88790C00E564CA /* LocationViewController.storyboard */; };
2EA971BD2D88798000E564CA /* LocationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EA971BC2D88798000E564CA /* LocationViewController.swift */; };
2EAB12312DEB6B9A002DDA8E /* PerseusGeoKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2EAB12302DEB6B9A002DDA8E /* PerseusGeoKit */; };
2EC2CAF12E0289F00044F6E9 /* CPLConfig.json in Resources */ = {isa = PBXBuildFile; fileRef = 2EC2CAF02E0289CA0044F6E9 /* CPLConfig.json */; };
2EC81B5D2DAB7981004C7AA6 /* PDMSupportingStar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EC81B5C2DAB7981004C7AA6 /* PDMSupportingStar.swift */; };
2EDCE1782DCE33BD00CC15A9 /* PGKSupportingStar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EDCE1772DCE33BD00CC15A9 /* PGKSupportingStar.swift */; };
2EE1B77B2DBE21D400375792 /* PerseusDarkMode in Frameworks */ = {isa = PBXBuildFile; productRef = 2EE1B77A2DBE21D400375792 /* PerseusDarkMode */; };
Expand Down Expand Up @@ -77,6 +78,7 @@
2EA10AA92CFE233B00535E5A /* APPROBATION.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = APPROBATION.md; path = ../APPROBATION.md; sourceTree = "<group>"; };
2EA971BA2D88790C00E564CA /* LocationViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LocationViewController.storyboard; sourceTree = "<group>"; };
2EA971BC2D88798000E564CA /* LocationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationViewController.swift; sourceTree = "<group>"; };
2EC2CAF02E0289CA0044F6E9 /* CPLConfig.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = CPLConfig.json; sourceTree = "<group>"; };
2EC81B5C2DAB7981004C7AA6 /* PDMSupportingStar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PDMSupportingStar.swift; sourceTree = "<group>"; };
2EDCE1772DCE33BD00CC15A9 /* PGKSupportingStar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PGKSupportingStar.swift; sourceTree = "<group>"; };
2EE5FCCF2DD0941E000AC9CD /* UpdatingLocation.gpx */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = UpdatingLocation.gpx; sourceTree = "<group>"; };
Expand Down Expand Up @@ -271,6 +273,7 @@
E095389527B36E7B00AAAAAA /* Assets.xcassets */,
E095389A27B36E7B00AAAAAA /* Info.plist */,
2EE5FCCF2DD0941E000AC9CD /* UpdatingLocation.gpx */,
2EC2CAF02E0289CA0044F6E9 /* CPLConfig.json */,
);
path = Configuration;
sourceTree = "<group>";
Expand Down Expand Up @@ -403,6 +406,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
2EC2CAF12E0289F00044F6E9 /* CPLConfig.json in Resources */,
2EA10AA62CFE211500535E5A /* .swiftlint.yml in Resources */,
2EA10AA82CFE221000535E5A /* swiftlint.yml in Resources */,
4B7EABEE298D6DDF0063172D /* main.yml in Resources */,
Expand Down Expand Up @@ -778,23 +782,23 @@
repositoryURL = "https://github.com/perseusrealdeal/PerseusGeoKit/";
requirement = {
kind = exactVersion;
version = 1.0.1;
version = 1.0.3;
};
};
2EE1B7792DBE21D400375792 /* XCRemoteSwiftPackageReference "PerseusDarkMode" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/perseusrealdeal/PerseusDarkMode";
requirement = {
kind = exactVersion;
version = 2.0.1;
version = 2.0.3;
};
};
2EE1B77C2DBE21E600375792 /* XCRemoteSwiftPackageReference "ConsolePerseusLogger" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/perseusrealdeal/ConsolePerseusLogger";
requirement = {
kind = exactVersion;
version = 1.3.0;
version = 1.5.0;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

[![Actions Status](https://github.com/perseusrealdeal/theonering/actions/workflows/main.yml/badge.svg)](https://github.com/perseusrealdeal/theonering/actions/workflows/main.yml)
[![Style](https://github.com/perseusrealdeal/theonering/actions/workflows/swiftlint.yml/badge.svg)](https://github.com/perseusrealdeal/theonering/actions/workflows/swiftlint.yml)
![Version](https://img.shields.io/badge/Version-2.0-green.svg)
![Version](https://img.shields.io/badge/Version-2.1-green.svg)
[![Platforms](https://img.shields.io/badge/Platform-iOS%2012.4+-orange.svg)](https://en.wikipedia.org/wiki/IOS_12)
[![Xcode](https://img.shields.io/badge/Xcode-14.2+-red.svg)](https://en.wikipedia.org/wiki/Xcode)
[![Swift](https://img.shields.io/badge/Swift-5-orange.svg)](https://docs.swift.org/swift-book/RevisionHistory/RevisionHistory.html)
Expand All @@ -15,9 +15,9 @@

> Swift Package Manager.

[![ConsolePerseusLogger](http://img.shields.io/:ConsolePerseusLogger-1.3.0-green.svg)](https://github.com/perseusrealdeal/ConsolePerseusLogger.git)
[![PerseusDarkMode](http://img.shields.io/:PerseusDarkMode-2.0.1-green.svg)](https://github.com/perseusrealdeal/PerseusDarkMode.git)
[![PerseusGeoKit](http://img.shields.io/:PerseusGeoKit-1.0.1-green.svg)](https://github.com/perseusrealdeal/PerseusGeoKit.git)
[![ConsolePerseusLogger](http://img.shields.io/:ConsolePerseusLogger-1.5.0-green.svg)](https://github.com/perseusrealdeal/ConsolePerseusLogger.git)
[![PerseusDarkMode](http://img.shields.io/:PerseusDarkMode-2.0.3-green.svg)](https://github.com/perseusrealdeal/PerseusDarkMode.git)
[![PerseusGeoKit](http://img.shields.io/:PerseusGeoKit-1.0.3-green.svg)](https://github.com/perseusrealdeal/PerseusGeoKit.git)

# In brief

Expand All @@ -42,9 +42,9 @@

| Type | Name | License |
| ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
| Package | [ConsolePerseusLogger](https://github.com/perseusrealdeal/ConsolePerseusLogger) / [1.3.0](https://github.com/perseusrealdeal/ConsolePerseusLogger/releases/tag/1.3.0) | MIT |
| Package | [PerseusDarkMode](https://github.com/perseusrealdeal/PerseusDarkMode) / [2.0.1](https://github.com/perseusrealdeal/PerseusDarkMode/releases/tag/2.0.1) | MIT |
| Package | [PerseusGeoKit](https://github.com/perseusrealdeal/PerseusGeoKit) / [1.0.1](https://github.com/perseusrealdeal/PerseusGeoKit/releases/tag/1.0.1) | MIT |
| Package | [ConsolePerseusLogger](https://github.com/perseusrealdeal/ConsolePerseusLogger) / [1.5.0](https://github.com/perseusrealdeal/ConsolePerseusLogger/releases/tag/1.5.0) | MIT |
| Package | [PerseusDarkMode](https://github.com/perseusrealdeal/PerseusDarkMode) / [2.0.3](https://github.com/perseusrealdeal/PerseusDarkMode/releases/tag/2.0.3) | MIT |
| Package | [PerseusGeoKit](https://github.com/perseusrealdeal/PerseusGeoKit) / [1.0.3](https://github.com/perseusrealdeal/PerseusGeoKit/releases/tag/1.0.3) | MIT |

# Third-party software

Expand Down