WebSVN – SmartDukaan – Diff – /trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java

             return;
         } else {
             Map<String, Media> medias = expSlide.getFreeformContent().getMedias();
             for (String documentLabel : documentLabels) {
                 Media document = medias.get(documentLabel);
-                if (document.getCreationTime().getTime() > Long.parseLong(contentVersion)) {
-                    copyFile(new File(document.getLocation()), new File(destFile, computeNewFileName(documentPrefix, document.getFileName(),
+                copyFile(new File(document.getLocation()), new File(destFile, computeNewFileName(documentPrefix, document.getFileName(),
-                            String.valueOf(document.getCreationTime().getTime()))));
+                        String.valueOf(document.getCreationTime().getTime()))), false);
-                }
+            }
+        }
+    }
     /**
         /*
          * If the default image is not present for this entity, copy the global
          * default image. TODO: This part will be moved to the Jython Script
          */
         File globalDefaultJPGFile = new File(globalDefaultImagePath);
-        File f3 = new File(defaultImagePath);
-        if (!f3.exists()) {
-            copyFile(globalDefaultJPGFile, new File(
+        copyFile(globalDefaultJPGFile, new File(defaultImagePath), false);
-                    defaultImagePath));
-        }
         File staticMediaDirectory = new File(Utils.EXPORT_MEDIA_STATIC_PATH + catalogId);
         if (!staticMediaDirectory.exists()) {
             staticMediaDirectory.mkdir();
+        }
          */
         long defaultImageCreationTime = EntityUtils.getCreationTimeFromSummarySlide(entity, "default");
         File newVersionedDefaultJPGFile = new File(staticMediaDirectory,
                 computeNewFileName(imagePrefix, DEFAULT_JPG, String.valueOf(defaultImageCreationTime)));
+        // This flag basically determines whether 'default' labelled image has changed or not
+        boolean existsNewVersionedDefaultJPGFile = newVersionedDefaultJPGFile.exists();
+        // If default images are not generated before, or default labelled images are absent, or the global
+        // image itself got changed, we need to copy these images.
-        if (defaultImageCreationTime == 0 && (!newVersionedDefaultJPGFile.exists() ||
+        if (defaultImageCreationTime == 0 && (!existsNewVersionedDefaultJPGFile ||
-            globalDefaultJPGFile.lastModified() > Long.parseLong(contentVersion)))
+                globalDefaultJPGFile.lastModified() > Long.parseLong(contentVersion)))
+        {
             copyFile(globalDefaultJPGFile,
-                     new File(websiteMediaDirectory, DEFAULT_JPG));
+                     new File(websiteMediaDirectory, DEFAULT_JPG), true);
             copyFile(globalDefaultJPGFile,
-                     newVersionedDefaultJPGFile);
+                     newVersionedDefaultJPGFile, false);
             copyFile(new File(imageDirPath + THUMBNAIL_JPG),
-                     new File(websiteMediaDirectory, THUMBNAIL_JPG));
+                     new File(websiteMediaDirectory, THUMBNAIL_JPG), true);
             copyFile(new File(imageDirPath + ICON_JPG),
-                     new File(websiteMediaDirectory, ICON_JPG));
+                     new File(websiteMediaDirectory, ICON_JPG), true);
             copyFile(new File(imageDirPath + THUMBNAIL_JPG),
                      new File(staticMediaDirectory, computeNewFileName(imagePrefix, THUMBNAIL_JPG,
-                             String.valueOf(defaultImageCreationTime))));
+                             String.valueOf(defaultImageCreationTime))), false);
             copyFile(new File(imageDirPath + ICON_JPG),
                      new File(staticMediaDirectory, computeNewFileName(imagePrefix, ICON_JPG,
-                             String.valueOf(defaultImageCreationTime))));
+                             String.valueOf(defaultImageCreationTime))), false);
             // FIXME This should be removed once we are ready with changes in ProductListGenerator.
             copyFile(new File(imageDirPath + ICON_JPG),
-                     new File(staticMediaDirectory, ICON_JPG));
+                     new File(staticMediaDirectory, ICON_JPG), true);
+        }
         /*
          * Copying the generated content from db/media to export/media. This
          * will also insert a creation timestamp tag in the file names.
          */
         for (ExpandedSlide expandedSlide : entity.getExpandedSlides()) {
-            FreeformContent freeFormContent = expandedSlide.getFreeformContent();
+            FreeformContent freeFormContent = expandedSlide
+                    .getFreeformContent();
             if (freeFormContent != null) {
                 for (String label : freeFormContent.getImageLabels()) {
                     final Media image = freeFormContent.getMedias().get(label);
                     if (isWebsiteImage(image)) {
+                        // In case, default.jpg is changed, icon.jpg and
+                        // thumbnail.jpg also need to be updated
+                        if (isDefaultImage(image)) {
-                        if (image.getCreationTime().getTime() > Long.valueOf(contentVersion)) {
+                                copyFile(new File(image.getLocation()),
-                            copyFile(new File(image.getLocation()), new File(websiteMediaDirectory, image.getFileName()));
+                                         new File(websiteMediaDirectory, image.getFileName()),
+                                        !existsNewVersionedDefaultJPGFile);
-                            // In case, default.jpg is changed, icon.jpg and thumbnail.jpg
-                            // also need to be updated
-                            if (isDefaultImage(image)) {
                                 /*
-                                 * Copy the thumbnail and the icon files. This is required so that we
+                                 * Copy the thumbnail and the icon files. This is
+                                 * required so that we can display the thumbnail on
-                                 * can display the thumbnail on the cart page and icon on the facebook.
+                                 * the cart page and icon on the facebook.
                                  */
                                 copyFile(new File(imageDirPath + THUMBNAIL_JPG),
-                                         new File(websiteMediaDirectory, THUMBNAIL_JPG));
+                                         new File(websiteMediaDirectory, THUMBNAIL_JPG),
+                                        !existsNewVersionedDefaultJPGFile);
                                 copyFile(new File(imageDirPath + ICON_JPG),
-                                         new File(websiteMediaDirectory, ICON_JPG));
+                                         new File(websiteMediaDirectory, ICON_JPG),
+                                        !existsNewVersionedDefaultJPGFile);
-                            }
+                        }
+                        else {
+                            copyFile(new File(image.getLocation()),
+                                     new File(websiteMediaDirectory, image.getFileName()),
+                                     false);
+                        }
+                    }
                     // Copying all files with timestamps in static directory
-                    if (image.getCreationTime().getTime() > Long.valueOf(contentVersion)) {
+                    copyFile(new File(image.getLocation()),
-                        removeFile(staticMediaDirectory, imagePrefix + HYPHON + image.getFileName().split(ESCAPED_DOT)[0]);
-                        copyFile(new File(image.getLocation()), new File(staticMediaDirectory, computeNewFileName(imagePrefix, image.getFileName(),
+                             new File(staticMediaDirectory, computeNewFileName(imagePrefix, image.getFileName(),
-                                String.valueOf(image.getCreationTime().getTime()))));
+                                    String.valueOf(image.getCreationTime().getTime()))), false);
-                        // If default image is changed icon and thumbnail images are re-copied in static directory
+                    // If default image is changed icon and thumbnail images are
-                        if (isDefaultImage(image)) {
+                    // re-copied in static directory
-                            removeFile(staticMediaDirectory, imagePrefix + HYPHON + THUMBNAIL_JPG.split(ESCAPED_DOT)[0]);
-                            removeFile(staticMediaDirectory, imagePrefix + HYPHON + ICON_JPG.split(ESCAPED_DOT)[0]);
+                    if (isDefaultImage(image)) {
-                            copyFile(new File(imageDirPath + THUMBNAIL_JPG),
+                        copyFile(new File(imageDirPath + THUMBNAIL_JPG),
-                                     new File(staticMediaDirectory, computeNewFileName(imagePrefix, THUMBNAIL_JPG,
+                                 new File(staticMediaDirectory,
-                                             String.valueOf(image.getCreationTime().getTime()))));
+                                         computeNewFileName(imagePrefix, THUMBNAIL_JPG, String.valueOf(image.getCreationTime().getTime()))), false);
-                            copyFile(new File(imageDirPath + ICON_JPG),
+                        copyFile(new File(imageDirPath + ICON_JPG),
-                                    new File(staticMediaDirectory, computeNewFileName(imagePrefix, ICON_JPG,
+                                 new File(staticMediaDirectory,
-                                            String.valueOf(image.getCreationTime().getTime()))));
+                                     computeNewFileName(imagePrefix, ICON_JPG, String.valueOf(image.getCreationTime().getTime()))), false);
+                        // FIXME This should be removed once we are ready with
-                            //FIXME This should be removed once we are ready with changes in ProductListGenerator.
+                        // changes in ProductListGenerator.
-                            copyFile(new File(imageDirPath + ICON_JPG),
+                        copyFile(new File(imageDirPath + ICON_JPG), new File(
-                                    new File(staticMediaDirectory, ICON_JPG));
+                                staticMediaDirectory, ICON_JPG), !existsNewVersionedDefaultJPGFile);
-                        }
+                    }
+                }
+            }
+        }
+    }
     /**
-     * Removes a file in a given directory with a given prefix.
-     * It removes only one file.
-     *
-     * @param staticMediaDirectory  the given directory from where file needs to be removed
-     * @param fileNamePrefix    the given prefix of file name that should be removed
-     */
-    private void removeFile(File staticMediaDirectory, final String fileNamePrefix) {
-        // Not removing files for now. As we can have files with same names
-        // and different labels.
-        return;
-//        // Deleting the file with same name
-//        File[] fileToBeDeleted = staticMediaDirectory.listFiles(new FilenameFilter() {
-//
-//            @Override
-//            public boolean accept(File dir, String name) {
-//                if (name.startsWith(fileNamePrefix)) {
-//                    return true;
-//                }
-//
-//                return false;
-//            }
-//        });
-//
-//        // Deleting only one file
-//        if (fileToBeDeleted.length != 0) {
-//            fileToBeDeleted[0].delete();
-//        }
-    }
-    /**
      * This method computes new name of a given file. It adds necessary prefix
      * and suffix to core file name separated by hyphons keeping extension intact.
      * e.g. computeNewFileName("pre", "file.txt", "post") would return "pre-file-post.txt"
+     *
      * @param fileNamePrefix    the string to be prefixed
     /**
      * Copies the contents of the source file into the destination file. Creates
      * the destination file if it doesn't exist already.
      */
-    private void copyFile(File sourceFile, File destFile) throws IOException {
+    private void copyFile(File sourceFile, File destFile, boolean overwrite) throws IOException {
         if (!destFile.exists()) {
-            log.info("File: " + destFile.getName());
-            log.info("File: " + destFile.getAbsolutePath());
+            log.info("Creating file: " + destFile.getAbsolutePath());
             destFile.createNewFile();
+        }
+        else {
+            // Return in case file should not be overwritten
+            if (!overwrite) {
+                log.info("Not overwriting file: " + destFile.getAbsolutePath());
+                return;
+            }
+            log.info("Overwriting file: " + destFile.getAbsolutePath());
+        }
         FileChannel source = null;
         FileChannel destination = null;
         try {

Subversion Repositories SmartDukaan

(root)/trunk/ContentStore/src/main/java/in/shop2020/ui/util/NewVUI.java – Rev 3945 → 3991