From 31de311a17c9f83d330a499ec0b5ae5f672bbb65 Mon Sep 17 00:00:00 2001
From: Rasmus Luha <rasmus.luha@ut.ee>
Date: Sat, 5 Apr 2025 22:59:24 +0300
Subject: getting and checking api_url done

---
 modules/nifi/core.py     | 45 ++++++++++++++++++++-------------------------
 modules/telegraf/core.py |  2 +-
 2 files changed, 21 insertions(+), 26 deletions(-)

(limited to 'modules')

diff --git a/modules/nifi/core.py b/modules/nifi/core.py
index 82f28b2..bdac035 100644
--- a/modules/nifi/core.py
+++ b/modules/nifi/core.py
@@ -1,36 +1,31 @@
 from pyfiglet import figlet_format
 from rich.console import Console
+from common import core as common
 
-import requests
+import sys
 
 
 def introduction():
     console = Console()
     ascii_art = figlet_format("Nifi")
     console.print(ascii_art, style="cyan")
-
-    print("Valisid Nifi Platformi!")
-
-
-
-def api_url_validness_check(url):
-    try:
-        response = requests.get(url)
-        response.raise_for_status()  
-        response.json() 
-        return True 
-    except (requests.exceptions.RequestException, ValueError) as e:
-        return False
-
-
+    print("Valisid Nifi Platformi!\n")
 
 def build_pipeline():
-    api_url = input("Palun sisesta andmete API URL: ").strip()
-
-    if (input("Kas API vajab ka autentimist?(Jah/Ei): ").strip().lower() == 'jah'):
-        print("TODO")
-
-    if(api_url_validness_check(api_url)):
-        print("Good")
-    else:
-        print("Bad")
+    while True:
+        api_url = input("Palun sisesta andmete API URL: ").strip()
+        username = "placeholder"
+        passwd = "placeholder"
+
+        needs_auth = common.ask_binary_input(prompt="Kas API vajab ka kasutajaga autentimist?(jah/ei): ").strip().lower() == 'jah'
+        if needs_auth:
+            username=input("Sisesta kasutajanimi: ")
+            passwd=input("Sisesta parool: ")
+
+        if common.is_app_url_correct(api_url,needs_auth,username,passwd):
+            break  # Exit loop if URL is correct
+        else:
+            choice = common.ask_binary_input(prompt="\nKas soovid URL-i (m)uuta URL-i või (v)äljuda?(m/v): ",valikud=["m","v"]).strip().lower()
+            if choice == 'v':
+                print("Väljun programmist.")
+                sys.exit()
diff --git a/modules/telegraf/core.py b/modules/telegraf/core.py
index e1bdb70..1d49917 100644
--- a/modules/telegraf/core.py
+++ b/modules/telegraf/core.py
@@ -7,4 +7,4 @@ def introduction():
     ascii_art = figlet_format("Telegraf")
     console.print(ascii_art, style="cyan")
 
-    print("Valisid Telegraf Platformi!")
+    print("Valisid Telegraf Platformi!\n")
-- 
cgit v1.2.3