Update (#113)

Merge with #112, #114, #115

---------

Co-authored-by: Str4tos <eschenkoden@gmail.com>

CertificationIds.json

@@ -5,6 +5,7 @@
   "ad-generation.jp": "7f4ea9029ac04e53",
   "adcolony.com": "1ad675c9de6b5176",
   "adform.com": "9f5210a2f0999e32",
+  "adinmo.com": "c90e99bca95e8939",
   "admatic.com.tr": "uufps1dh5stc6euk",
   "admatic.de": "uufps1dh5stc6euk",
   "adtiming.com": "bf66753b8f380142",
@@ -37,6 +38,7 @@
   "conversantmedia.com": "03113cd04947736d",
   "criteo.com": "9fac4a4a87c2a44f",
   "danoler.com": "5d24754b175j2mde",
+  "dauup.com": "4daba13e2b0dfd92",
   "districtm.io": "3fd707be9c4527c3",
   "e-planning.net": "c1ba615865ed87b2",
   "emodoinc.com": "bc385f2b4a87b721",
@@ -58,6 +60,7 @@
   "imds.tv": "ae6c32151e71f19d",
   "indexexchange.com": "50b1c356f2c5c8fc",
   "inmobi.com": "83e75a7ae333ca9d",
+  "insticator.com": "b3511ffcafb23a32",
   "iqzone.com": "60d26397ec060f98",
   "ironsrc.com": "79929e88b2ba73bc",
   "jungroup.com": "79540da20c07237e",
@@ -83,6 +86,7 @@
   "netmarvel.com": "f7b59cc18e1b8d8b",
   "nextmillennium.io": "65bd090fa4a1e3d6",
   "odeeo.io": "36cfd73091d5c3fc",
+  "oko.uk": "b3511ffcafb23a32",
   "omgstudios.com": "f08c47fec0942fa0",
   "onetag.com": "0bfd66d529a55807",
   "onlinemediasolutions.com": "b3868b187e4b6402",
@@ -134,6 +138,7 @@
   "vidazoo.com": "b6ada874b4d7d0b2",
   "video.unrulymedia.com": "",
   "videoheroes.tv": "064bc410192443d8",
+  "vistarsagency.com": "8db795910158017c",
   "vrtcal.com": "c6daee9168853e2d",
   "vungle.com": "c107d686becd2d77",
   "widesound.io": "03facf30f100112b",

Combine.py

@@ -33,7 +33,6 @@
     "CASExchange",
     "DSPExchange",
     "Ogury",
-    "LoopMe",
     "Madex",
     "HyprMX",
     "StartIO",
@@ -52,11 +51,13 @@
     "Bidscube",
     "BoldWin",
     "Brightcom",
+    "Edge226",
     "Epom",
     "Eskimi",
     "Gitberry",
     "GothamAds",
     "Kueez",
+    "LoopMe",
     "Mobfox",
     "Monetizgo",
     "Pubmatic",
@@ -228,9 +229,30 @@ def __eq__(self, other):
             and self.comment == other.comment
                 and self.variable == other.variable):
             if self.type != other.type:
-                print_warning("Relationship is already set " + self.type + " by " + self.source +
-                              "\nPlease fix conflict with " + other.source, other.to_line())
-                return False
+                print("One inventory have both relationship in " + self.source +
+                      "(" + self.type + ") and " + other.source + "(" + other.type + ")")
+                print("   " + other.to_line().strip())
+
+                if self.source == other.source:
+                    print("   Only DIRECT lines are added.")
+                    other.type = 'DIRECT'
+                else:
+                    inputMessage = "   Enter 'D' - to add DIRRECT or 'R' - to add RESELLER: "
+                    while True:
+                        if sys.version_info[0] < 3:
+                            userSelect = raw_input(inputMessage)
+                        else:
+                            userSelect = input(inputMessage)
+
+                        if userSelect.lower() == 'd':
+                            other.type = 'DIRECT'
+                            break
+                        elif userSelect.lower() == 'r':
+                            other.type = 'RESELLER'
+                            break
+                        else:
+                            print("   Invalid input value")
+                print()
             return True
         return False