Merge branch 'master' of https://github.com/japanesemediamanager/jmms…

…erver
ShokoAnime · Dec 29, 2016 · a5a3445 · a5a3445
2 parents ac21262 + 1242b2e
commit a5a3445
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 2 deletions.
diff --git a/JMMServer/MainWindow.xaml b/JMMServer/MainWindow.xaml
@@ -404,8 +404,15 @@
                             </StackPanel>
                         </Button>
 
-
-
+                        <!-- Launch Web UI -->
+                        <Button Margin="2,10,2,2" Style="{DynamicResource FlatButtonStyle}" Name="btnLaunchWebUI"
+                                HorizontalAlignment="Left" IsEnabled="True" VerticalAlignment="Center">
+                            <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left">
+                                <TextBlock VerticalAlignment="Center"
+                                           Text="{Resx ResxName=JMMServer.Properties.Resources, Key=Settings_WebUI}"
+                                           Margin="0,0,5,0" />
+                            </StackPanel>
+                        </Button>
 
                     </StackPanel>
                 </TabItem>

diff --git a/JMMServer/MainWindow.xaml.cs b/JMMServer/MainWindow.xaml.cs
@@ -37,6 +37,7 @@
 using Microsoft.Win32.TaskScheduler;
 using Nancy.Hosting.Self;
 using Action = System.Action;
+using System.Net.NetworkInformation;
 
 namespace JMMServer
 {
@@ -253,6 +254,7 @@ public MainWindow()
             btnSyncTrakt.Click += new RoutedEventHandler(btnSyncTrakt_Click);
             btnImportManualLinks.Click += new RoutedEventHandler(btnImportManualLinks_Click);
             btnUpdateAniDBInfo.Click += new RoutedEventHandler(btnUpdateAniDBInfo_Click);
+            btnLaunchWebUI.Click += new RoutedEventHandler(btnLaunchWebUI_Click);
             btnUpdateImages.Click += new RoutedEventHandler(btnUpdateImages_Click);
             btnUploadAzureCache.Click += new RoutedEventHandler(btnUploadAzureCache_Click);
             btnUpdateTraktInfo.Click += BtnUpdateTraktInfo_Click;
@@ -2077,6 +2079,53 @@ private void CommandBinding_ScanFolder(object sender, ExecutedRoutedEventArgs e)
             }
         }
 
+        void btnLaunchWebUI_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                string IP = GetLocalIPv4(NetworkInterfaceType.Ethernet);
+                if (string.IsNullOrEmpty(IP))
+                    IP = "127.0.0.1";
+
+                string url = $"http://{IP}:{ServerSettings.JMMServerPort}";
+                Process.Start(url);
+            }
+            catch (Exception ex)
+            {
+                logger.Error(ex, ex.ToString());
+            }
+        }
+
+        internal static string GetLocalIPv4(NetworkInterfaceType _type)
+        {
+            string output = "";
+            foreach (NetworkInterface item in NetworkInterface.GetAllNetworkInterfaces())
+            {
+                if (item.NetworkInterfaceType == _type && item.OperationalStatus == OperationalStatus.Up)
+                {
+                    IPInterfaceProperties adapterProperties = item.GetIPProperties();
+
+                    if (adapterProperties.GatewayAddresses.FirstOrDefault() != null)
+                    {
+                        foreach (UnicastIPAddressInformation ip in adapterProperties.UnicastAddresses)
+                        {
+                            if (ip.Address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
+                            {
+                                output = ip.Address.ToString();
+                            }
+                        }
+                    }
+                }
+            }
+
+            return output;
+        }
+
+        private void MsgBox(Func<NetworkInterfaceType, string> getLocalIPv4)
+        {
+            throw new NotImplementedException();
+        }
+
         void btnUpdateAniDBInfo_Click(object sender, RoutedEventArgs e)
         {
             try

diff --git a/JMMServer/Properties/Resources.Designer.cs b/JMMServer/Properties/Resources.Designer.cs
diff --git a/JMMServer/Properties/Resources.de.resx b/JMMServer/Properties/Resources.de.resx
@@ -1183,4 +1183,7 @@ Du kannst nur einen Ordner aufgeführt als Drop-Ziel haben.</value>
   <data name="Update_Available" xml:space="preserve">
     <value>Update verfügbar für Shoko Server!</value>
   </data>
+  <data name="Settings_WebUI" xml:space="preserve">
+    <value>Starten Sie WebUI</value>
+  </data>
 </root>
diff --git a/JMMServer/Properties/Resources.en-GB.resx b/JMMServer/Properties/Resources.en-GB.resx
@@ -1183,4 +1183,7 @@ You can only have one folder listed as a Drop Destination.</value>
   <data name="Update_Available" xml:space="preserve">
     <value>Update Available For Shoko Server!</value>
   </data>
+  <data name="Settings_WebUI" xml:space="preserve">
+    <value>Launch WebUI</value>
+  </data>
 </root>
diff --git a/JMMServer/Properties/Resources.es.resx b/JMMServer/Properties/Resources.es.resx
@@ -1183,4 +1183,7 @@ Sólo puede tener una carpeta que aparece como un destino de la gota.</value>
   <data name="Update_Available" xml:space="preserve">
     <value>¡Actualización disponible para el servidor de Shoko!</value>
   </data>
+  <data name="Settings_WebUI" xml:space="preserve">
+    <value>Lanzamiento de WebUI</value>
+  </data>
 </root>
diff --git a/JMMServer/Properties/Resources.fr.resx b/JMMServer/Properties/Resources.fr.resx
@@ -1183,4 +1183,7 @@ Vous ne pouvez avoir qu'un seul dossier répertorié comme une Destination de Dr
   <data name="Update_Available" xml:space="preserve">
     <value>Mise à disposition pour serveur Shoko !</value>
   </data>
+  <data name="Settings_WebUI" xml:space="preserve">
+    <value>Lancer le WebUI</value>
+  </data>
 </root>
diff --git a/JMMServer/Properties/Resources.it.resx b/JMMServer/Properties/Resources.it.resx
@@ -1183,4 +1183,7 @@ Si può avere solo una cartella elencata come una destinazione di Drop.</value>
   <data name="Update_Available" xml:space="preserve">
     <value>Aggiornamento disponibile per Server di Shoko!</value>
   </data>
+  <data name="Settings_WebUI" xml:space="preserve">
+    <value>Lanciare la WebUI</value>
+  </data>
 </root>
diff --git a/JMMServer/Properties/Resources.nl.resx b/JMMServer/Properties/Resources.nl.resx
@@ -1183,4 +1183,7 @@ U kunt slechts één map vermeld als een Drop bestemming hebben.</value>
   <data name="Update_Available" xml:space="preserve">
     <value>Update beschikbaar voor Shoko Server!</value>
   </data>
+  <data name="Settings_WebUI" xml:space="preserve">
+    <value>Lancering WebUI</value>
+  </data>
 </root>
diff --git a/JMMServer/Properties/Resources.pl.resx b/JMMServer/Properties/Resources.pl.resx
@@ -1183,4 +1183,7 @@ Możesz skonfigurować tylko jeden folder docelowym.</value>
   <data name="Update_Available" xml:space="preserve">
     <value>Aktualizacja dla serwera Shoko!</value>
   </data>
+  <data name="Settings_WebUI" xml:space="preserve">
+    <value>Uruchom WebUI</value>
+  </data>
 </root>
diff --git a/JMMServer/Properties/Resources.pt.resx b/JMMServer/Properties/Resources.pt.resx
@@ -1183,4 +1183,7 @@
   <data name="Update_Available" xml:space="preserve">
     <value>Atualização disponível para o servidor de Shoko!</value>
   </data>
+  <data name="Settings_WebUI" xml:space="preserve">
+    <value>Lançar o WebUI</value>
+  </data>
 </root>
diff --git a/JMMServer/Properties/Resources.resx b/JMMServer/Properties/Resources.resx
@@ -1232,4 +1232,7 @@ You can only have one folder listed as a Drop Destination.</value>
   <data name="Update_Available" xml:space="preserve">
     <value>Update Available For Shoko Server!</value>
   </data>
+  <data name="Settings_WebUI" xml:space="preserve">
+    <value>Launch WebUI</value>
+  </data>
 </root>
diff --git a/JMMServer/Properties/Resources.ru.resx b/JMMServer/Properties/Resources.ru.resx
@@ -1183,4 +1183,7 @@
   <data name="Update_Available" xml:space="preserve">
     <value>Доступно обновление для сервера Сёко!</value>
   </data>
+  <data name="Settings_WebUI" xml:space="preserve">
+    <value>Запуск WebUI</value>
+  </data>
 </root>