Merge pull request #123 from cloudinary/hotfix/sync-status

pereirinha · web-flow · commit 9bffb53f9ba8 · 2020-07-18T08:43:48.000+01:00
New sync status
diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/cloudinary.css b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/cloudinary.css
diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/cloudinary.svg b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/cloudinary.svg
@@ -10,4 +10,6 @@
 <glyph unicode="&#xe900;" glyph-name="logo-icon" d="M835.053 170.828c-11.624 0-22.445 7.398-26.26 19.050-4.746 14.506 3.164 30.117 17.677 34.864 52.577 17.208 86.545 63.291 86.545 117.407 0 68.535-55.756 124.299-124.291 124.299-4.761 0-9.883-0.376-16.117-1.185l-27.026-3.504-3.879 26.982c-16.608 115.702-117.399 202.955-234.452 202.955-96.767 0-182.915-57.93-219.448-147.589l-6.877-16.868-18.205-0.332c-83.663-1.539-151.729-70.825-151.729-154.445 0-61.044 35.442-116.713 90.287-141.817 13.878-6.357 19.982-22.756 13.625-36.634s-22.749-19.968-36.626-13.632c-74.466 34.083-122.579 109.475-122.579 192.083 0 107.495 82.825 197.544 188.030 208.604 48.474 101.355 150.067 165.902 263.515 165.902 135.785 0 253.82-95.2 284.429-225.278 97.663-1.582 176.63-81.517 176.63-179.549 0-77.248-50.092-145.537-124.638-169.933-2.854-0.932-5.758-1.38-8.611-1.38zM412.694 157.983c-0.007 0.007-0.007 0.007-0.014 0.007s-0.014 0.007-0.022 0.007h-0.007c0 0-0.007 0.007-0.007 0.007l-0.007 0.007c0 0-0.007 0-0.007 0.007h-0.007l-0.007 0.007c0.007 0.007-0.007 0.007-0.007 0.007l-0.007 0.007c0 0-0.007 0-0.007 0l-0.007 0.007c0.007-0.007-0.007 0.007-0.007 0.007s-0.014 0.007-0.022 0.007l-0.007 0.007c-0.007 0.007-0.007 0.007-0.007 0.007l-0.007 0.007c-0.022 0.007-0.014 0.007-0.022 0.007-0.007-0.007-0.007 0.007-0.014 0.007l-0.007 0.007c0 0-0.007 0.007-0.014 0.007l-0.007 0.007c-0.007 0.007-0.022 0.007-0.029 0.007s-0.022 0.007-0.029 0.007c-0.007 0.007-0.007 0.007-0.014 0.007h-0.007c-0.007 0.007-0.014 0.007-0.022 0.007-0.007 0.007-0.022 0.007-0.022 0.007-0.007 0-0.007 0-0.007 0l-0.014 0.007c-0.007 0-0.007 0.007-0.007 0.007h-0.007c-0.426 0.152-0.881 0.246-1.358 0.267h-0.029c-0.007 0-0.007 0-0.014 0 0 0 0 0-0.007 0 0 0-0.007 0-0.007 0h-0.007c-0.007 0.007-0.007 0.007-0.007 0.007-0.007 0-0.014 0-0.014 0-0.007 0-0.014 0-0.014 0h-0.022c-0.007 0-0.014 0-0.014 0h-0.014c-0.007 0-0.007 0-0.007 0h-0.029c-0.007 0-0.007 0-0.007 0-11.963 0-21.752 9.738-21.824 21.672v243.208h18.544c0.029 0 0.065 0 0.094 0 2.839-0.123 4.775 2.059 4.775 4.681 0 1.958-1.199 3.634-2.904 4.334l-89.428 61.723c-1.604 1.105-3.72 1.105-5.324 0l-90.128-62.207c-1.69-1.163-2.42-3.294-1.813-5.252 0.614-1.958 2.42-3.287 4.472-3.287h18.638l0.014-243.266c0.094-16.818 13.603-30.544 30.789-30.977 0.195-0.022 0.383-0.036 0.578-0.036h133.509c0.029 0 0.051 0 0.079 0 1.228 0.022 2.341 0.513 3.164 1.3 0 0 0 0 0.007 0.007 0.014 0.014 0.029 0.029 0.036 0.036s0.014 0.007 0.022 0.022c0 0 0.007 0.007 0.007 0.007l0.029 0.029c0.007 0.007 0.007 0.007 0.007 0.007 0.014 0.007 0.007 0.007 0.014 0.014 0 0 0 0 0.007 0.007l0.007 0.007c0 0 0 0 0.007 0.007 0.809 0.838 1.315 1.972 1.322 3.229v0.072c-0.036 1.849-1.156 3.468-2.767 4.197zM606.077 157.983c0 0-0.007 0.007-0.014 0.007s-0.014 0.007-0.022 0.007h-0.007c-0.007 0.007-0.007 0.007-0.007 0.007l-0.007 0.007h-0.007c0 0-0.007 0.007-0.007 0.007s-0.007 0.007-0.007 0.007c0.007 0.007-0.007 0.007-0.014 0.007l-0.007 0.007h-0.007c-0.007 0-0.007 0.007-0.007 0.007-0.014-0.007-0.014 0.007-0.014 0.007l-0.014 0.007-0.007 0.007h-0.007c0 0-0.007 0.007-0.007 0.007l-0.007 0.007c-0.007 0.007-0.014 0.007-0.014 0.007-0.007-0.007-0.007 0.007-0.022 0.007l-0.014 0.014c0 0-0.007 0-0.014 0.007s-0.022 0.007-0.029 0.007-0.022 0.007-0.029 0.007-0.007 0.007-0.014 0.007-0.007 0-0.014 0.007c0 0-0.007 0-0.014 0.007-0.022 0.007-0.007 0.007-0.014 0.007-0.022 0-0.007 0-0.014 0.007 0 0-0.007 0.007-0.014 0.007l-0.007 0.007h-0.007c-0.426 0.152-0.881 0.246-1.358 0.267h-0.014c-0.007 0-0.007 0-0.007 0-0.007 0-0.014 0-0.014 0s-0.007 0-0.007 0h-0.014l-0.007 0.007c-0.007 0-0.014 0-0.014 0-0.007 0-0.014 0-0.014 0h-0.007c-0.007 0-0.007 0-0.007 0h-0.007c-0.007 0-0.014 0-0.014 0s-0.007 0-0.014 0h-0.007c0 0-0.007 0-0.007 0h-0.007c-0.007 0-0.007 0-0.007 0h-0.029c-0.007 0-0.007 0-0.007 0-11.956 0-21.745 9.738-21.817 21.672v188.731h18.631c0.065 0.007 0.116 0.007 0.188 0 2.586 0 4.681 2.095 4.681 4.681 0 1.958-1.199 3.634-2.904 4.334l-89.435 61.723c-1.604 1.105-3.72 1.105-5.324 0l-90.092-62.2c-1.69-1.163-2.42-3.294-1.813-5.252 0.614-1.958 2.42-3.287 4.472-3.287h18.552l0.014-188.803c0.079-16.825 13.61-30.558 30.804-30.984 0.188-0.022 0.376-0.029 0.563-0.029h133.509c0.029 0 0.051 0 0.079 0 1.228 0.022 2.341 0.513 3.164 1.3 0 0 0 0 0.007 0.007 0.014 0.014 0.043 0.029 0.036 0.036 0.007 0.007 0.014 0.007 0.022 0.022 0.007 0.007 0.007 0.007 0.007 0.007l0.014 0.014c0 0 0.007 0 0.007 0.007l0.007 0.007c0.007 0 0.007 0.007 0.007 0.007 0.022 0.007 0.014 0.007 0.014 0.014 0 0 0 0 0.007 0.007 0 0 0 0 0.007 0.007 0 0 0 0 0.007 0.007 0.809 0.838 1.315 1.972 1.322 3.229v0.072c-0.043 1.842-1.163 3.46-2.774 4.19zM799.525 157.983l-0.014 0.007c-0.007 0-0.014 0.007-0.022 0.007h-0.007c-0.007 0.007-0.007 0.007-0.007 0.007l-0.007 0.007c-0.007 0-0.007 0-0.007 0.007h-0.007l-0.007 0.007c-0.007 0.007-0.007 0.007-0.007 0.007s-0.007 0-0.007 0.007h-0.007c0 0-0.007 0.007-0.007 0.007-0.007-0.007-0.007 0.007-0.014 0.007 0.007 0.007-0.007 0.007-0.014 0.007l-0.007 0.007c-0.007 0-0.007 0-0.007 0-0.007 0.007-0.007 0.007-0.007 0.007l-0.007 0.007c-0.022 0.007-0.014 0.007-0.014 0.007-0.007-0.007-0.007 0.007-0.022 0.007l-0.007 0.007c0.007 0.007-0.007 0.007-0.014 0.007 0 0-0.007 0-0.007 0.007-0.007 0.007-0.022 0.007-0.029 0.007s-0.022 0.007-0.029 0.007l-0.014 0.007c0 0-0.007 0-0.014 0.007l-0.014 0.007c-0.022 0.007-0.022 0.007-0.014 0.007-0.022 0-0.022 0-0.014 0.007-0.007 0-0.007 0.007-0.007 0.007-0.007 0-0.014 0.007-0.014 0.007h-0.007c-0.426 0.152-0.881 0.246-1.358 0.267h-0.007c-0.007 0-0.014 0-0.014 0-0.007 0-0.014 0-0.022 0h-0.022c-0.007 0.007-0.007 0.007-0.014 0.007 0 0-0.007 0-0.014 0 0 0-0.007 0-0.014 0h-0.007c0 0-0.007 0-0.007 0h-0.007c-0.007 0-0.014 0-0.014 0h-0.014c0 0 0 0-0.007 0 0 0-0.007 0-0.007 0h-0.007c0 0-0.007 0-0.007 0h0.007c0 0-0.007 0-0.007 0-11.956 0-21.745 9.738-21.817 21.672v134.29h18.588c0.029 0 0.065 0 0.094 0 2.637 0.065 4.775 2.059 4.775 4.681 0 1.958-1.199 3.634-2.904 4.334l-89.435 61.723c-1.597 1.105-3.72 1.105-5.324 0l-90.128-62.2c-1.69-1.163-2.42-3.294-1.813-5.252 0.614-1.958 2.42-3.287 4.472-3.287h18.588l0.014-134.362c0.094-16.825 13.618-30.565 30.804-30.984 0.188-0.022 0.376-0.029 0.563-0.029h133.509c0.029 0 0.051 0 0.079 0 1.228 0.022 2.341 0.513 3.164 1.3l0.007 0.007c0.014 0.014 0.036 0.029 0.036 0.036 0.007 0.007 0.014 0.007 0.022 0.022 0 0 0.007 0.007 0.007 0.007l0.036 0.036c0.022 0.007 0.007 0.007 0.014 0.014 0 0 0 0 0.007 0.007l0.007 0.007c0 0 0 0 0.007 0.007 0.809 0.838 1.315 1.972 1.322 3.229v0.072c-0.029 1.842-1.156 3.46-2.76 4.19z" />
 <glyph unicode="&#xe901;" glyph-name="error-icon" d="M128 448c0-94.293 38.827-179.2 100.693-240.64l-100.693-100.693h256v256l-95.573-95.573c-46.080 46.507-75.093 110.080-75.093 180.907 0 111.36 71.253 206.080 170.667 241.067v89.173c-147.2-37.973-256-171.093-256-330.24zM469.333 234.667h85.333v85.333h-85.333v-85.333zM896 789.333h-256v-256l95.573 95.573c46.080-46.507 75.093-110.080 75.093-180.907 0-111.36-71.253-206.080-170.667-241.067v-89.173c147.2 37.973 256 171.093 256 330.24 0 94.293-38.827 179.2-100.693 240.64l100.693 100.693zM469.333 405.333h85.333v256h-85.333v-256z" />
 <glyph unicode="&#xe902;" glyph-name="pending-icon" d="M512 789.333v128l-170.667-170.667 170.667-170.667v128c141.227 0 256-114.773 256-256 0-43.093-10.667-84.053-29.867-119.467l62.293-62.293c33.28 52.48 52.907 114.773 52.907 181.76 0 188.587-152.747 341.333-341.333 341.333zM512 192c-141.227 0-256 114.773-256 256 0 43.093 10.667 84.053 29.867 119.467l-62.293 62.293c-33.28-52.48-52.907-114.773-52.907-181.76 0-188.587 152.747-341.333 341.333-341.333v-128l170.667 170.667-170.667 170.667v-128z" />
+<glyph unicode="&#xe903;" glyph-name="downloading-icon" d="M638.725 222.74v0h137.282c103.040 0 186.563 83.527 186.563 186.563 0 98.935-77.015 179.888-174.363 186.169-36.401 119.907-147.681 204.557-276.204 204.557v0c-111.868 0-212.028-64.257-261.237-162.725-106.102-9.287-189.329-98.364-189.329-206.881 0-114.699 92.987-207.683 207.683-207.683h116.162v56.319h-116.162c-83.596 0-151.363 67.77-151.363 151.363s67.77 151.363 151.363 151.363h18.604l7.298 17.108c37.197 87.142 121.928 144.816 216.983 144.816v0c109.671 0 203.756-76.603 226.937-182.318l5.156-23.511 24.018 1.429c2.619 0.155 5.248 0.231 7.888 0.231 71.932 0 130.242-58.316 130.242-130.242s-58.316-130.242-130.242-130.242h-137.282v-56.319zM423.179 424.346c0.011-0.011 0.011-0.011 0.011-0.011s0.011-0.011 0.021-0.011h0.011c0 0 0.011-0.011 0.011-0.011l0.011-0.011c0 0 0.011 0 0.011-0.011h0.011l0.011-0.011c-0.011-0.011 0.011-0.011 0.011-0.011l0.011-0.011c0 0 0.011 0 0.011 0l0.011-0.011c-0.011 0.011 0.011-0.011 0.011-0.011s0.011-0.011 0.021-0.011l0.011-0.011c0.011-0.011 0.011-0.011 0.011-0.011l0.011-0.011c0.021-0.011 0.011-0.011 0.021-0.011 0.011 0.011 0.011-0.011 0.011-0.011l0.011-0.011c0 0 0.011-0.011 0.011-0.011l0.011-0.011c0.011-0.011 0.021-0.011 0.032-0.011s0.021-0.011 0.032-0.011c0.011-0.011 0.011-0.011 0.011-0.011h0.011c0.011-0.011 0.011-0.011 0.021-0.011 0.011-0.011 0.021-0.011 0.021-0.011 0.011 0 0.011 0 0.011 0l0.011-0.011c0.011 0 0.011-0.011 0.011-0.011h0.011c0.414-0.144 0.859-0.238 1.325-0.259h0.032c0.011 0 0.011 0 0.011 0s0 0 0.011 0c0 0 0.011 0 0.011 0h0.011c0.011-0.011 0.011-0.011 0.011-0.011 0.011 0 0.011 0 0.011 0 0.011 0 0.011 0 0.011 0h0.021c0.011 0 0.011 0 0.011 0h0.011c0.011 0 0.011 0 0.011 0h0.032c0.011 0 0.011 0 0.011 0 11.656 0 21.2-9.494 21.266-21.119v-237.013h-18.076c-0.032 0-0.062 0-0.093 0-2.763 0.121-4.654-2.008-4.654-4.566 0-1.904 1.17-3.541 2.827-4.224l87.15-60.151c1.563-1.077 3.623-1.077 5.187 0l87.833 60.625c1.646 1.133 2.36 3.209 1.771 5.116-0.6 1.904-2.36 3.201-4.359 3.201h-18.164l-0.011 237.070c-0.093 16.388-13.257 29.764-30.002 30.188-0.187 0.021-0.373 0.033-0.561 0.033h-130.108c-0.032 0-0.053 0-0.077 0-1.199-0.021-2.277-0.496-3.085-1.265 0 0 0 0-0.011-0.011s-0.032-0.032-0.033-0.033-0.011-0.011-0.021-0.021c0 0-0.011-0.011-0.011-0.011l-0.032-0.032c-0.011-0.011-0.011-0.011-0.011-0.011-0.011-0.011-0.011-0.011-0.011-0.011s0 0-0.011-0.011l-0.011-0.011c0 0 0 0-0.011-0.011-0.787-0.818-1.284-1.925-1.287-3.147v-0.072c0.033-1.801 1.128-3.378 2.695-4.089z" />
+<glyph unicode="&#xe904;" glyph-name="syncing-icon" d="M693.648 264.985c-2.784-5.412-5.824-10.709-9.101-15.872-1.097-1.713-2.941-2.871-4.997-3.081-2.052-0.272-4.171 0.481-5.611 1.916l-35.989 36.057c-2.187 2.119-2.668 5.403-1.232 8.071 10.879 20.253 16.555 42.828 16.488 65.816 0 36.259-13.955 71.151-38.995 97.423-24.972 26.204-59.18 41.873-95.372 43.647v-83.536l-115.211 115.211 115.211 115.144v-83.81c52.955-1.713 103.172-24.015 139.98-62.122 36.808-38.040 57.399-89.007 57.399-141.964 0-12.867-1.232-25.647-3.64-38.176h55.979c69.899 0 126.571 56.667 126.571 126.571s-56.667 126.571-126.571 126.571c-2.563 0-5.124-0.077-7.667-0.224l-23.344-1.387-5.008 22.844c-22.527 102.733-113.959 177.175-220.54 177.175v0c-92.376 0-174.717-56.049-210.865-140.732l-7.097-16.623h-18.076c-81.235 0-147.097-65.855-147.097-147.097s65.855-147.097 147.097-147.097h35.421c-2.379 12.5-3.603 25.28-3.603 38.176 0 38.521 11.017 76.284 31.675 108.781 1.097 1.781 2.941 2.941 4.997 3.149s4.171-0.481 5.611-1.984l35.989-35.989c2.187-2.119 2.668-5.471 1.232-8.071-10.879-20.253-16.555-42.895-16.488-65.883 0-36.192 13.955-71.084 38.995-97.356 24.972-26.272 59.18-41.873 95.372-43.647v0 83.536l115.211-115.211-115.211-115.211v83.81c-52.955 1.781-103.172 24.085-139.98 62.122-14.163 14.659-25.925 31.22-35.036 49.057h-54.181c-111.464 0-201.828 90.364-201.828 201.828 0 105.455 80.88 192.024 183.992 201.048 47.825 95.693 145.161 158.135 253.872 158.135v0c124.899 0 233.048-82.264 268.415-198.792 94.606-6.105 169.449-84.777 169.449-180.92 0-100.134-81.167-181.305-181.305-181.305h-74.916z" />
 </font></defs></svg>
diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/fonts/cloudinary.eot b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/fonts/cloudinary.eot
diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/fonts/cloudinary.ttf b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/fonts/cloudinary.ttf
diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/fonts/cloudinary.woff b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/fonts/cloudinary.woff
diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/src/_variables.scss b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/src/_variables.scss
@@ -3,5 +3,5 @@ $color-green : #558b2f;
 $color-red : #dd2c00;
 $color-light-grey : #e5e5e5;
 $color-white : #ffffff;
-$color-blue : #0078ff;
+$color-blue : #0071ba;
 $color-orange : #fd9d2c;
diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/src/components/_brand.scss b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/css/src/components/_brand.scss
@@ -1,10 +1,10 @@
 @font-face {
 	font-family : 'cloudinary';
-	src         : url('fonts/cloudinary.eot?fj77m5');
-	src         : url('fonts/cloudinary.eot?fj77m5#iefix') format('embedded-opentype'),
-	url('fonts/cloudinary.ttf?fj77m5') format('truetype'),
-	url('fonts/cloudinary.woff?fj77m5') format('woff'),
-	url('fonts/cloudinary.svg?fj77m5#cloudinary') format('svg');
+	src         : url('fonts/cloudinary.eot?xr4567gh');
+	src         : url('fonts/cloudinary.eot?xr4567gh#iefix') format('embedded-opentype'),
+	url('fonts/cloudinary.ttf?xr4567gh') format('truetype'),
+	url('fonts/cloudinary.woff?xr4567gh') format('woff'),
+	url('fonts/cloudinary.svg?xr4567gh#cloudinary') format('svg');
 	font-weight : normal;
 	font-style  : normal;
 }
@@ -48,12 +48,20 @@
 			}
 		}
 
-		&.warning {
-			color : $color-orange;
+		&.info {
+			color : $color-blue;
 		}
 
-		&.warning {
-			color : $color-orange;
+		&.downloading {
+			&:before {
+				content: '\e903';
+			}
+		}
+
+		&.syncing {
+			&:before {
+				content: '\e904';
+			}
 		}
 	}
 }
diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-media.php b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-media.php
@@ -1096,6 +1096,7 @@ public function media_column_value( $column_name, $attachment_id ) {
 					'state' => 'inactive',
 					'note'  => esc_html__( 'Not Synced', 'cloudinary' ),
 				);
+				add_filter( 'cloudinary_flag_sync', '__return_true' );
 				if ( false === $this->cloudinary_id( $attachment_id ) ) {
 					// If false, lets check why by seeing if the file size is too large.
 					$file     = get_attached_file( $attachment_id ); // Get the file size to make sure it can exist in cloudinary.
@@ -1112,6 +1113,7 @@ public function media_column_value( $column_name, $attachment_id ) {
 						'note'  => esc_html__( 'Synced', 'cloudinary' ),
 					);
 				}
+				remove_filter( 'cloudinary_flag_sync', '__return_true' );
 				// filter status.
 				$status = apply_filters( 'cloudinary_media_status', $status, $attachment_id );
 				?>
diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-sync.php b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-sync.php
@@ -49,6 +49,8 @@ class Sync implements Setup, Assets {
 		'sync_error'     => '_sync_error',
 		'cloudinary'     => '_cloudinary_v2',
 		'folder_sync'    => '_folder_sync',
+		'syncing'        => '_cloudinary_syncing',
+		'downloading'    => '_cloudinary_downloading',
 	);
 
 	/**
@@ -100,14 +102,18 @@ public function is_active() {
 	 * @return bool
 	 */
 	public function is_synced( $post_id ) {
-		$return    = false;
 		$signature = $this->get_signature( $post_id );
 		$expecting = $this->generate_signature( $post_id );
+
 		if ( ! empty( $signature ) && ! empty( $expecting ) && $expecting === $signature ) {
-			$return = $signature;
+			return true;
 		}
 
-		return $return;
+		if ( apply_filters( 'cloudinary_flag_sync', '__return_false' ) ) {
+			update_post_meta( $post_id, Sync::META_KEYS['syncing'], true );
+		}
+
+		return false;
 	}
 
 	/**
diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/media/class-upgrade.php b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/media/class-upgrade.php
@@ -96,6 +96,29 @@ public function check_cloudinary_version( $cloudinary_id, $attachment_id ) {
 		return $cloudinary_id;
 	}
 
+	/**
+	 * Checks the status of the media item.
+	 *
+	 * @param array $status        Array of state and note.
+	 * @param int   $attachment_id The attachment id.
+	 *
+	 * @return array
+	 */
+	public function filter_status( $status, $attachment_id ) {
+
+		if ( get_post_meta( $attachment_id, Sync::META_KEYS['downloading'] ) ) {
+			$status['state'] = 'info downloading';
+			$status['note']  = __( 'Downloading', 'cloudinary' );
+		}
+
+		if ( get_post_meta( $attachment_id, Sync::META_KEYS['syncing'] ) ) {
+			$status['state'] = 'info syncing';
+			$status['note']  = __( 'Syncing metadata', 'cloudinary' );
+		}
+
+		return $status;
+	}
+
 	/**
 	 * Convert an image post that was created from Cloudinary v1.
 	 *
@@ -139,6 +162,10 @@ function ( $val ) use ( $media ) {
 		$path      = pathinfo( $public_id );
 		$public_id = strstr( $public_id, '.' . $path['extension'], true );
 		$this->media->update_post_meta( $attachment_id, Sync::META_KEYS['public_id'], $public_id );
+
+		// Flag the download
+		update_post_meta( $attachment_id, Sync::META_KEYS['downloading'], true );
+
 		if ( ! defined( 'DOING_BULK_SYNC' ) ) {
 			$this->sync->managers['upload']->add_to_sync( $attachment_id ); // Auto sync if upgrading outside of bulk sync.
 		}
@@ -152,6 +179,9 @@ function ( $val ) use ( $media ) {
 	public function setup_hooks() {
 		add_filter( 'validate_cloudinary_id', array( $this, 'check_cloudinary_version' ), 10, 2 ); // Priority 10, to allow prep_on_demand_upload.
 
+		// Show sync status.
+		add_filter( 'cloudinary_media_status', array( $this, 'filter_status' ), 20, 2 );
+
 		// Add a redirection to the new plugin settings, from the old plugin.
 		if ( is_admin() ) {
 			add_action( 'admin_menu', function () {
diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-push-sync.php b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-push-sync.php
@@ -391,6 +391,10 @@ public function prepare_upload( $post, $down_sync = false ) {
 				$error = sprintf( __( 'File size exceeds the maximum of %s. This media asset will be served from WordPress.', 'cloudinary' ), $max_size_hr );
 				$media->delete_post_meta( $post->ID, Sync::META_KEYS['pending'] ); // Remove Flag.
 
+				// Cleanup flags
+				delete_post_meta( $post->ID, Sync::META_KEYS['syncing'] );
+				delete_post_meta( $post->ID, Sync::META_KEYS['downloading'] );
+
 				return new \WP_Error( 'upload_error', $error );
 			}
 
@@ -629,6 +633,11 @@ public function push_attachments( $attachments ) {
 					$meta_data[ Sync::META_KEYS['version'] ] = $result['version'];
 				}
 				$media->delete_post_meta( $attachment->ID, Sync::META_KEYS['pending'] );
+
+				// Cleanup flags
+				delete_post_meta( $attachment->ID, Sync::META_KEYS['downloading'] );
+				delete_post_meta( $attachment->ID, Sync::META_KEYS['syncing'] );
+
 				$media->delete_post_meta( $attachment->ID, Sync::META_KEYS['sync_error'], false );
 				if ( ! empty( $this->plugin->config['settings']['global_transformations']['enable_breakpoints'] ) ) {
 					if ( ! empty( $result['responsive_breakpoints'] ) ) { // Images only.
diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-upload-sync.php b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/sync/class-upload-sync.php
@@ -145,6 +145,8 @@ public function handle_bulk_actions( $location, $action, $post_ids ) {
 					delete_post_meta( $post_id, Sync::META_KEYS['sync_error'] );
 					delete_post_meta( $post_id, Sync::META_KEYS['public_id'] );
 					delete_post_meta( $post_id, Sync::META_KEYS['pending'] );
+					delete_post_meta( $post_id, Sync::META_KEYS['downloading'] );
+					delete_post_meta( $post_id, Sync::META_KEYS['syncing'] );
 					$file = get_attached_file( $post_id );
 					wp_generate_attachment_metadata( $post_id, $file );
 					$this->prep_upload( $post_id );
@@ -304,14 +306,14 @@ public function filter_status( $status, $attachment_id ) {
 
 		if ( $this->is_pending( $attachment_id ) ) {
 			$status['state'] = 'warning';
-			$status['note']  = esc_html__( 'Upload sync pending', 'cloudinary' );
+			$status['note']  = __( 'Upload sync pending', 'cloudinary' );
 		}
 
 		// Check if there's an error.
 		$has_error = $this->plugin->components['media']->get_post_meta( $attachment_id, Sync::META_KEYS['sync_error'], true );
 		if ( ! empty( $has_error ) ) {
-			$status['note']  = $has_error;
 			$status['state'] = 'error';
+			$status['note']  = $has_error;
 		}
 
 		return $status;

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`@font-face {`
`2`	`2`	`font-family : 'cloudinary';`
`3`		`- src : url('fonts/cloudinary.eot?fj77m5');`
`4`		`- src : url('fonts/cloudinary.eot?fj77m5#iefix') format('embedded-opentype'),`
`5`		`- url('fonts/cloudinary.ttf?fj77m5') format('truetype'),`
`6`		`- url('fonts/cloudinary.woff?fj77m5') format('woff'),`
`7`		`- url('fonts/cloudinary.svg?fj77m5#cloudinary') format('svg');`
	`3`	`+ src : url('fonts/cloudinary.eot?xr4567gh');`
	`4`	`+ src : url('fonts/cloudinary.eot?xr4567gh#iefix') format('embedded-opentype'),`
	`5`	`+ url('fonts/cloudinary.ttf?xr4567gh') format('truetype'),`
	`6`	`+ url('fonts/cloudinary.woff?xr4567gh') format('woff'),`
	`7`	`+ url('fonts/cloudinary.svg?xr4567gh#cloudinary') format('svg');`
`8`	`8`	`font-weight : normal;`
`9`	`9`	`font-style : normal;`
`10`	`10`	`}`
`@@ -48,12 +48,20 @@`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- &.warning {`
`52`		`- color : $color-orange;`
	`51`	`+ &.info {`
	`52`	`+ color : $color-blue;`
`53`	`53`	`}`
`54`	`54`
`55`		`- &.warning {`
`56`		`- color : $color-orange;`
	`55`	`+ &.downloading {`
	`56`	`+ &:before {`
	`57`	`+ content: '\e903';`
	`58`	`+ }`
	`59`	`+ }`
	`60`	`+`
	`61`	`+ &.syncing {`
	`62`	`+ &:before {`
	`63`	`+ content: '\e904';`
	`64`	`+ }`
`57`	`65`	`}`
`58`	`66`	`}`
`59`	`67`	`}`