zou 0.20.78__py3-none-any.whl → 0.20.79__py3-none-any.whl

zou/__init__.py

@@ -1 +1 @@
-__version__ = "0.20.78"
+__version__ = "0.20.79"

zou/app/services/emails_service.py

@@ -164,7 +164,7 @@ _%s_
             },
             "discord_message": discord_message,
         }
-        send_notification(person_id, subject, messages)
+        send_notification(person_id, subject, messages, title)
 
     return True
 
@@ -215,7 +215,7 @@ _%s_
             task_url,
             comment["text"],
         )
-
+        title = "New Mention"
         messages = {
             "email_message": email_message,
             "slack_message": slack_message,
@@ -225,7 +225,7 @@ _%s_
             },
             "discord_message": discord_message,
         }
-        return send_notification(person_id, subject, messages)
+        return send_notification(person_id, subject, messages, title)
     else:
         return True
 
@@ -273,7 +273,7 @@ def send_assignation_notification(person_id, author_id, task):
             },
             "discord_message": discord_message,
         }
-        return send_notification(person_id, subject, messages)
+        return send_notification(person_id, subject, messages, title)
     return True
 
 
@@ -372,7 +372,7 @@ _%s_
             },
             "discord_message": discord_message,
         }
-        send_notification(person_id, subject, messages)
+        send_notification(person_id, subject, messages, title)
     return True
 
 
@@ -397,25 +397,37 @@ def send_playlist_ready_notification(person_id, author_id, playlist):
         or person["notifications_mattermost_enabled"]
         or person["notifications_discord_enabled"]
     ):
+
+        playlist_url = f"{config.DOMAIN_PROTOCOL}://{config.DOMAIN_NAME}/productions/{playlist['project_id']}/"
+
         if episode is not None:
-            playlist_url = f"{config.DOMAIN_PROTOCOL}://{config.DOMAIN_NAME}/productions/{playlist['project_id']}/episodes/{episode['id']}/playlists/{playlist['id']}"
+            playlist_url += f"episodes/{episode['id']}/playlists/{playlist['id']}"
+        elif project["production_type"] == "tvshow" and \
+            playlist["for_entity"] == "asset":
+            if playlist["is_for_all"] == True:
+                playlist_url += f"episodes/all/playlists/{playlist['id']}"
+            else:
+                playlist_url += f"episodes/main/playlists/{playlist['id']}"
         else:
-            playlist_url = f"{config.DOMAIN_PROTOCOL}://{config.DOMAIN_NAME}/productions/{playlist['project_id']}/playlists/{playlist['id']}"
+            playlist_url += f"playlists/{playlist['id']}"
 
-        title = "Playlist Ready"
+        title = "New Playlist Ready"
         episode_segment = ""
         if episode is not None:
-            episode_segment = f"the episode {episode['name']} of"
-        subject = "[Kitsu] A new playlist is ready"
+            episode_segment = f"the episode {episode['name']} of "
+        subject = f'[Kitsu] The playlist {playlist["name"]} in project {project["name"]} is ready for review'
 
-        email_message = f"""<p><strong>{author["full_name"]}</strong> notifies you that playlist <a href="{playlist_url}">{playlist["name"]}</a> is ready for a review under {episode_segment} the project {project["name"]}.</p>
+        email_message = f"""<p><strong>{author["full_name"]}</strong> notifies you that playlist <a href="{playlist_url}">{playlist["name"]}</a> is ready for a review under {episode_segment}the project {project["name"]}.</p>
+        """
 
-        {len(playlist["shots"])} elements are listed in the playlist.
+        if len(playlist["shots"]) > 1:
+            email_message += f"""
+<p>{len(playlist["shots"])} elements are listed in the playlist.</p>
         """
 
-        slack_message = f"*{author['full_name']}* notifies you that a playlist <{playlist_url}|{playlist['name']}> is ready for a review under {episode_segment} the project {project['name']}."
+        slack_message = f"*{author['full_name']}* notifies you that a playlist <{playlist_url}|{playlist['name']}> is ready for a review under {episode_segment}the project {project['name']}."
 
-        discord_message = f"*{author['full_name']}* notifies you that a playlist [{playlist['name']}]({playlist_url}) is ready for a review under {episode_segment} the project {project['name']}."
+        discord_message = f"*{author['full_name']}* notifies you that a playlist [{playlist['name']}]({playlist_url}) is ready for a review under {episode_segment}the project {project['name']}."
         messages = {
             "email_message": email_message,
             "slack_message": slack_message,

zou/app/services/notifications_service.py

@@ -529,3 +529,12 @@ def notify_clients_playlist_ready(playlist, studio_id=None):
         emails_service.send_playlist_ready_notification(
             recipient_id, author_id, playlist
         )
+        events.emit(
+            "notification:new",
+            {
+                "notification_id": notification["id"],
+                "person_id": recipient_id,
+            },
+            project_id=playlist["project_id"],
+            persist=False,
+        )

zou/app/services/user_service.py

@@ -1461,6 +1461,8 @@ def get_last_notifications(
         full_entity_name, episode_id, entity_preview_file_id = "", None, None
         playlist_id = notification.playlist_id
         playlist_name = ""
+        playlist_for_entity = ""
+        playlist_is_for_all = False
         if notification.playlist_id is None:
             (full_entity_name, episode_id, entity_preview_file_id) = (
                 names_service.get_full_entity_name(task_entity_id)
@@ -1474,6 +1476,9 @@ def get_last_notifications(
             project_id = project["id"]
             project_name = project["name"]
             playlist_name = playlist["name"]
+            playlist_for_entity = playlist["for_entity"]
+            playlist_is_for_all = playlist["is_for_all"]
+
         preview_file_id = None
         mentions = []
         department_mentions = []
@@ -1539,6 +1544,8 @@ def get_last_notifications(
                     "subscription_id": subscription_id,
                     "playlist_id": playlist_id,
                     "playlist_name": playlist_name,
+                    "playlist_for_entity": playlist_for_entity,
+                    "playlist_is_for_all": playlist_is_for_all,
                 }
             )
         )

{zou-0.20.78.dist-info → zou-0.20.79.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zou
-Version: 0.20.78
+Version: 0.20.79
 Summary: API to store and manage the data of your animation production
 Home-page: https://zou.cg-wire.com
 Author: CG Wire

{zou-0.20.78.dist-info → zou-0.20.79.dist-info}/RECORD

@@ -1,4 +1,4 @@
-zou/__init__.py,sha256=E8sEfjV0rVqHMBvKbg9TmpXbI1gbtEK-4a8RgyCqyZE,24
+zou/__init__.py,sha256=LXoEcDo6khk2OppbVEFdEec8-nd6EVOMY4kgq866Voo,24
 zou/cli.py,sha256=N9FyrL4TDgIiCUa-I3xIzOgiVLM14kz8_QLQ48y51oE,22767
 zou/debug.py,sha256=1fawPbkD4wn0Y9Gk0BiBFSa-CQe5agFi8R9uJYl2Uyk,520
 zou/event_stream.py,sha256=9O1PE_vDW8p3yfHJNSZ8w0ybD-660x8oGN0izgJdTjM,8575
@@ -206,7 +206,7 @@ zou/app/services/custom_actions_service.py,sha256=fWISEOOdthadrxeHuacEel5Xj6msn0
 zou/app/services/deletion_service.py,sha256=UPojg4oyyCKjUObfwv9nY6tD0SVDeimpv0xgbcSmyyk,17372
 zou/app/services/departments_service.py,sha256=7jLKH7ziToc6uHZsZKdBUzN2Ubi2YloHCX7PecE51LU,4596
 zou/app/services/edits_service.py,sha256=hfg6Fk9J9W41Qyw96UF35cSgbXqCYci6H8OY5rL_cIk,12075
-zou/app/services/emails_service.py,sha256=Vlgi0H5tBgsHVFg2sDkQMpCUgUGg6puCV0hsBaveTco,14299
+zou/app/services/emails_service.py,sha256=FqcLiTlaagjiU5XQeN9Rk5gdkd_Fs6bnKZXKxesIfEg,14767
 zou/app/services/entities_service.py,sha256=H9fMuRmrcS_ZxZ7vEo30m93UCRwXCKsIaPU7SYTgoK8,17792
 zou/app/services/events_service.py,sha256=Ew-bY5hqrWLmpbVj1_xd3E2S3JtyAGzdgw2XjudTZjc,2700
 zou/app/services/exception.py,sha256=VaQbvvv7yJ-lCFOlvAPKkYPuw7MjCaSAo1F40fS3kZ8,4478
@@ -215,7 +215,7 @@ zou/app/services/files_service.py,sha256=df1_9v-vwE5HVi9XjtilTPWHuiWunvrwPyQh_IX
 zou/app/services/index_service.py,sha256=IaffQz_oj6GPEbuDp4a2qnSc6n-hhIcmA_LrTm3Wots,10201
 zou/app/services/names_service.py,sha256=TOSrintROmxcAlcFQE0i2E3PBLnw81GAztNselpTn18,2947
 zou/app/services/news_service.py,sha256=oXdEiSaTdkpYutm_UtmNWTDw4BPUBMFJDOEHhJ28q6w,10047
-zou/app/services/notifications_service.py,sha256=UAQZfUty2NR8NTRNuTu37LxdqDxVE_xo6DTb_paH0CQ,16840
+zou/app/services/notifications_service.py,sha256=yCcS5NpEQe1H9bHO-Oae1E8lmEh-oGwcHut4DRq1OIM,17104
 zou/app/services/persons_service.py,sha256=HjV-su80Y2BO9l5zoBKHMNF0mDGtkWqPhEOs3nQ3nlI,16566
 zou/app/services/playlists_service.py,sha256=IKjvT3RZigwXsrhsRFqaWWlm-tZSN6-jgMDf0Hn3w3Q,33179
 zou/app/services/plugins_service.py,sha256=dbU-2f7t3eo6VISQBsASM8Or4Y8ha6Vt8ZHgtizdOi0,1917
@@ -231,7 +231,7 @@ zou/app/services/tasks_service.py,sha256=ZLUi6_XhLU_SLwERFHx4QwcXdS-ncrVH_rIl-Lt
 zou/app/services/telemetry_services.py,sha256=xQm1h1t_JxSFW59zQGf4NuNdUi1UfMa_6pQ-ytRbmGA,1029
 zou/app/services/template_services.py,sha256=26iK-ptX3SyPF3zj1l4dWVRRGcTHxUD990P_wUDyck4,38050
 zou/app/services/time_spents_service.py,sha256=AIMDyBkVVxqUqVBqsUhwjLMxYKgHcgoSRJyKJkPORTk,18636
-zou/app/services/user_service.py,sha256=xLIBjiz8-JdetUev6it5LzDaqq6rd4NTT7PVdFHvE8I,53746
+zou/app/services/user_service.py,sha256=KoMmcJgo3kakLW-UNjqLLDeVjiUojRT-6LitJTPuUb8,54058
 zou/app/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/app/stores/auth_tokens_store.py,sha256=-qOJPybLHvnMOq3PWk073OW9HJwOHGhFLZeOIlX1UVw,1290
 zou/app/stores/file_store.py,sha256=yLQDM6mNbj9oe0vsWdBqun7D8Dw-eSjD1yHCCftX0OI,4045
@@ -473,9 +473,9 @@ zou/remote/normalize_movie.py,sha256=zNfEY3N1UbAHZfddGONTg2Sff3ieLVWd4dfZa1dpnes
 zou/remote/playlist.py,sha256=AsDo0bgYhDcd6DfNRV6r6Jj3URWwavE2ZN3VkKRPbLU,3293
 zou/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zou/utils/movie.py,sha256=d67fIL9dVBKt-E_qCGXRbNNdbJaJR5sHvZeX3hf8ldE,16559
-zou-0.20.78.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-zou-0.20.78.dist-info/METADATA,sha256=wwEFuAVB3Fyg-IBYU_UMLHJ8xLh2733q0WPopW-kpUk,6698
-zou-0.20.78.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-zou-0.20.78.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
-zou-0.20.78.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
-zou-0.20.78.dist-info/RECORD,,
+zou-0.20.79.dist-info/licenses/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+zou-0.20.79.dist-info/METADATA,sha256=3-qEmV2mmCpTddGL6nfshPTxj-49KVawwTa6E7nucHs,6698
+zou-0.20.79.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+zou-0.20.79.dist-info/entry_points.txt,sha256=PelQoIx3qhQ_Tmne7wrLY-1m2izuzgpwokoURwSohy4,130
+zou-0.20.79.dist-info/top_level.txt,sha256=4S7G_jk4MzpToeDItHGjPhHx_fRdX52zJZWTD4SL54g,4
+zou-0.20.79.dist-info/RECORD,,