优化列表接口

Author: chivehao

CHANGELOG.MD

@@ -2,6 +2,10 @@
 
 更新日志文档，版本顺序从新到旧，最新版本在最前(上)面。
 
+# 1.0.4
+
+- 优化列表接口
+
 # 1.0.3
 
 - 修正刷新token的api的基础域名

gradle.properties

@@ -1,3 +1,3 @@
 group=run.ikaros.plugin
 description=A pan115 plugin for ikaros.
-version=1.0.3
+version=1.0.4

src/main/java/run/ikaros/plugin/pan115/Pan115AttachmentDriverFetcher.java

@@ -97,29 +97,29 @@ public Flux<Attachment> getChildren(Long driverId, Long pid, String remotePath)
                 })
                 .map(att -> {
                     final String fid = att.getFid();
-                    Pan115Folder pan115Folder = pan115Repository.openFolderGetInfo(fid);
+                    //Pan115Folder pan115Folder = pan115Repository.openFolderGetInfo(fid);
                     String path = "";
-                    for (Pan115Path pan115Path : pan115Folder.getPaths()) {
+                    for (Pan115Path pan115Path : att.getPath()) {
                         path += pan115Path.getFile_name();
                         path += "/";
                     }
 
-                    AttachmentType type = "1".equals(pan115Folder.getFile_category())
+                    AttachmentType type = "1".equals(att.getFc())
                             ? AttachmentType.Driver_File
                             : AttachmentType.Driver_Directory;
                     Attachment attachment = new Attachment();
-                    attachment.setSize(pan115Folder.getSize_byte());
+                    attachment.setSize(att.getFs());
                     attachment.setType(type);
-                    attachment.setName(pan115Folder.getFile_name());
+                    attachment.setName(att.getFn());
                     attachment.setUpdateTime(
-                            LocalDateTime.ofInstant(Instant.ofEpochMilli(Long.parseLong(pan115Folder.getUtime())),
+                            LocalDateTime.ofInstant(Instant.ofEpochMilli(att.getUpt()),
                                     ZoneId.systemDefault()));
                     attachment.setDriverId(driverId);
                     attachment.setDeleted(false);
-                    attachment.setSha1(pan115Folder.getSha1());
+                    attachment.setSha1(att.getSha1());
                     attachment.setParentId(pid);
-                    attachment.setFsPath(pan115Folder.getFile_id()); // @see core: AttachmentDriverServiceImpl#refreshRemoteFileSystem
-                    String url = pan115Folder.getPick_code();
+                    attachment.setFsPath(att.getFid()); // @see core: AttachmentDriverServiceImpl#refreshRemoteFileSystem
+                    String url = att.getPc();
                     if (StringUtils.isNotBlank(att.getIco())
                             && FileUtils.isImage(att.getIco())) {
                         url = att.getUo();

src/main/java/run/ikaros/plugin/pan115/model/Pan115Attachment.java

@@ -46,4 +46,5 @@ public class Pan115Attachment {
     private String v_img;
     private String thumb;
     private String uo;
+    private List<Pan115Path> path;
 }

src/main/java/run/ikaros/plugin/pan115/repository/DefaultPan115Repository.java

@@ -84,6 +84,18 @@ public List<Pan115Attachment> openUFileFiles(String cid, Integer limit, Integer
             Pan115Attachment[] pan115Attachments =
                     JsonUtils.json2ObjArr(JsonUtils.obj2Json(data), new TypeReference<>() {
                     });
+            Object pathObj = map.remove("path");
+            Pan115Path[] parentPath = JsonUtils.json2ObjArr(JsonUtils.obj2Json(pathObj), new TypeReference<>() {
+            });
+            for (Pan115Attachment pan115Attachment : pan115Attachments) {
+                List<Pan115Path> newPaths = List.of(parentPath);
+                Pan115Path lastPath = new Pan115Path();
+                lastPath.setFile_id(Long.parseLong(pan115Attachment.getFid()));
+                lastPath.setFile_name(pan115Attachment.getFn());
+                lastPath.setIss(String.valueOf(pan115Attachment.getIss()));
+                newPaths.add(lastPath);
+                pan115Attachment.setPath(newPaths);
+            }
             if (pan115Attachments == null) {
                 return List.of();
             }