Code refactoring after #1099

.github/workflows/gh-pages.yml

@@ -4,9 +4,7 @@ name: Deploy static content to Pages
 on:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
-  push:
+
-    paths:
-      - 'website/icons/**'
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
   contents: read

website/icons/browserconfig.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-    <msapplication>
-        <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
-            <TileColor>#da532c</TileColor>
-        </tile>
-    </msapplication>
-</browserconfig>

website/icons/safari-pinned-tab.svg

@@ -1,27 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="363.000000pt" height="363.000000pt" viewBox="0 0 363.000000 363.000000"
- preserveAspectRatio="xMidYMid meet">
-<metadata>
-Created by potrace 1.14, written by Peter Selinger 2001-2017
-</metadata>
-<g transform="translate(0.000000,363.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M1315 3174 c-27 -2 -156 -8 -285 -14 -534 -25 -851 -92 -888 -187
--39 -100 -73 -303 -102 -608 -11 -121 -25 -249 -31 -285 -14 -87 -6 -466 14
--658 59 -566 92 -739 149 -787 80 -68 332 -118 723 -144 771 -53 1836 -30
-2271 49 206 37 293 74 318 135 45 106 97 485 127 920 5 83 13 172 16 200 3 27
-1 79 -5 115 -6 36 -16 146 -22 245 -18 300 -65 647 -105 782 -10 32 -26 61
--45 76 -80 68 -377 121 -830 148 -168 10 -1202 20 -1305 13z m735 -539 c188
--36 363 -108 532 -221 175 -117 383 -337 501 -531 l38 -62 -50 -80 c-163 -263
--401 -484 -660 -611 -121 -60 -218 -93 -351 -120 -92 -19 -127 -21 -285 -17
--185 5 -239 14 -405 69 -215 70 -457 236 -633 433 -94 106 -227 296 -227 325
-0 24 109 188 185 280 263 315 594 502 973 550 91 12 279 4 382 -15z"/>
-<path d="M1740 2309 c-81 -10 -164 -45 -228 -97 -94 -76 -131 -128 -168 -232
--29 -80 -32 -208 -8 -291 50 -170 182 -301 349 -345 64 -18 186 -18 250 0 160
-42 292 167 344 323 30 91 29 225 -4 317 -79 225 -291 354 -535 325z m484 -399
-c89 -78 26 -219 -93 -207 -85 9 -132 94 -96 171 34 72 128 90 189 36z"/>
-</g>
-</svg>

website/icons/site.webmanifest

@@ -1,19 +0,0 @@
-{
-    "name": "",
-    "short_name": "",
-    "icons": [
-        {
-            "src": "/android-chrome-192x192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-256x256.png",
-            "sizes": "256x256",
-            "type": "image/png"
-        }
-    ],
-    "theme_color": "#000000",
-    "background_color": "#000000",
-    "display": "standalone"
-}

website/manifest.json

@@ -0,0 +1,18 @@
+{
+  "name": "go2rtc",
+  "icons": [
+    {
+      "src": "https://alexxdev.duckdns.org/local/icons/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "https://alexxdev.duckdns.org/local/icons/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#000000"
+}

www/README.md

@@ -72,6 +72,22 @@ User-Agent: `Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/537.36 (KHTML, like Gec
 
 https://webrtc.org/getting-started/unified-plan-transition-guide?hl=en
 
+## Web Icons
+
+[Favicon checker](https://realfavicongenerator.net/), skip:
+
+- Windows 8 and 10 (`browserconfig.xml`)
+- Mac OS X El Capitan Safari
+
+```html
+    <!-- iOS Safari -->
+    <link rel="apple-touch-icon" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon-180x180.png" sizes="180x180">
+    <!-- Classic, desktop browsers -->
+    <link rel="icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
+    <!-- Android Chrome -->
+    <link rel="manifest" href="https://alexxit.github.io/go2rtc/manifest.json">
+```
+
 ## Useful links
 
 - https://www.webrtc-experiment.com/DetectRTC/

www/add.html

@@ -4,14 +4,6 @@
     <title>go2rtc - Add Stream</title>
     <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1, maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
     <style>
         body {
             margin: 0;

www/codecs.html

@@ -2,14 +2,6 @@
 <html lang="en">
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
     <title>go2rtc - WebRTC</title>
     <style>
         body {

www/editor.html

@@ -4,14 +4,6 @@
     <title>go2rtc - File Editor</title>
     <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1, maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
     <script src="https://unpkg.com/ace-builds@1.33.0/src-min/ace.js"></script>
     <style>
         body {

www/index.html

@@ -4,14 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1, maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
+    <link rel="apple-touch-icon" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon-180x180.png" sizes="180x180">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
+    <link rel="icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
+    <link rel="manifest" href="https://alexxit.github.io/go2rtc/manifest.json">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
     <title>go2rtc</title>
     <style>
         body {

www/links.html

@@ -4,14 +4,6 @@
     <title>go2rtc - links</title>
     <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1, maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
     <style>
 
         body {

www/log.html

@@ -4,14 +4,6 @@
     <title>go2rtc - Logs</title>
     <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1, maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
     <style>
         body {
             font-family: Arial, Helvetica, sans-serif;

www/stream.html

@@ -2,14 +2,9 @@
 <html lang="en">
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
+    <link rel="apple-touch-icon" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon-180x180.png" sizes="180x180">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
+    <link rel="icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
+    <link rel="manifest" href="https://alexxit.github.io/go2rtc/manifest.json">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
     <title>go2rtc - Stream</title>
     <style>
         body {

www/webrtc-sync.html

@@ -2,14 +2,6 @@
 <html lang="en">
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
     <title>go2rtc - WebRTC</title>
     <style>
         body {

www/webrtc.html

@@ -2,14 +2,6 @@
 <html lang="en">
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
     <title>go2rtc - WebRTC</title>
     <style>
         body {