diff --git a/db/pages.pk b/db/pages.pk new file mode 100644 index 0000000..d7909b4 Binary files /dev/null and b/db/pages.pk differ diff --git a/main.py b/main.py index f910e72..0008690 100644 --- a/main.py +++ b/main.py @@ -7,8 +7,13 @@ import extf def get_data(url): datas = {} - scraper = cfscrape.CloudflareScraper() - req = scraper.get(url) + try: + scraper = cfscrape.CloudflareScraper() + req = scraper.get(url) + datas["code"] = 1 + except: + datas["code"] = 0 + return datas soup = BeautifulSoup(req.text, 'lxml') datas["url"] = url datas["title"] = soup.find("title").text diff --git a/server.py b/server.py index 72bc57a..6ba0e0f 100644 --- a/server.py +++ b/server.py @@ -17,6 +17,7 @@ def add_page(): def add_page_r(): url = request.form['url'] datas = main.get_data(url) + del datas["code"] data = main.save_data(datas) html_page = open("templates/blanks.html", "r").read() if data["code"] == 0: @@ -30,15 +31,23 @@ def add_page_r(): @app.route('/add_pagem', methods=('GET', 'POST')) def add_pagem_r(): urls = request.form['url'] - datas = main.get_data(urls) - data = main.save_data(datas) + links = main.get_links(urls) + title = "Множественное добавление ссылок со страницы" + text = "Главная страница | Добавить страницу
" html_page = open("templates/blanks.html", "r").read() - if data["code"] == 0: - title = "Страница присутсвует в каталоге" - text = "Главная страница | Добавить страницу

" + data["uid"] + " - "+ data["data"]["title"] + "" + "

" - else: - title = "Страница добавлена в каталог" - text = "Главная страница | Добавить страницу

" + data["uid"] + " - "+ data["data"]["title"] + "" + "

" + for url in links: + datas = main.get_data(url) + if datas["code"] == 0: + pass + else: + del datas["code"] + data = main.save_data(datas) + if data["code"] == 0: + text_add = "

Присутвует: " + data["uid"] + " - "+ data["data"]["title"] + "


" + text += text_add + else: + text_add = "

Остсутвует: " + data["uid"] + " - "+ data["data"]["title"] + "


" + text += text_add return html_page.format(title=title, text=text) @app.route('/remove_page')