@@ -278,8 +278,9 @@ class ZipPlugin(JmOptionPlugin):
278
278
279
279
# noinspection PyAttributeOutsideInit
280
280
def invoke (self ,
281
- album : JmAlbumDetail ,
282
281
downloader ,
282
+ album : JmAlbumDetail = None ,
283
+ photo : JmPhotoDetail = None ,
283
284
delete_original_file = False ,
284
285
level = 'photo' ,
285
286
filename_rule = 'Ptitle' ,
@@ -298,7 +299,7 @@ def invoke(self,
298
299
mkdir_if_not_exists (zip_dir )
299
300
300
301
path_to_delete = []
301
- photo_dict = downloader . download_success_dict [ album ]
302
+ photo_dict = self . get_downloaded_photo ( downloader , album , photo )
302
303
303
304
if level == 'album' :
304
305
zip_path = self .get_zip_path (album , None , filename_rule , suffix , zip_dir )
@@ -314,6 +315,13 @@ def invoke(self,
314
315
315
316
self .after_zip (path_to_delete )
316
317
318
+ def get_downloaded_photo (self , downloader , album , photo ):
319
+ return (
320
+ downloader .download_success_dict [album ]
321
+ if album is not None # after_album
322
+ else downloader .download_success_dict [photo .from_album ] # after_photo
323
+ )
324
+
317
325
def zip_photo (self , photo , image_list : list , zip_path : str , path_to_delete ):
318
326
"""
319
327
压缩photo文件夹
0 commit comments