Update app.py

app.py

@@ -419,7 +419,6 @@ def count_days_og(date1,date2):
 
     
 def nasa_sdo_images(obj,size,date1,date2):
-    print(generate_sdo_urls(date1,date2))
     url_box=[]
     html_in=f"<style>{css}</style><div class='img_box_soho'>"
     print(date1 + " - " + date2)
@@ -433,8 +432,10 @@ def nasa_sdo_images(obj,size,date1,date2):
     end_month=f"{date2[4:6]}"
     end_day=f"{date2[6:8]}"
     
+    sdo_urls = generate_sdo_urls(date1,date2)
+    print(sdo_urls)
     
-    years_rem,months_rem,days_rem=(0,0,0)
+    '''years_rem,months_rem,days_rem=(0,0,0)
     og_days_rem=days_rem
     i_in_year,i_in_month,i_in_day,i_end_year,i_end_month,i_end_day=int(in_year),int(in_month),int(in_day),int(end_year),int(end_month),int(end_day)
     days_json={"year": 0, "month": 0, "day": 0}
@@ -472,43 +473,45 @@ def nasa_sdo_images(obj,size,date1,date2):
             days_rem += io
             out_url=f"https://sdo.gsfc.nasa.gov/assets/img/browse/{end_year}/{end_month}/{io}/"
             print(out_url)
-            url_box.append(out_url)
+            url_box.append(out_url)'''
     
     file_name="DATE_TIME_SIZE_TOOL.jpg"
-    sdo_source_format = f"https://sdo.gsfc.nasa.gov/assets/img/browse/{in_year}/{in_month}/{in_day}/"
-    get_url=sdo_source_format
-    print(get_url)
-    feed1 = requests.get(get_url)    
-    if "All" in size:
-        size = sdo_size
-    if "All" in obj:
-        obj = sdo_obj
-    link_box=[]
-    out_box=[]
-    # Parse the HTML content using BeautifulSoup
-    soup = bs4.BeautifulSoup(feed1.content, 'html.parser')
-    #print(soup)
-    anchor_elements = soup.find_all('a')
-    for element in anchor_elements:
-        link_box.append(element.get('href'))
-        
-    link_box.sort(reverse=True)
-    #for element in anchor_elements:
-    for href in link_box:
-        #href=element.get('href')
-        if href.endswith('.jpg'):
-            for o in obj:
-                for s in size:
-                    ls=href.split("_")
-                    #print(ls[1][0:4])
-                    #print(date1[8:13])
-                    if ls[1][0:4]>=date1[8:13]:
-                        src_obj=ls[3].split('.jpg')[0]
-                        if src_obj == o:
-                            if int(ls[2]) == int(s):
-                                out_box.append(f'{sdo_source_format}{href}')
-                                html_in+=f'<div class="img_class_sdo"><a href="{sdo_source_format}{href}" target="_blank">{href}</a><br><img src={sdo_source_format}{href}></div>'
-    html_in+="</div>"
+    for link in sdo_urls:
+        #sdo_source_format = f"https://sdo.gsfc.nasa.gov/assets/img/browse/{in_year}/{in_month}/{in_day}/"
+        sdo_source_format = link
+        #get_url=sdo_source_format
+        feed1 = requests.get(link)    
+        #print(get_url)
+        if "All" in size:
+            size = sdo_size
+        if "All" in obj:
+            obj = sdo_obj
+        link_box=[]
+        out_box=[]
+        # Parse the HTML content using BeautifulSoup
+        soup = bs4.BeautifulSoup(feed1.content, 'html.parser')
+        #print(soup)
+        anchor_elements = soup.find_all('a')
+        for element in anchor_elements:
+            link_box.append(element.get('href'))
+            
+        link_box.sort(reverse=True)
+        #for element in anchor_elements:
+        for href in link_box:
+            #href=element.get('href')
+            if href.endswith('.jpg'):
+                for o in obj:
+                    for s in size:
+                        ls=href.split("_")
+                        #print(ls[1][0:4])
+                        #print(date1[8:13])
+                        if ls[1][0:4]>=date1[8:13]:
+                            src_obj=ls[3].split('.jpg')[0]
+                            if src_obj == o:
+                                if int(ls[2]) == int(s):
+                                    out_box.append(f'{sdo_source_format}{href}')
+                                    html_in+=f'<div class="img_class_sdo"><a href="{sdo_source_format}{href}" target="_blank">{href}</a><br><img src={sdo_source_format}{href}></div>'
+        html_in+="</div>"
     return html_in, out_box
 
 def get_concat_h_cut(in1, in2):