From 7b5154ece89dda9591db22c4646369963e9bc3d7 Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Mon, 14 Mar 2016 12:01:21 +0200
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=B3=D1=80=D1=83=D0=B7=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=B0=D1=83=D0=B4=D0=B8=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/holdfast/samobot/IOUtil.java | 40 +++++++++++++++++++++-----------
 src/holdfast/samobot/VK.java     | 27 +++++++++++++++++++++
 2 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/src/holdfast/samobot/IOUtil.java b/src/holdfast/samobot/IOUtil.java
index ab420ed..7283b13 100644
--- a/src/holdfast/samobot/IOUtil.java
+++ b/src/holdfast/samobot/IOUtil.java
@@ -5,15 +5,16 @@ import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import javax.imageio.ImageIO;
-import javax.net.ssl.HttpsURLConnection;
 
 /**
  *
@@ -52,7 +53,11 @@ public final class IOUtil {
                 writer.write(params.getBytes());
                 writer.write( ("\r\n--" + boundary + "\r\n").getBytes() );
                 writer.write( ("Content-Disposition: form-data; name=\"file\"; filename=\"file." + ext + "\"\r\n").getBytes() );
-                writer.write( ("Content-Type: image/" + ext + "\r\n").getBytes());
+                if (ext.contains("mp3")) {
+                    writer.write( ("Content-Type: audio/mpeg\r\n").getBytes());
+                } else {
+                    writer.write( ("Content-Type: image/" + ext + "\r\n").getBytes());
+                }
                 writer.write("Content-Transfer-Encoding: binary\r\n\r\n".getBytes());
                 writer.write(data);
                 writer.write( ("\r\n--" + boundary + "--\r\n").getBytes() );
@@ -63,20 +68,29 @@ public final class IOUtil {
             return "";
         }
     }
+
+    public static byte[] getFile(String file) {
+        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+        try (InputStream is = new FileInputStream(file)) {
+            copy(is, bytes);
+        } catch (IOException ioe) { }
+        return bytes.toByteArray();
+    }
     
     public static byte[] download(String link) {
-        ByteArrayOutputStream uploadParams = new ByteArrayOutputStream();
-        try {
-            final URL url = new URL(link);
-            try (InputStream is = url.openStream()) {
-                byte[] byteChunk = new byte[4096];
-                int n;
-                while ((n = is.read(byteChunk)) > 0) {
-                    uploadParams.write(byteChunk, 0, n);
-                }
-            }
+        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+        try (InputStream is = new URL(link).openStream()) {
+            copy(is, bytes);
         } catch (IOException ioe) { }
-        return uploadParams.toByteArray();
+        return bytes.toByteArray();
+    }
+
+    public static void copy(InputStream is, OutputStream os) throws IOException {
+        byte[] byteChunk = new byte[4096];
+        int n;
+        while ((n = is.read(byteChunk)) > 0) {
+            os.write(byteChunk, 0, n);
+        }
     }
     
     public static BufferedImage downloadImage(String url) throws IOException {
diff --git a/src/holdfast/samobot/VK.java b/src/holdfast/samobot/VK.java
index 52f7c5a..8bfb0c8 100644
--- a/src/holdfast/samobot/VK.java
+++ b/src/holdfast/samobot/VK.java
@@ -1,6 +1,7 @@
 package holdfast.samobot;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -55,6 +56,10 @@ public class VK {
         return (new JSONObject(query("photos.getMessagesUploadServer", "v="+API_VERSION)).getJSONObject("response")).getString("upload_url");
     }
 
+    public static String getAudioUploadServer() {
+        return (new JSONObject(query("audio.getUploadServer", "v="+API_VERSION)).getJSONObject("response")).getString("upload_url");
+    }
+
     public static String getUnread(int pts) {
         String result = VK.query("messages.getLongPollHistory", "v="+API_VERSION+"&pts=" + pts);
         Log.queryln(" > get unread " + pts, Log.GREEN);
@@ -154,6 +159,28 @@ public class VK {
         StatisticsProcessor.updatePhotosUploadedCounter();
         return "photo" + photo.get("owner_id") + "_" + photo.get("pid");
     }
+
+    public static String uploadAudio(byte[] audioBytes) throws UnsupportedEncodingException {
+        String uploadServer = getAudioUploadServer();
+        Log.queryln(" > upload audio to " + uploadServer);
+
+        String uploadResultRaw = IOUtil.upload(uploadServer, "file=", audioBytes, "mp3");
+        Log.query(" < upload audio result: ");
+        Log.queryln(uploadResultRaw, Log.SMALL);
+        JSONObject uploadResult = new JSONObject(uploadResultRaw);
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("server=").append(URLEncoder.encode(uploadResult.get("server").toString(), "UTF-8"));
+        sb.append("&audio=").append(URLEncoder.encode(uploadResult.get("audio").toString(), "UTF-8"));
+        sb.append("&hash=").append(URLEncoder.encode(uploadResult.get("hash").toString(), "UTF-8"));
+        sb.append("&artist=").append(URLEncoder.encode("Леночка", "UTF-8"));
+
+        String audioRaw = VK.query("audio.save", sb.toString());
+        Log.query(" < saveAudio result: ");
+        Log.queryln(audioRaw, Log.SMALL);
+        JSONObject audio = new JSONObject(audioRaw).getJSONObject("response");
+        return "audio" + audio.get("owner_id") + "_" + audio.get("aid");
+    }
     
     private static String getExtension(String link) {
         if (link.endsWith(".png")) return "png";