Changeset 10749 for extensions/jiwigo-ws-api/src

Timestamp:

May 3, 2011, 8:25:38 PM (14 years ago)

Author:

mlg

Message:

Adds support for changing level on addSimple.

Location:

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo

Files:

• dao/ImageDao.java (modified) (2 diffs)
• dao/impl/ImageDaoImpl.java (modified) (4 diffs)
• service/ImageService.java (modified) (1 diff)
• service/impl/ImageServiceImpl.java (modified) (2 diffs)
• transverse/enumeration/MethodsEnum.java (modified) (1 diff)
• transverse/exception/JiwigoException.java (modified) (1 diff)
• transverse/util/Tools.java (modified) (2 diffs)

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/dao/ImageDao.java

@@ -70 +70 @@
     public List<Image> search(String searchString) throws JiwigoException;
 
+    //    /**
+    //     * Uses the pwg.images.addsimple web API to add a new picture
+    //     * http://piwigo.org/doc/doku.php?id=en:dev:webapi:pwg.images.addsimple
+    //     * 
+    //     * @param file
+    //     * @param category
+    //     * @param title
+    //     * @throws IOException
+    //     * @throws JiwigoException 
+    //     */
+    //    public void addSimple(File file, Integer category, String title) throws JiwigoException;
+
     /**
      * Uses the pwg.images.addsimple web API to add a new picture
@@ -77 +89 @@
      * @param category
      * @param title
+     * @param level
      * @throws IOException
      * @throws JiwigoException 
      */
-    public void addSimple(File file, Integer category, String title) throws JiwigoException;
+    public void addSimple(File file, Integer category, String title, Integer level) throws JiwigoException;
 
     /**

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/dao/impl/ImageDaoImpl.java

@@ -141 +141 @@
     public boolean create(Image image, Double chunkSize) throws FileAlreadyExistsException, IOException,
             ProxyAuthenticationException, NoSuchAlgorithmException, WrongChunkSizeException, JiwigoException {
+        if (exists(image)) {
+            throw new FileAlreadyExistsException("Photo already exists");
+        }
         //thumbnail converted to base64
         BASE64Encoder base64 = new BASE64Encoder();
@@ -196 +199 @@
         return reussite;
 
+    }
+
+    /**
+     * Function to test if a photo already exists
+     * @param image the image to test
+     * @return true if the photo exists
+     * @throws JiwigoException
+     */
+    private boolean exists(Image image) throws JiwigoException {
+        try {
+            String imageMD5 = Tools.getMD5Checksum(image.getOriginale().getAbsolutePath());
+            Document docResult = sessionManager.executeReturnDocument(MethodsEnum.IMAGE_EXIST.getLabel(),
+                    "md5sum_list", imageMD5);
+            String result = Tools.getStringValueDom(docResult.getDocumentElement(), imageMD5);
+
+            if (result != null && !"".equals(result)) {
+                return true;
+            } else {
+                return false;
+            }
+        } catch (NoSuchAlgorithmException e) {
+            throw new JiwigoException(e);
+        } catch (IOException e) {
+            throw new JiwigoException(e);
+        }
     }
 
@@ -279 +307 @@
     }
 
-    public void addSimple(File file, Integer category, String title) throws JiwigoException {
+    public void addSimple(File file, Integer category, String title, Integer level) throws JiwigoException {
         HttpPost httpMethod = new HttpPost(((SessionManagerImpl) sessionManager).getUrl());
 
@@ -299 +327 @@
                 multipartEntity.addPart("category", new StringBody(category.toString()));
                 multipartEntity.addPart("name", new StringBody(title));
+                if (level != null) {
+                    multipartEntity.addPart("level", new StringBody(level.toString()));
+                }
             } catch (UnsupportedEncodingException e) {
                 throw new JiwigoException(e);

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/service/ImageService.java

@@ -74 +74 @@
 
     /**
+     * Uses the pwg.images.addsimple web API to add a new picture
+     * http://piwigo.org/doc/doku.php?id=en:dev:webapi:pwg.images.addsimple
+     * 
+     * @param file
+     * @param category
+     * @param title
+     * @param level
+     * @throws IOException
+     * @throws JiwigoException 
+     */
+    public void addSimple(File file, Integer category, String title, Integer level) throws JiwigoException;
+
+    /**
      * Deletes an image
      * @param image the image to delete

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/service/impl/ImageServiceImpl.java

@@ -146 +146 @@
 
     public void addSimple(File file, Integer category, String title) throws JiwigoException {
-        dao.addSimple(file, category, title);
+        dao.addSimple(file, category, title, null);
 
     }
@@ -167 +167 @@
     }
 
+    @Override
+    public void addSimple(File file, Integer category, String title, Integer level) throws JiwigoException {
+        dao.addSimple(file, category, title, level);
+    }
+
 }

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/transverse/enumeration/MethodsEnum.java

@@ -28 +28 @@
             "pwg.images.setInfo"), SEARCH("pwg.images.search"), SET_PRIVACY_LEVEL("pwg.images.setPrivacyLevel"), ADD_SIMPLE(
             "pwg.images.addSimple"), ADD_IMAGE("pwg.images.add"), ADD_CHUNK("pwg.images.addChunk"), DELETE_CATEGORY(
-            "pwg.categories.delete"), DELETE_IMAGE("pwg.images.delete"), SESSION_STATUS("pwg.session.getStatus");
+            "pwg.categories.delete"), DELETE_IMAGE("pwg.images.delete"), SESSION_STATUS("pwg.session.getStatus"), IMAGE_EXIST(
+            "pwg.images.exist");
 
     protected String label;

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/transverse/exception/JiwigoException.java

@@ -13 +13 @@
     }
 
+    public JiwigoException(String msg, Throwable t) {
+        super(msg, t);
+    }
+
 }

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/transverse/util/Tools.java

@@ -366 +366 @@
     public static void setStringValueDom(Element element, String tagName, String value) {
         Element el = (Element) element.getElementsByTagName(tagName).item(0);
-        el.setNodeValue(value);
+        el.setTextContent(value);
     }
 
@@ -387 +387 @@
         }
     }
+    //
+    //    /**
+    //     * Function used to get the md5 sum of a file
+    //     * @param fileToTest the file 
+    //     * @return the md5 sum
+    //     * @throws NoSuchAlgorithmException
+    //     * @throws FileNotFoundException
+    //     * @throws JiwigoException 
+    //     */
+    //    public static String getMD5Sum(File file) throws NoSuchAlgorithmException, JiwigoException, FileNotFoundException {
+    //  MessageDigest digest = MessageDigest.getInstance("MD5");
+    //  InputStream is = new FileInputStream(file);
+    //  byte[] buffer = new byte[8192];
+    //  int read = 0;
+    //  try {
+    //      while ((read = is.read(buffer)) > 0) {
+    //          digest.update(buffer, 0, read);
+    //      }
+    //      byte[] md5sum = digest.digest();
+    //      BigInteger bigInt = new BigInteger(1, md5sum);
+    //      String output = bigInt.toString(16);
+    //      return output;
+    //  } catch (IOException e) {
+    //      throw new JiwigoException("Unable to process file for MD5", e);
+    //  } finally {
+    //      try {
+    //          is.close();
+    //      } catch (IOException e) {
+    //          throw new JiwigoException("Unable to close input stream for MD5 calculation", e);
+    //      }
+    //  }
+    //    }
+
 }