From fd656e714b1beec66b4b5ba30eef34d9c0179801 Mon Sep 17 00:00:00 2001
From: SergKhram <quigon3@yandex.ru>
Date: Tue, 13 Apr 2021 17:36:02 +0400
Subject: [PATCH] Fixed time comparing

---
 build.gradle.kts                              | 34 ++-----------------
 .../io/github/sergkhram/helpers/conditions.kt |  6 +++-
 2 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 106ad6b..3c86956 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 import java.net.URI
 
 group = "io.github.sergkhram"
-version = "1.0.0-RELEASE"
+version = "1.0.1-RELEASE"
 
 dependencies {
     implementation("com.fasterxml.jackson.core:jackson-databind:2.8.9")
@@ -34,8 +34,6 @@ repositories {
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
-//    withJavadocJar()
-//    withSourcesJar()
 }
 
 signing {
@@ -59,7 +57,6 @@ publishing {
 
     publications {
         create("default", MavenPublication::class.java) {
-//            customizePom(pom)
             from(project.components["java"])
             artifact(sourcesJar)
             artifact(javadocJar)
@@ -98,31 +95,4 @@ publishing {
             }
         }
     }
-}
-
-//fun customizePom(pom: org.gradle.api.publish.maven.MavenPom) {
-//    pom.apply {
-//        name.set("ares-plugin")
-//        url.set("https://github.com/SergKhram/ARES")
-//        description.set("Android report synchro plugin")
-//
-//        this.licenses {
-//            license {
-//                name.set("The Apache License, Version 2.0")
-//                url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
-//            }
-//        }
-//
-//        this.developers {
-//            developer {
-//                id.set("serg-khram-team")
-//                name.set("Sergei Khramkov")
-//                email.set("quigon3@yandex.ru")
-//            }
-//        }
-//
-//        this.scm {
-//            url.set("https://github.com/SergKhram/ARES")
-//        }
-//    }
-//}
+}
\ No newline at end of file
diff --git a/src/main/kotlin/io/github/sergkhram/helpers/conditions.kt b/src/main/kotlin/io/github/sergkhram/helpers/conditions.kt
index 0775039..55c20d1 100644
--- a/src/main/kotlin/io/github/sergkhram/helpers/conditions.kt
+++ b/src/main/kotlin/io/github/sergkhram/helpers/conditions.kt
@@ -11,5 +11,9 @@ internal val isAppropriateMarathonResultFile: (File, ObjectMapper, JsonNode) ->
     val currentMarathonFile = marathonAllureFile.asJson(mapper)
     val packageLabel = currentMarathonFile.getPackageLabel()
     currentDeviceFile.getFullName() == (packageLabel + "." + currentMarathonFile.getFullName()) &&
-            currentMarathonFile.getStartTime() in currentDeviceFile.getStartTime()..currentDeviceFile.getStopTime()
+        (
+            currentMarathonFile.getStartTime() in currentDeviceFile.getStartTime()..currentDeviceFile.getStopTime() ||
+            currentMarathonFile.getStopTime() in currentDeviceFile.getStartTime()..currentDeviceFile.getStopTime() ||
+            (currentMarathonFile.getStartTime() + currentMarathonFile.getStopTime())/2 in currentDeviceFile.getStartTime()..currentDeviceFile.getStopTime()
+        )
 }
\ No newline at end of file