Обновил readme

.gitattributes

@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+
+*               text=auto eol=lf

.github/workflows/github-push-docker.yml

@@ -0,0 +1,41 @@
+name: Create and publish a Docker image
+
+on:
+  push:
+    branches: ['main']
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -0,0 +1,17 @@
+FROM python:3.11.2-alpine3.17
+
+LABEL Maintainer="serega404"
+
+WORKDIR /app
+
+COPY requirements.txt requirements.txt
+RUN pip3 install -r requirements.txt
+
+# Setting up crontab
+COPY crontab /tmp/crontab
+RUN cat /tmp/crontab > /etc/crontabs/root
+
+COPY main.py main.py
+
+# run crond as main process of container
+CMD ["crond", "-f", "-l", "2"]

README.md

@@ -1,6 +1,6 @@
 # MetricAliexpressExchangeRate
 
-[![MIT License](https://img.shields.io/github/license/serega404/EasyESPRealy)](https://github.com/serega404/MetricAliexpressExchangeRate)
+[![MIT License](https://img.shields.io/github/license/serega404/MetricAliexpressExchangeRate)](https://github.com/serega404/MetricAliexpressExchangeRate/blob/main/LICENSE)
 
 Экспортер курса Aliexpress и ЦБ РФ
 
@@ -20,8 +20,22 @@
 
 <img src="./grafana.png" width="400" height="300" />
 
+### Запуск в Docker
+
+``` Docker
+docker run -d --name MetricAliexpressExchangeRate \
+    --restart=always \
+    -e METRIC_SERVER_URL='http(s)://<IP_ADDR>:<PORT>/' \
+    ghcr.io/serega404/metricaliexpressexchangerate:main
+```
+
+#### Дополнительные переменные среды:
+* `CBRF_APISITE_URL`
+* `ALI1USD_PAGE_URL`
+
 ### Библиотеки
 
+* [Requests](https://requests.readthedocs.io/en/latest/)
 * [BeautifulSoup](https://www.crummy.com/software/BeautifulSoup/)
 
 ### Лицензия

crontab

@@ -0,0 +1,2 @@
+@reboot cd /app && python3 /app/main.py 
+*/10 * * * *  cd /app && python3 /app/main.py 

main.py

@@ -1,11 +1,11 @@
-import requests, re, json
+import requests, re, json, os
 from bs4 import BeautifulSoup
 
 # Config
 
-Ali1USDPageURL = 'https://aliexpress.ru/item/32892046259.html'
+Ali1USDPageURL = os.environ.get('ALI1USD_PAGE_URL', 'https://aliexpress.ru/item/32892046259.html')
-CBRFApiSiteURL = 'https://www.cbr-xml-daily.ru/daily_json.js'
+CBRFApiSiteURL = os.environ.get('CBRF_APISITE_URL', 'https://www.cbr-xml-daily.ru/daily_json.js')
-MetricServerURL = 'http://192.168.0.100:8428/'
+MetricServerURL = os.environ.get('METRIC_SERVER_URL', 'http://192.168.0.100:8428/')
 
 KursAli = ""
 KursCBRF = ""
@@ -18,11 +18,16 @@ if (site.status_code != 200):
     print("Ali request error: " + str(site.status_code))
     exit()
 
-soup = BeautifulSoup(site.text, "html.parser")
+soup = BeautifulSoup(site.content, "html.parser")
 
-for tag in soup.find_all("span", class_="product-price-current"):
+tmpstring = " "*20
-    KursAli = (''.join(x for x in tag.text if (x.isdigit() or x == ','))).replace(',','.')
+for tag in soup.find_all("div"):
+    if "руб." in tag.text:
+        if len(tmpstring) > len(tag.text):
+            tmpstring = tag.text
 
+print(tmpstring)
+KursAli = (''.join(x for x in tmpstring if (x.isdigit() or x == ','))).replace(',','.')
 print("Курс Ali: " + KursAli)
 
 # ЦБ РФ
@@ -36,6 +41,8 @@ if (site.status_code != 200):
 KursCBRF = str(json.loads(site.text)["Valute"]["USD"]["Value"])
 print("Курс ЦБ РФ: " + KursCBRF)
 
+print("Разница Ali и CBRF", round(max(float(KursAli), float(KursCBRF)) - min(float(KursAli), float(KursCBRF)), 2))
+
 # Send metrics ↓
 
 url = MetricServerURL + 'api/v1/import/csv?format=1:label:source,2:metric:exchange_usd_rub'
@@ -53,3 +60,10 @@ if KursAli != '':
         print("Не удалось отправить метрику: " + str(x.status_code))
 else:
     print("Курс Али пуст")
+
+if KursCBRF != '' and KursAli != '':
+    x = requests.post(url, "Diff Ali CBRF," + str(round(max(float(KursAli), float(KursCBRF)) - min(float(KursAli), float(KursCBRF)), 2)))
+    if (x.status_code != 200 and x.status_code != 204):
+        print("Не удалось отправить метрику: " + str(x.status_code))
+else:
+    print("Один из курсов пуст")

requirements.txt

@@ -0,0 +1,2 @@
+requests
+beautifulsoup4