From 87102341e09dec4c127c9df28aa3769cb5a80c57 Mon Sep 17 00:00:00 2001
From: Daniel Heinesen <dulte@ipcc.nird.ipcc-ns2345k.svc.cluster.local>
Date: Fri, 13 Sep 2024 09:22:39 +0200
Subject: [PATCH] Adds method of downloading more vars

---
 src/pyaro_readers/eeareader/data.toml        |  2 ++
 src/pyaro_readers/eeareader/eeadownloader.py | 29 +++++++++++++-------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/pyaro_readers/eeareader/data.toml b/src/pyaro_readers/eeareader/data.toml
index 60d37be..ba76e26 100644
--- a/src/pyaro_readers/eeareader/data.toml
+++ b/src/pyaro_readers/eeareader/data.toml
@@ -1,6 +1,8 @@
 [defaults]
 "pollutants" = [
     "SO2",
+    "SO4--",
+    "SO4 (H2SO4 aerosols) (SO4--)",
     "PM10",
     "PM2.5",
     "O3",
diff --git a/src/pyaro_readers/eeareader/eeadownloader.py b/src/pyaro_readers/eeareader/eeadownloader.py
index 2f65197..3ca9197 100644
--- a/src/pyaro_readers/eeareader/eeadownloader.py
+++ b/src/pyaro_readers/eeareader/eeadownloader.py
@@ -53,6 +53,7 @@ def _get_urls(self, request: dict):
             raise results.raise_for_status()
 
     def download_and_save(self, request: dict, save_loc: Path) -> None:
+        breakpoint()
         urls = self._get_urls(request)
 
         if not save_loc.is_dir():
@@ -133,7 +134,7 @@ def make_pollutant_url_list(self, pollutants: list[str]) -> list[str]:
 
     @app.command(name="download")
     def download_default(
-        self, save_loc: Path, dataset: int = DATABASES["VERIFIED"]
+        self, save_loc: Path, dataset: int = DATABASES["VERIFIED"], pollutants: list | None= None,
     ) -> None:
         if not save_loc.is_dir():
             save_loc.mkdir(parents=True, exist_ok=True)
@@ -142,17 +143,19 @@ def download_default(
         countries = self.get_countries()
 
         errorfile = open("errors.txt", "w")
+        if pollutants is None:
+            pollutants = self.get_default_pollutants()
+
         pbar = tqdm(countries, desc="Countries", disable=None)
         for country in pbar:
             pbar.set_description(f"{country}")
             for poll in tqdm(
-                self.get_default_pollutants()[:2],
+                pollutants,
                 desc="Pollutants",
                 leave=False,
                 disable=None,
             ):
                 full_loc = save_loc / poll / country
-
                 request = {
                     "countries": [country],
                     "cities": [],
@@ -263,15 +266,21 @@ def postprocess(
 
 
 if __name__ == "__main__":
-    app()
+    #app()
 
+    pollutants = [
+        "SO2",
+        "SO4--",
+        "SO4 (H2SO4 aerosols) (SO4--)",
+    ]
+    eead = EEADownloader()
+    eead.download_default(
+        Path(
+            "/nird/home/dulte/data/EEA"
+        ),
+        pollutants = pollutants
 
-# eead = EEADownloader()
-# # eead.download_default(
-# #     Path(
-# #         "/home/danielh/Documents/pyaerocom/pyaro-readers/src/pyaro_readers/eeareader/data"
-# #     )
-# # )
+    )
 
 # eead.postprocess_all_files(
 #     Path(