serious progress

DiskUtils.py

@@ -50,7 +50,7 @@ def check_download_exists_matching_url_version_one(url):
 
 def check_download_exists_matching_url_version_two(url):
 
-    print ("enter > downloads > exist check > version 2")
+    print ("enter > check_download_exists_matching_url_version_two")
 
     match = re.search(r"https://sullygnome.com/channel/([^/]+)/(\d+)([a-z]+)/games", url.lower())
 
@@ -68,30 +68,69 @@ def check_download_exists_matching_url_version_two(url):
 
     print("month / ",month)
 
-    ## this is a problem. it works but if there 2 channels. 
-    ## redbull and redbull2 this is throw false positives. ugh
-
-    unicode_part = r"[\u3040-\u309F\u30A0-\u30FF_]*" # Matches any hiragana, katakana, and underscore
-
-    file_pattern = f"{unicode_part} \({channel_name}\) - game stats on Twitch in {month} {year} - SullyGnome.csv".lower()
-
-    print("regex :",file_pattern)
-
     for filename in os.listdir("/home/yankee/Downloads/"):
 
         updated = filename.lower()
 
-        print("file in downloads / ",updated)
+        print("found file (v2) / ",updated)
 
-        if fnmatch.fnmatch(updated, file_pattern):
+        ##
 
-            print(f"Found matching file: {updated}")
+        hasKeyDateParts = does_filename_contain_key_date_parts(updated, month, year)
 
-            return True
+        print("\thasKeyDateParts / ",hasKeyDateParts)
 
-    else:
+        ##
 
-        print(f"No matching CSV file found for channel '{channel_name}' in year '{year}' and month '{month}'. (version t55555wo)")
+        hasTargetChannelName = does_filename_contain_target_channel_name(updated,channel_name)
+
+        print("\thasTargetChannelName / ",hasTargetChannelName)
+
+        ##
+
+    print ("exit < check_download_exists_matching_url_version_two")
+
+def does_filename_contain_target_channel_name(url,channel):  
+
+    regex = rf"\({re.escape(channel)}\)"
+
+    match = re.search(regex, url)
+
+    results = bool(match)
+
+    print("results / ",results)
+
+
+    match = re.search("\({channel}\)", url)
+
+    if match:
+        print("yup!")
+        extracted_text = match.group(1).lower()
+
+        print("extracted: /",extracted_text)
 
         return False
 
+	##        return extracted_text == target_string.lower()
+
+    else:
+        print("nope!")
+        return False
+
+
+
+
+
+
+def does_filename_contain_key_date_parts(filename, monthString, yearNumber):
+
+    print("enter -> does_filename_contain_key_date_parts()")
+
+    regex = rf"{re.escape(monthString)} {yearNumber}"
+
+    doesContain = bool(re.search(regex, filename, re.IGNORECASE))
+
+    print("doesContain / ",doesContain)
+
+    return doesContain
+

RestAPIClient.py

@@ -79,9 +79,9 @@ def addDownloadFailure(url, error):
 
 def searchURLSuccesses(url):
 
-    print("enter -> callGET()")
+    ## print("enter -> callGET()")
 
-    print("param / url / ",url)
+    ## print("param / url / ",url)
     
     data = { "url": url }
 
@@ -91,15 +91,15 @@ def searchURLSuccesses(url):
 
     response = requests.post("https://apis.yankee.embanet.online/channel/monthly/games/success/exists", data=json_data, headers=headers)
 
-    print(response.text)
+    ## print(response.text)
 
     return response.text
 
 def searchURLFailures(url):
 
-    print("enter -> callGET()")
+    ## print("enter -> callGET()")
 
-    print("param / url / ",url)
+    ## print("param / url / ",url)
     
     data = { "url": url }
 
@@ -109,6 +109,6 @@ def searchURLFailures(url):
 
     response = requests.post("https://apis.yankee.embanet.online/channel/monthly/games/failure/exists", data=json_data, headers=headers)
 
-    print(response.text)
+    ## print(response.text)
 
     return response.text

SullyGnomeRobot.py

@@ -116,6 +116,12 @@ def download(url):
 
         print("file already exists (v1) / ",existsAlreadyVersionOne)
 
+        existsAlreadyVersionTwo = DiskUtils.check_download_exists_matching_url_version_two(url)
+
+        print("file already exists (v2) / ",existsAlreadyVersionTwo)
+
+        time.sleep(40)
+
         if existsAlreadyVersionOne:
 
             print(f"The file matching the url '{url}' DOES INDEED exists. (version 1)")

consumer.py

@@ -3,45 +3,80 @@ import time
 import SullyGnomeRobot
 import RestAPIClient
 
+### start variables ###
+
+jmsQueue="asian-tester"
+
+host = '38.107.226.34'
+
+port = 61613
+
+
+username = 'admin'
+password = 'password'
+
+
+### end variables ###
+
 print("## ")
-print("## starting > JMS consumer (yankee-sully-channels-monthly)")
+print(f"## starting > JMS consumer app!")
 print("## ")
 
-## https://sullygnome.com/channel/yaritaiji/2024october/games
+def writeSullyURLToJMS():
+
+    channel="https://sullygnome.com/channel/yaritaiji/2024october/games"
+    
+    print(f"launch -> jms writer -> channel-> {channel}")
+
+    conn = stomp.Connection([('osiris.yankee.embanet.online', 61613)])
+
+    conn.connect('admin', 'password', wait=True)
+
+    try:
+
+        conn.send(body=channel.strip(), destination=f'/queue/{jmsQueue}')
+
+    finally:
+
+        conn.disconnect()
         
 class MyListener(stomp.ConnectionListener):
 
     def on_message(headers, message):
 
-        print("** new message! **")
+        ## print("** new message! **")
 
-        print("message / ", message)
+        ## print("message / ", message)
 
-        print("messagebody / ", message.body)
+        print("JMS url -> ", message.body)
 
-        print("checking the value does or doesnt exist in db")
+        ## print("checking the value does or doesnt exist in db")
 
         alreadyExistsSuccess = RestAPIClient.searchURLSuccesses(message.body)
 
-        print("alreadyExistsSuccess / ", alreadyExistsSuccess)
+        ## print("alreadyExistsSuccess / ", alreadyExistsSuccess)
 
         if alreadyExistsSuccess.lower().strip() == "true":
     
-            print("this record exists (successes). returning. doing nothing")
+            ## print("this record exists (successes). returning. doing nothing")
 
-            return
+            ## return
 
-        print("didn't exist in success. check in errors now.")
+            print ("skipped!!")
+            
+        ## print("didn't exist in success. check in errors now.")
 
         alreadyExistsFailure = RestAPIClient.searchURLFailures(message.body)
 
-        print("alreadyExistsFailure / ", alreadyExistsFailure)
+        ## print("alreadyExistsFailure / ", alreadyExistsFailure)
 
         if alreadyExistsFailure.lower().strip() == "true":
 
-            print("this record exists (failures). returning. doing nothing")
+            ## print("this record exists (failures). returning. doing nothing")
 
-            return
+            ##return
+            
+            print ("skipped!!")
 
         print("didn't exist in success or errors. will process now")
 
@@ -62,19 +97,24 @@ class MyListener(stomp.ConnectionListener):
         RestAPIClient.addDownloadFailure(message.body, "error from onmessage (consumer.py)")
 
 print("## ")
-print("## starting > JMS consumer (yankee-sully-channels-monthly)")
+print(f"## starting > JMS consumer ([{jmsQueue}]")
 print("## ")
 
-conn = stomp.Connection([('38.107.226.34', 61613)])
+writeSullyURLToJMS()
+connection_details = [(host, port)]
+
+conn = stomp.Connection(connection_details)
 
 conn.set_listener('', MyListener())
 
-conn.connect('admin', 'password', wait=True)
+conn.connect(username, password, wait=True)
 
-conn.subscribe('/queue/yankee-sully-channels-monthly', id=1, ack='auto', headers={'activemq.prefetchSize': 10})
+conn.subscribe(f'/queue/{jmsQueue}', id=1, ack='auto', headers={'activemq.prefetchSize': 10})
+
+print(f"Subscribed to queue: {jmsQueue}")
     
 print("## ")
-print("## notification > connected to JMS server (yankee-sully-channels-monthly) 456")
+print(f"## notification > connected to JMS server [{jmsQueue}] (upgrade)")
 print("## ")
 
 while True:
@@ -84,3 +124,4 @@ while True:
     time.sleep(1)
        
 conn.disconnect()
+