From 4b96a9b2e71b7a67effdd55b26ca532ff849d0ef Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sat, 23 Oct 2021 08:09:05 +0300
Subject: ImagesService -> StorageService

img_path -> storage_path property
---
 src/main/java/com/juick/www/controllers/Settings.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/main/java/com/juick/www/controllers')

diff --git a/src/main/java/com/juick/www/controllers/Settings.java b/src/main/java/com/juick/www/controllers/Settings.java
index 50b4ea14..a5597735 100644
--- a/src/main/java/com/juick/www/controllers/Settings.java
+++ b/src/main/java/com/juick/www/controllers/Settings.java
@@ -63,8 +63,6 @@ import java.util.stream.IntStream;
 public class Settings {
     private static final Logger logger = LoggerFactory.getLogger(Settings.class);
 
-    @Value("${upload_tmp_dir:#{systemEnvironment['TEMP'] ?: '/tmp'}}")
-    private String tmpDir;
     @Inject
     private TagService tagService;
     @Inject
@@ -76,7 +74,7 @@ public class Settings {
     @Inject
     private TelegramService telegramService;
     @Inject
-    private ImagesService imagesService;
+    private StorageService storageService;
     @Inject
     private WebApp webApp;
     @Inject
@@ -166,9 +164,9 @@ public class Settings {
                 visitor.setCountry(request.getParameter("country"));
                 visitor.setUrl(request.getParameter("url"));
                 visitor.setDescription(request.getParameter("descr"));
-                String avatarTmpPath = HttpUtils.receiveMultiPartFile(avatar, tmpDir).getHost();
+                String avatarTmpPath = HttpUtils.receiveMultiPartFile(avatar, storageService.getTemporaryDirectory()).getHost();
                 if (StringUtils.isNotEmpty(avatarTmpPath)) {
-                    imagesService.saveAvatar(avatarTmpPath, visitor.getUid());
+                    storageService.saveAvatar(avatarTmpPath, visitor);
                 }
                 if (userService.updateUserInfo(visitor)) {
                     result = String.format("<p>Your info is updated.</p><p><a href='/%s/'>Back to blog</a>.</p>", visitor.getName());
-- 
cgit v1.2.3