fix mail cover img url issue (#189)

* fix mail cover img url issue

* skip file episode matching when file type is not video

* update changelog for pr #189

Author: chivehao

CHANGELOG.MD

@@ -10,9 +10,11 @@
 - 用户信息更新页面，支持用户邮箱更新
 
 ## Bugfix
-- 修复解析蜜柑计划RSS失败的问题
-- 修复通知邮件无法包含日文内容的问题
-- 修复通知邮件内容无法显示封面URL的问题
+- 解析蜜柑计划RSS失败的问题
+- 通知邮件无法包含日文内容的问题
+- 通知邮件内容无法显示封面URL的问题
+- 邮件URL的斜杠重复，导致无法访问资源 #188
+- 邮件剧集文件名称不是视频类型的也进行更新了 #188
 
 ## Improvements
 - 优化剧集URL更新时通知的代码逻辑，目前在拉取qbittorrent已完成下载的文件任务里，创建服务端对应的文件后，当匹配到对应的剧集URL时，会给用户发送通知邮件

src/main/java/run/ikaros/server/listener/EpisodeUrlUpdateEventListener.java

@@ -52,7 +52,6 @@ public void onApplicationEvent(@NonNull EpisodeUrlUpdateEvent event) {
         final String newUrl = event.getNewUrl();
         final String newUrlFileName = event.getNewUrlFileName();
         final Boolean isNotify = event.getIsNotify();
-        final String appUrlPrefix = ikarosProperties.getAppUrlPrefix();
         EpisodeEntity episodeEntity = episodeService.getById(episodeId);
         if (episodeEntity == null) {
             log.warn("skip, not found episode for id={}", episodeId);
@@ -108,7 +107,18 @@ public void onApplicationEvent(@NonNull EpisodeUrlUpdateEvent event) {
             vars.put("epSeq", episodeEntity.getSeq());
             vars.put("epIntroduction", episodeEntity.getOverview());
             vars.put("introduction", animeEntity.getOverview());
-            vars.put("coverImgUrl", appUrlPrefix + "/" + animeEntity.getCoverUrl());
+            String coverUrl = animeEntity.getCoverUrl();
+            if (StringUtils.isNotBlank(coverUrl) && coverUrl.startsWith("/")) {
+                coverUrl = coverUrl.substring(1);
+                if (coverUrl.startsWith("/")) {
+                    coverUrl = coverUrl.substring(1);
+                }
+            }
+            String appUrlPrefix = ikarosProperties.getAppUrlPrefix();
+            if (StringUtils.isNotBlank(appUrlPrefix) && appUrlPrefix.endsWith("/")) {
+                appUrlPrefix = appUrlPrefix.substring(0, appUrlPrefix.length() - 1);
+            }
+            vars.put("coverImgUrl", appUrlPrefix + "/" + coverUrl);
             vars.put("epUrlFileName", newUrlFileName);
             context.setVariables(vars);
 

src/main/java/run/ikaros/server/service/SeasonServiceImpl.java

@@ -14,6 +14,7 @@
 import run.ikaros.server.entity.EpisodeEntity;
 import run.ikaros.server.entity.FileEntity;
 import run.ikaros.server.entity.SeasonEntity;
+import run.ikaros.server.enums.FileType;
 import run.ikaros.server.enums.SeasonType;
 import run.ikaros.server.event.EpisodeUrlUpdateEvent;
 import run.ikaros.server.exceptions.RecordNotFoundException;
@@ -25,6 +26,7 @@
 import run.ikaros.server.params.SeasonMatchingEpParams;
 import run.ikaros.server.utils.AssertUtils;
 import run.ikaros.server.utils.BeanUtils;
+import run.ikaros.server.utils.FileUtils;
 import run.ikaros.server.utils.RegexUtils;
 import run.ikaros.server.utils.StringUtils;
 
@@ -109,6 +111,11 @@ public SeasonDTO matchingEpisodesUrlByFileIds(
                 continue;
             }
             final String fileName = fileEntity.getName();
+            FileType fileType = FileUtils.parseTypeByPostfix(FileUtils.parseFileName(fileName));
+            if (fileType != FileType.VIDEO) {
+                continue;
+            }
+
             Long episodeSeq = null;
             try {
                 episodeSeq = RegexUtils.getFileNameTagEpSeq(fileName);

src/test/java/run/ikaros/server/lang/StringTest.java

@@ -0,0 +1,10 @@
+package run.ikaros.server.lang;
+
+public class StringTest {
+    public static void main(String[] args) {
+        String str = "hello/";
+        System.out.println(str.substring(0, str.length() - 1));
+        String str2 = "/hello2";
+        System.out.println(str2.substring(1));
+    }
+}