Added check for wrong path, Google Drive warning in setup, added languages to build

Author: AlbertMN

AssistantComputerControl/AssistantComputerControl.csproj

@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{404B42F4-E135-4D2F-8FD0-20A590814930}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
+    <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AssistantComputerControl</RootNamespace>
     <AssemblyName>AssistantComputerControl</AssemblyName>
@@ -233,13 +233,21 @@
     <None Include="Translations\English.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Translations\Portuguese_-_Brasil.json" />
-    <None Include="Translations\Spanish.json" />
+    <None Include="Translations\Portuguese - Brasil.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Translations\Spanish.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Translations\Francais.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Translations\Italian.json" />
-    <None Include="Translations\Turkce.json" />
+    <None Include="Translations\Italian.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Translations\Turkce.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\logo_white.ico" />

AssistantComputerControl/GettingStarted.cs

@@ -43,6 +43,8 @@ public class WebBrowserHandler {
             private static string customSetPath = String.Empty;
 
             private bool CheckSetPath(string chosenService) {
+                bool t = false;
+
                 if (customSetPath != String.Empty) {
                     if (Directory.Exists(customSetPath)) {
                         if (!customSetPath.Contains("AssistantComputerControl") && !customSetPath.Contains("assistantcomputercontrol")) {
@@ -57,7 +59,7 @@ private bool CheckSetPath(string chosenService) {
                         Properties.Settings.Default.Save();
 
                         MainProgram.SetupListener();
-                        return true;
+                        t = true;
                     }
                 } else {
                     string checkPath = CloudServiceFunctions.GetCloudServicePath(chosenService);
@@ -76,11 +78,16 @@ private bool CheckSetPath(string chosenService) {
                             Properties.Settings.Default.Save();
 
                             MainProgram.SetupListener();
-                            return true;
+                            t = true;
                         }
                     }
                 }
-                return false;
+
+                if (Properties.Settings.Default.ActionFilePath == MainProgram.currentLocation) {
+                    MainProgram.DefaultPathIssue();
+                }
+
+                return t;
             }
 
             public void SetPath(string chosenService) {
@@ -565,7 +572,6 @@ private void pickFolderBtn_Click(object sender, EventArgs e) {
 
         private void expertDoneButton_Click(object sender, EventArgs e) {
             var theUrl = "https://assistantcomputercontrol.com/integrated_action_grid.php?lang=" + Properties.Settings.Default.ActiveLanguage + "&max_version_number=" + MainProgram.softwareVersion + "&cloud_service=none";
-            MainProgram.DoDebug(theUrl);
             theDoneActionViewBrowser.Url = new Uri(theUrl);
 
             thisForm.Size = new Size(thisForm.Size.Width, thisForm.Size.Height + 150);

AssistantComputerControl/MainProgram.cs

@@ -30,8 +30,7 @@ class MainProgram {
             releaseDate = "2020-12-12 14:55:00", //YYYY-MM-DD H:i:s - otherwise it gives an error
             appName = "AssistantComputerControl",
 
-            //sentryToken = "super_secret";
-            sentryToken = "https://[email protected]/1287269"; //Remove on git push
+            sentryToken = "super_secret";
 
         static public bool debug = true,
             unmuteVolumeChange = true,
@@ -720,6 +719,24 @@ private static bool PathIsFile(string path) {
             return string.IsNullOrWhiteSpace(Path.GetExtension(path));
         }
 
+        public static void DefaultPathIssue() {
+            //Path is program root - most likely an error, alert user
+            //new Thread(() => {
+            DialogResult dialogResult = MessageBox.Show("It seems the path to the cloud service wasn't set correctly. Choose \"Yes\" to go through the setup again. If this doesn't work, try restarting the ACC software.", "Whoops, problem!", MessageBoxButtons.YesNo);
+            if (dialogResult == DialogResult.Yes) {
+                Properties.Settings.Default.HasCompletedTutorial = false;
+                Properties.Settings.Default.ActionFilePath = "";
+                Properties.Settings.Default.Save();
+
+                if (gettingStarted != null) {
+                    gettingStarted.Close();
+                }
+
+                ShowGettingStarted();
+            }
+            //}).Start();
+        }
+
         public static string CheckPath() {
             string path = currentLocation;
 
@@ -730,7 +747,7 @@ public static string CheckPath() {
                 }
             } else {
                 if ((Properties.Settings.Default.HasCompletedTutorial && gettingStarted is null && !hasAskedForSetupAgain)) {
-                    //Dropbox not found & no custom filepath, go through setup again?
+                    //Cloud service path not found & no custom filepath, go through setup again?
                     hasAskedForSetupAgain = true;
                     var msgBox = MessageBox.Show(Translator.__("no_cloudservice_chosen", "general"), "[ERROR] No folder specified | AssistantComputerControl", MessageBoxButtons.YesNo);
                     if (msgBox == DialogResult.Yes) {
@@ -739,6 +756,11 @@ public static string CheckPath() {
                 }
             }
 
+            if (gettingStarted is null && path == currentLocation && !hasAskedForSetupAgain) {
+                hasAskedForSetupAgain = true;
+                DefaultPathIssue();
+            }
+
             return Path.HasExtension(path) ? Path.GetDirectoryName(path) : path;
         }
 

AssistantComputerControl/Translations/Danish.json

@@ -95,6 +95,7 @@
 
       "welcome_title": "Velkommen til AssistantComputerControl!",
       "welcome_description": "Dette software har brug for en cloud-service. Vi understøtter Dropbox, Google Drive og OneDrive.", //This should only be ONE line - no line breaks
+      "gdrive_warning": "<b class='text-danger'>Google Drive virker ikke særlig godt</b> og vil tit resultere i at ACC ikke virker. Hvis muligt; <b>brug Dropbox</b> eller OneDrive. Klik på checkbox'en hvis du vil fortsætte med Google Drive.",
       "click_me": "Klik på mig!",
       "recommended": "Anbefalet",
       "expert_setup_short_desc": "Vælg mig hvis du vil have frihed (brugerdefineret setup, ingen hjælp)",
@@ -166,6 +167,7 @@
       /* IFTTT specific */
       "set_up_ifttt_acc": "Set din IFTTT konto op",
       "set_up_ifttt_extra": "Med AssistantComputerControl's applets",
+      "ifttt_pro_disclaimer": "<code>IFTTT Pro</code> <b>er <u>ikke</u> påkrævet!</b></span>",
       "ifttt_join": "Lav en IFTTT konto",
       "ifttt_join_extra": "(det er smart at oprette dig med din Google konto hvis du bruger Google Assistant)",
       "ifttt_enable_shutdown_applet": "<b>Aktivér de applets du vil have.</b> Lad os starte med <code>shutdown</code> \"handlingen\" <i>(action</i>)<small>(som slukker din computer)</small>.",

AssistantComputerControl/Translations/English.json

@@ -97,6 +97,7 @@
 
       "welcome_title": "Welcome to AssistantComputerControl!",
       "welcome_description": "This software needs a cloud service to function. We natively support Dropbox, Google Drive and OneDrive.", //This should only be ONE line - no line breaks
+      "gdrive_warning": "<b class='text-danger'>Google Drive doesn't work very well</b> and will often result in ACC not working. If possible; <b>use Dropbox</b> or OneDrive. Click the checkbox if you wish to proceed anyways and try to get it working.",
       "click_me": "Click me!",
       "recommended": "Recommended",
       "expert_setup_short_desc": "Choose me if you want more freedom (custom setup, no help)",
@@ -168,6 +169,7 @@
       /* IFTTT specific */
       "set_up_ifttt_acc": "Set up your IFTTT account",
       "set_up_ifttt_extra": "With the AssistantComputerControl applets",
+      "ifttt_pro_disclaimer": "<code>IFTTT Pro</code> <b>is <u>not</u> required!</b></span>",
       "ifttt_join": "Sign up for IFTTT",
       "ifttt_join_extra": "(it's smart to sign up with your Google account if you're using Google Assistant)",
       "ifttt_enable_shutdown_applet": "<b>Enable the applets you want.</b> Let's start with the <code>shutdown</code> action <small>(which shuts down your computer)</small>.",

…ol/Translations/Portuguese_-_Brasil.json …ol/Translations/Portuguese - Brasil.jsonAssistantComputerControl/Translations/Portuguese_-_Brasil.json renamed to AssistantComputerControl/Translations/Portuguese - Brasil.json AssistantComputerControl/Translations/Portuguese_-_Brasil.json renamed to AssistantComputerControl/Translations/Portuguese - Brasil.json

@@ -25,6 +25,14 @@ <h2 data-translation-key="welcome_title">Welcome to AssistantComputerControl!</h
             <p data-translation-key="welcome_description">
                 This software needs a cloud service to function. We natively support Dropbox, Google Drive and OneDrive.
             </p>
+            
+            <label id="gdrive_warning" style="display:none;">
+                <input id="knows_gdrive_sucks" type="checkbox" />
+                <span data-translation-key="gdrive_warning">
+                    <b class="text-danger">Google Drive doesn't work very well</b> and will often result in ACC not working. If possible; <b>use Dropbox</b> or OneDrive.
+                    Click the checkbox if you wish to proceed anyways and try to get it working.
+                </span>
+            </label>
         </div>
 
         <div class="col-md-12">
@@ -203,6 +211,7 @@ <h3 style="margin-top:8px;">
                         <span data-translation-key="set_up_ifttt_acc">Set up your IFTTT account</span>
                         <br>
                         <small><i><span data-translation-key="set_up_ifttt_extra">With the AssistantComputerControl applets</span></i></small>
+                        <br /><small><span data-translation-key="ifttt_pro_disclaimer"><code>IFTTT Pro</code> <b>is <u>not</u> required!</b></span></small>
                     </h3>
 
                     <ol style="text-align:left;margin-left:20px;margin-right:20px;">
@@ -271,7 +280,6 @@ <h3 data-translation-key="time_to_try_heading"></h3>
                                 </div>
                                 <!-- END -->
 
-
                             </div>
                             <div class="col-8">
                                 <!-- "Waiting for an action..." -->
@@ -445,6 +453,8 @@ <h5 data-translation-key="problem_introduction_title">What's problem are you exp
                                         </li>
                                         <li data-translation-key="tbs_assistant_solution_three">
                                             <b>If you're using Alexa;</b> IFTTT requires you to say <i>Alexa, <b>trigger</b> x</i> before the actual trigger, and would always respond <i>"OK. Sending that to IFTTT.</i>
+                                            <br />
+                                            Furthermore, it often <b>only works with english commands</b>. This is a limitation Alexa has on IFTTT for some countries, sadly.
                                         </li>
                                         <li data-translation-key="tbs_assistant_solution_four">
                                             <b>If you're using Google Assistant;</b>
@@ -489,7 +499,9 @@ <h5 data-translation-key="problem_introduction_title">What's problem are you exp
                                     <p data-translation-key="tbs_still_not_resolved_desc">If all solutions above have failed, please refer to the <a target="_blank" href="https://acc.readme.io/docs/troubleshooting#section-still-not-solved-">troubleshooting guide</a> <i>(specifically the "Still not solved?" section)</i></p>
                                     <hr />
                                     <p data-translation-key="tbs_still_not_resolved_community_help">
-                                        If it's <b>still</b> not working, come join our <a href="https://discord.gg/B9YGPNF" target="_blank"><i>Discord server</i></a>. With over 550 members, you're sure to get help quickly <i>(and the developer often answers within a few hours)</i>
+                                        If it's <b>still</b> not working, come join our <a href="https://discord.gg/B9YGPNF" target="_blank"><i>Discord server</i></a>. With over 1000 members, you're sure to get help quickly <i>(and the developer often answers within a few hours)</i>.<br />
+                                        When joining, <b>make sure to read the rules and guidelines on how to help us help you</b> once you have gone through the troubleshooting guide. Ask for help in the <code>#help</code> channel.
+
                                         <br />
                                         In case you believe you have found a bug, you can open an <a target="_blank" href="https://github.com/AlbertMN/AssistantComputerControl/issues">issue on GitHub</a> and describe the issue.
                                     </p>

AssistantComputerControl/WebFiles/GettingStarted.html

@@ -208,6 +208,22 @@ $(".card.cloud_service_card").on("click", function () {
     } else {
         $("#multipleOneDrive").hide();
     }
+
+    if (chosenCloudServiceNum == "3") {
+        //Google Drive
+        $("#gdrive_warning").show();
+        $("#pick_btn").prop("disabled", true);
+    } else {
+        $("#gdrive_warning").hide();
+    }
+});
+
+$("#knows_gdrive_sucks").on("change", function () {
+    if ($(this).is(":checked")) {
+        $("#gdrive_warning").hide();
+        $("#pick_btn").prop("disabled", false);
+        $(this).prop("checked", false);
+    }
 });
 
 $("#pick_btn").on("click", function () {

AssistantComputerControl/WebFiles/assets/js/getting_started_scripts.js

@@ -158,3 +158,7 @@ C:\Users\almn\Dropbox\Programmering\C#\AssistantComputerControl\AssistantCompute
 C:\Users\alber\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\bin\Debug\Translations\Francais.json
 C:\Users\alber\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\bin\Debug\ExtraCleanupper.ps1
 C:\Users\almn\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\bin\Debug\ExtraCleanupper.ps1
+C:\Users\alber\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\bin\Debug\Translations\Spanish.json
+C:\Users\alber\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\bin\Debug\Translations\Italian.json
+C:\Users\alber\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\bin\Debug\Translations\Turkce.json
+C:\Users\alber\Dropbox\Programmering\C#\AssistantComputerControl\AssistantComputerControl\bin\Debug\Translations\Portuguese - Brasil.json