diff --git a/frontend/src/components/CloseIcon.svelte b/frontend/src/components/CloseIcon.svelte
deleted file mode 100644
index fc982cd..0000000
--- a/frontend/src/components/CloseIcon.svelte
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
diff --git a/frontend/src/components/ErrorIcon.svelte b/frontend/src/components/ErrorIcon.svelte
deleted file mode 100644
index 6ac54f8..0000000
--- a/frontend/src/components/ErrorIcon.svelte
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
diff --git a/frontend/src/components/InfoIcon.svelte b/frontend/src/components/InfoIcon.svelte
deleted file mode 100644
index 4422eb1..0000000
--- a/frontend/src/components/InfoIcon.svelte
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
diff --git a/frontend/src/components/SuccessIcon.svelte b/frontend/src/components/SuccessIcon.svelte
deleted file mode 100644
index 45c308d..0000000
--- a/frontend/src/components/SuccessIcon.svelte
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
diff --git a/frontend/src/components/Toast.svelte b/frontend/src/components/Toast.svelte
deleted file mode 100644
index af8317d..0000000
--- a/frontend/src/components/Toast.svelte
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
- {#if type === 'success'}
-
- {:else if type === 'error'}
-
- {:else}
-
- {/if}
-
-
-
-
-
- {#if dismissible}
-
- {/if}
-
-
-
diff --git a/frontend/src/components/Toasts.svelte b/frontend/src/components/Toasts.svelte
deleted file mode 100644
index 02395d7..0000000
--- a/frontend/src/components/Toasts.svelte
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-{#if $toasts}
-
- {#each $toasts as toast (toast.id)}
- dismissToast(toast.id)}>{toast.message}
- {/each}
-
-{/if}
-
-
diff --git a/frontend/src/pages/Main.svelte b/frontend/src/pages/Main.svelte
index ca78ead..bb8f5df 100644
--- a/frontend/src/pages/Main.svelte
+++ b/frontend/src/pages/Main.svelte
@@ -32,7 +32,6 @@
try {
await DownloadImages();
} catch (e) {
- console.log(e);
MessageDialog(e);
} finally {
const result = await GetDownloadedImages();
@@ -47,7 +46,7 @@
images = result ?? [];
isLoading = false;
} catch (e) {
- MessageDialog(e);
+ // MessageDialog(e);
} finally {
isLoading = false;
}
@@ -88,11 +87,10 @@
{/if}
{#if isLoading}
-
-

+
+
Processing...
- {:else}
-
{/if}
+
diff --git a/frontend/src/pages/Setting.svelte b/frontend/src/pages/Setting.svelte
index 80310de..ec78d7d 100644
--- a/frontend/src/pages/Setting.svelte
+++ b/frontend/src/pages/Setting.svelte
@@ -152,8 +152,8 @@
>,
setImageCategory('africa')}
- on:keydown={() => setImageCategory('africa')}>africa setImageCategory('abstract')}
+ on:keydown={() => setImageCategory('abstract')}>abstract
diff --git a/internal/api/unsplash.go b/internal/api/unsplash.go
index 677a0fb..ff59efd 100644
--- a/internal/api/unsplash.go
+++ b/internal/api/unsplash.go
@@ -93,22 +93,26 @@ func (u *UnleaseService) GetImages(imgConf ImageConfig) error {
parts := strings.Split(path, "/")
username := parts[len(parts)-1]
- go (func() {
+ go (func(u string, k int, uname string) {
defer wg.Done()
- if err := download(ctx, v.Urls.Full, key, imagePath, username); err != nil {
+ if err := download(ctx, u, k, imagePath, uname); err != nil {
errCh <- err
}
- })()
+ })(v.Urls.Full, key, username)
}
wg.Wait()
close(errCh)
- select {
- case err := <-errCh:
+ for err := range errCh {
return err
- default:
- return nil
}
+ return nil
+ // select {
+ // case err := <-errCh:
+ // return err
+ // default:
+ // return nil
+ // }
}
func getImage(ctx context.Context, url string) ([]Image, error) {
@@ -136,7 +140,6 @@ func getImage(ctx context.Context, url string) ([]Image, error) {
}
func download(ctx context.Context, image string, index int, IMAGE_DIR string, upr string) error {
-
req, err := http.NewRequestWithContext(ctx, http.MethodGet, image, nil)
if err != nil {
return err
@@ -159,7 +162,6 @@ func download(ctx context.Context, image string, index int, IMAGE_DIR string, up
fmt.Println(info)
f, err := os.Create(fn)
- // fmt.Sprintf("%s/%v.jpg", IMAGE_DIR, index))
if err != nil {
return err
}
diff --git a/scheduler/runner.go b/scheduler/runner.go
index f6ad7b2..a93e442 100644
--- a/scheduler/runner.go
+++ b/scheduler/runner.go
@@ -82,11 +82,9 @@ func main() {
}
func scheduleDownloadImages(c api.ImageConfig) error {
-
- fmt.Println(c)
- // internal.FetchImages(c)
-
- println("Hello, world my people")
+ if err := internal.FetchImages(c); err != nil {
+ return err
+ }
return nil
}