callsign and propagation

coulisse · Dec 2, 2023 · 2ef4896 · 2ef4896
1 parent b0d6b80
commit 2ef4896
Show file tree

Hide file tree

Showing 28 changed files with 2,187 additions and 387 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -24,5 +24,5 @@ keywords:
   - dxcluster
   - spiderweb
 license: GPL-3.0
-version: v2.4.5.72
-date-released: 2023-11-18
+version: v2.5
+date-released: 2023-12-02
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 [![CodeFactor](https://www.codefactor.io/repository/github/coulisse/spiderweb/badge)](https://www.codefactor.io/repository/github/coulisse/spiderweb)
 
 
-- **Release:** v2.4.5.72
+- **Release:** v2.5
 - **Author:** Corrado Gerbaldo - [IU1BOW](https://www.qrz.com/db/IU1BOW)
 - **Mail:** <[email protected]>
 - **Licensing:** Gpl V3.0 see [LICENSE](LICENSE) file.
@@ -27,6 +27,9 @@ For this application, I've used:
 - **flag-icon-css** [https://github.com/lipis/flag-icon-css](https://github.com/lipis/flag-icon-css) I used it to show the country flags 
 - **ng3k.com** [ng3k.com](http://ng3k.com/misc/adxo.html) I used to get information about "Announced Dx Operations". Thanks to Bill/NG3K !!!
 - **silso** [sidc.be/silso](https://sidc.be/silso/) used to show propagation trend in "Chart & stats" section
+- **hamqsl** [www.hamqsl.com/solar.html](https://www.hamqsl.com/solar.html/) used to show solar and band conditions
+- **kc2g** [prop.kc2g.com](https://prop.kc2g.com/) used to show MUF map
+
 
 You can find my web site at [https://www.iu1bow.it](https://www.i1bow.it)
 
@@ -221,11 +224,11 @@ This application is designed for desktop and mobile phone. It is a [PWA](https:/
 ### API
 **Spot list**
 
-You can retrieve last spots calling "**/spotlist**"; For example  [www.iu1bow.com/spotlist](https://www.iu1bow.com/spotlist)
+You can retrieve last spots calling "**/spotlist**"; For example  [www.iu1bow.it/spotlist](https://www.iu1bow.it/spotlist)
 
 **Country of a callsign**
 
-You can retrive some information about a callsign with **callsign**; for example:  [www.iu1bow.com/callsign?c=IU1BOW](https://www.iu1bow.com/callsign?c=IU1BOW)
+You can retrive some information about a callsign with **callsign**; for example:  [www.iu1bow.it/callsign?c=IU1BOW](https://www.iu1bow.it/callsign?c=IU1BOW)
 
 
 ### Development

diff --git a/cfg/config.json.template b/cfg/config.json.template
@@ -21,6 +21,7 @@
         "menu": {
           "menu_list": [
             {"label":"Charts & stats", "link": "/plots.html", "external": false},
+            {"label": "Propagation", "link": "/propagation.html", "external": false},              
             {"label":"Sources", "link": "https://github.com/coulisse/spiderweb/" , "external": true},    
             {"label":"Cookies", "link": "/cookies.html", "external": false},
             {"label":"Privacy", "link": "/privacy.html", "external": false}

diff --git a/cfg/modes.json b/cfg/modes.json
@@ -44,7 +44,7 @@
           "max": 50312.9
         },
         {
-          "min": 50314.0,
+          "min": 50313.1,
           "max": 50499.9
         },
         {
@@ -99,6 +99,7 @@
           "min": 47087000,
           "max": 47089000
         }
+
       ]
     },
     {
@@ -148,10 +149,6 @@
           "min": 28180.0,
           "max": 28180.0
         },
-        {
-          "min": 50313.0,
-          "max": 50313.9
-        },
         {
           "min": 50500.0,
           "max": 51000.0
@@ -199,6 +196,10 @@
         },
         {
           "min": 50100,
+          "max": 50312.9
+        },
+        {
+          "min": 50313.1,
           "max": 50500
         },
         {
@@ -250,6 +251,96 @@
           "max": 47089000
         }
       ]
+    },
+    {
+      "id": "digi-ft8",
+      "freq": [
+        {
+          "min": 1840.0,
+          "max": 1841.0
+        },
+        {
+          "min": 3573.0,
+          "max": 3574.0
+        },
+        {
+          "min": 7074.0,
+          "max": 7075.0
+        },
+        {
+          "min": 10136.0,
+          "max": 10137.0
+        },
+        {
+          "min": 14074.0,
+          "max": 14075.0
+        },
+        {
+          "min": 18100.0,
+          "max": 18101.0
+        },
+        {
+          "min": 21074.0,
+          "max": 21075.0
+        },
+        {
+          "min": 24915.0,
+          "max": 24916.0
+        },
+        {
+          "min": 28074.0,
+          "max": 28075.0
+        },
+        {
+          "min": 50313.0,
+          "max": 50314.0
+        }
+      ]
+    },
+    {
+      "id": "digi-ft4",
+      "freq": [
+        {
+          "min": 3568.0,
+          "max": 3569.0
+        },
+        {
+          "min": 3575.0,
+          "max": 3576.0
+        },
+        {
+          "min": 7047.5,
+          "max": 7048.5
+        },
+        {
+          "min": 10140.0,
+          "max": 10141.0
+        },
+        {
+          "min": 14080.0,
+          "max": 14081.0
+        },
+        {
+          "min": 18104.0,
+          "max": 18105.0
+        },
+        {
+          "min": 21140.0,
+          "max": 21141.0
+        },
+        {
+          "min": 24919.0,
+          "max": 24920.0
+        },
+        {
+          "min": 28180.0,
+          "max": 28181.0
+        },
+        {
+          "min": 50318.0,
+          "max": 50319.0
+        }
+      ]
     }
   ]
 }
diff --git a/cfg/version.txt b/cfg/version.txt
@@ -1 +1 @@
-v2.4.5.72
+v2.5
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,15 +1,20 @@
 ### Change log
-Date: 18/11/2023 
-Release: v2.4.5.72
-- security issue #46
+Date: 02/12/2023 
+Release: v2.5
+- security issue #46.
 - csp report
+- Added esclusion for FT4 and FT8. Thanks to HB9VVQ
+- Added filter on dx spot callsings. Thanks to HB9VVQ. Issue [#39](https://github.com/coulisse/spiderweb/issues/39).
+- Sanitized callsign input
+- Added propagation page with MUF Map. Issue [#27](https://github.com/coulisse/spiderweb/issues/27). Thanks to Paul Herman and Andrew Rodland 
+
 
 ___
 Date: 12/11/2023 
 Release: v2.4.5.1
 - managed telnet password
-- issue #34
-- issue #38
+- issue [#34](https://github.com/coulisse/spiderweb/issues/34)
+- issue [#38](https://github.com/coulisse/spiderweb/issues/38)
 
 ___
 Date: 11/11/2023 
@@ -33,7 +38,6 @@ Release: v2.4.4
 
 ___
 Date: 11/02/2023 
->>>>>>> staging
 Release: v2.4.2
 - changed cache-control header
 - fixed Layout scrolling (SEO)

diff --git a/lib/config.py b/lib/config.py
@@ -222,10 +222,6 @@ def menu_input_entry(entry, new_entry):
     while external != "y" and external != "n":
         external = str(user_input("open link external [y/n]: ")).lower()
 
-    #    if external == 'y':
-    #        external = True
-    #    else:
-    #        external = False
     external = is_external(external)
 
     entry["label"] = label

diff --git a/requirements.txt b/requirements.txt
@@ -25,4 +25,5 @@ tzdata==2023.3
 urllib3==2.0.7
 Werkzeug==3.0.1
 WTForms==3.1.1
+xmltodict==0.13.0
 xxhash==3.4.1
diff --git a/scripts/.gitignore b/scripts/.gitignore
@@ -0,0 +1 @@
+*report.html
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -138,7 +138,7 @@ if [ "$1" == "-r" ]; then
 	sed -i 's/mysql-connector-python==8.0.31/mysql-connector-python>=8.0.31/' ../requirements.txt
 	sed -i 's/mysql-connector-python==8.2.0/mysql-connector-python>=8.2.0/' ../requirements.txt
 
-	if ! sed -i '13,20s/level=DEBUG/level=INFO/g' ${app_ini}; then               
+	if ! sed -i '7,25s/level=DEBUG/level=INFO/g' ${app_ini}; then               
 		echo 'ERROR settimg loglevel=INFO '
 		exit 12
 	fi
@@ -148,7 +148,7 @@ if [ "$1" == "-d" ]; then
 	echo 'creating DEBUG application'
 	html_change_references -d
 
-	if ! sed -i '13,20s/level=INFO/level=DEBUG/g' ${app_ini}; then               
+	if ! sed -i '7,25s/level=INFO/level=DEBUG/g' ${app_ini}; then               
 		echo 'ERROR settimg loglevel=DEBUG '
 		exit 12
 	fi
@@ -169,12 +169,12 @@ echo 'get version from version.txt'
 #if ! ver=$(git tag|tail -1)
 if ! ver=$(head -1 ../cfg/version.txt)
 then
-	echo 'ERROR on get version from git'
+	echo 'ERROR on get version'
 	exit 10
 fi
 
 if [ ${ver} == "" ]; then
-	echo 'ERROR git version is empty'
+	echo 'ERROR version is empty'
 	exit 20
 fi
 echo 'version: '${ver}
@@ -275,6 +275,8 @@ if [ "$2" == "-c" ]; then
 	if [ "$1" == "-r" ]; then
 		echo '*** SPIDERWEB  commit process ***'
 
+		head -10 ../docs/CHANGELOG.md
+
 		read -p "Do you want to proceed to commit version ${ver} (yes/no) " yn
 
 		case $yn in