minor style changes and version bump

Author: HookedBehemoth

.gitignore

@@ -3,4 +3,4 @@ build/
 *.elf
 *.nacp
 *.nro
-.vscode
+.vscode

Makefile

@@ -38,14 +38,13 @@ include $(DEVKITPRO)/libnx/switch_rules
 #   NACP building is skipped as well.
 #---------------------------------------------------------------------------------
 APP_TITLE	:=	ShareNX
-APP_VERSION	:=	1.0.1
+APP_VERSION	:=	1.1.0
 
 TARGET		:=	ovlShareNX
 BUILD		:=	build
 SOURCES		:=	source
 DATA		:=	data
 INCLUDES	:=	libs/include
-APP_VERSION	:=	1.1.0
 
 ifeq ($(RELEASE),)
 	APP_VERSION	:=	$(APP_VERSION)-$(shell git describe --dirty --always)

source/gui_error.cpp

@@ -33,7 +33,7 @@ tsl::elm::Element *ErrorGui::createUI() {
     auto *custom = new tsl::elm::CustomDrawer([&](tsl::gfx::Renderer *drawer, u16 x, u16 y, u16 w, u16 h) {
         static s32 msg_width = 0;
         if (msg_width == 0) {
-            auto [width ,height] = drawer->drawString(this->m_msg, false, 0, 0, 25, tsl::style::color::ColorTransparent);
+            auto [width, height] = drawer->drawString(this->m_msg, false, 0, 0, 25, tsl::style::color::ColorTransparent);
             msg_width = width;
         }
         drawer->drawString("\uE150", false, x + ((w - 90) / 2), 300, 90, 0xffff);

source/gui_main.cpp

@@ -52,4 +52,3 @@ tsl::elm::Element *MainGui::createUI() {
 
     return rootFrame;
 }
-

source/image_item.hpp

@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2020 Behemoth
+ *
+ * This file is part of ShareNX.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 #pragma once
 
 #include <tesla.hpp>
@@ -51,7 +68,7 @@ class ImageItem : public tsl::elm::ListItem {
     }
 
   public:
-    void setUrl(const std::string& url) {
+    void setUrl(const std::string &url) {
         this->url = url;
     }
 };

source/upload.cpp

@@ -19,78 +19,79 @@
 
 #include <sys/select.h>
 #include <curl/curl.h>
+
 #include <tesla.hpp>
 
 namespace web {
 
-size_t StringWrite(const char *contents, size_t size, size_t nmemb, std::string *userp) {
-    userp->append(contents, size * nmemb);
-    return size * nmemb;
-}
-
-std::string UploadImage(const CapsAlbumFileId &fileId) {
-    u64 size = 0;
-    Result rc = capsaGetAlbumFileSize(&fileId, &size);
-    if (R_FAILED(rc))
-        return "can't get size";
-
-    void *imgBuffer = malloc(size);
-    if (!imgBuffer)
-        return "malloc failed";
-
-    u64 actualSize = 0;
-    rc = capsaLoadAlbumFile(&fileId, &actualSize, imgBuffer, size);
-    if (R_FAILED(rc)) {
-        free(imgBuffer);
-        return "failed to load img";
+    size_t StringWrite(const char *contents, size_t size, size_t nmemb, std::string *userp) {
+        userp->append(contents, size * nmemb);
+        return size * nmemb;
     }
 
-    CURL *curl = curl_easy_init();
-    if (!curl)
-        return "failed to start curl";
-
-    curl_mime *mime = curl_mime_init(curl);
-    curl_mimepart *file_part = curl_mime_addpart(mime);
-
-    curl_mime_filename(file_part, "switch.jpg");
-    curl_mime_name(file_part, "fileToUpload");
-    curl_mime_data(file_part, (const char *)imgBuffer, actualSize);
+    std::string UploadImage(const CapsAlbumFileId &fileId) {
+        u64 size = 0;
+        Result rc = capsaGetAlbumFileSize(&fileId, &size);
+        if (R_FAILED(rc))
+            return "can't get size";
+
+        void *imgBuffer = malloc(size);
+        if (!imgBuffer)
+            return "malloc failed";
+
+        u64 actualSize = 0;
+        rc = capsaLoadAlbumFile(&fileId, &actualSize, imgBuffer, size);
+        if (R_FAILED(rc)) {
+            free(imgBuffer);
+            return "failed to load img";
+        }
+
+        CURL *curl = curl_easy_init();
+        if (!curl)
+            return "failed to start curl";
+
+        curl_mime *mime = curl_mime_init(curl);
+        curl_mimepart *file_part = curl_mime_addpart(mime);
+
+        curl_mime_filename(file_part, "switch.jpg");
+        curl_mime_name(file_part, "fileToUpload");
+        curl_mime_data(file_part, (const char *)imgBuffer, actualSize);
+
+        curl_mimepart *part = curl_mime_addpart(mime);
+        curl_mime_name(part, "curl");
+        curl_mime_data(part, "1", CURL_ZERO_TERMINATED);
+
+        std::string urlresponse = std::string();
+
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, StringWrite);
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&urlresponse);
+        curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "POST");
+        curl_easy_setopt(curl, CURLOPT_MIMEPOST, mime);
+        curl_easy_setopt(curl, CURLOPT_URL, "https://lewd.pics/p/index.php");
+        curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
+
+        CURLcode res = CURLE_OK;
+        tsl::hlp::doWithSmSession([&] {
+            res = curl_easy_perform(curl);
+        });
+
+        long http_code = 0;
+        curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
+
+        if (res != CURLE_OK) {
+            urlresponse = "curl failed " + std::to_string(res);
+        } else if (http_code != 200) {
+            urlresponse = "failed with " + std::to_string(http_code);
+        } else if (urlresponse.size() > 0x30) {
+            urlresponse = "result too long";
+        }
 
-    curl_mimepart *part = curl_mime_addpart(mime);
-    curl_mime_name(part, "curl");
-    curl_mime_data(part, "1", CURL_ZERO_TERMINATED);
-
-    std::string urlresponse = std::string();
-
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, StringWrite);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&urlresponse);
-    curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "POST");
-    curl_easy_setopt(curl, CURLOPT_MIMEPOST, mime);
-    curl_easy_setopt(curl, CURLOPT_URL, "https://lewd.pics/p/index.php");
-    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
-
-    CURLcode res = CURLE_OK;
-    tsl::hlp::doWithSmSession([&]{
-        res = curl_easy_perform(curl);
-    });
+        free(imgBuffer);
 
-    long http_code = 0;
-    curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
+        curl_mime_free(mime);
+        curl_easy_cleanup(curl);
 
-    if (res != CURLE_OK) {
-        urlresponse = "curl failed " + std::to_string(res);
-    } else if (http_code != 200) {
-        urlresponse = "failed with " + std::to_string(http_code);
-    } else if (urlresponse.size() > 0x30) {
-        urlresponse = "result too long";
+        return urlresponse;
     }
 
-    free(imgBuffer);
-
-    curl_mime_free(mime);
-    curl_easy_cleanup(curl);
-
-    return urlresponse;
-}
-
 }

source/upload.hpp

@@ -17,9 +17,10 @@
  */
 #pragma once
 
-#include <string>
 #include <switch.h>
 
+#include <string>
+
 namespace web {
 
     std::string UploadImage(const CapsAlbumFileId &fileId);