From 28b513e1b234a9120dacb1de618e553abf2d8d5a Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Sat, 5 Aug 2023 12:03:17 +0200 Subject: [PATCH 01/12] add private method album --- lib/WPImport.py | 15 +++++++++++++-- lib/WPMenu.py | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/lib/WPImport.py b/lib/WPImport.py index 9f0767a..60d6980 100644 --- a/lib/WPImport.py +++ b/lib/WPImport.py @@ -55,7 +55,11 @@ class WPimport: if len(articlebody) > 0: self._addOrUpdatePost(soup) else: - self._addOrUpdateFeaturedMedia(soup) + albumbody = soup.find_all("div", class_="albumbody") + if len(albumbody) > 0: + self._addOrUpdateAlbum(soup) + else: + self._addOrUpdateFeaturedMedia(soup) del webpage_content[first][second][i] webpage_content = json.dumps(webpage_content) open("{0}/{1}.json".format(self._tmp, self._name), "wt").write(webpage_content) @@ -100,12 +104,19 @@ class WPimport: if len(articlebody) > 0: self._addOrUpdatePost(soup) else: - self._addOrUpdateFeaturedMedia(soup) + albumbody = soup.find_all("div", class_="albumbody") + if len(albumbody) > 0: + self._addOrUpdateAlbum(soup) + else: + self._addOrUpdateFeaturedMedia(soup) # Private method + def _addOrUpdateAlbum(self, soup): + self._logger.info("{0} : Add/Update Album".format(self._name)) + def _fromFileTmp(self): try: with open("{0}/{1}.json".format(self._tmp, self._name)) as file: diff --git a/lib/WPMenu.py b/lib/WPMenu.py index bcb34a2..1bddf6e 100644 --- a/lib/WPMenu.py +++ b/lib/WPMenu.py @@ -86,8 +86,8 @@ class WPMenu: idMenu = {"id":0, "type":"", "link":""} soup = BeautifulSoup(content, self._parser) articletitle = soup.find("h2", class_="articletitle").get_text() - if len(articletitle) > 0: - articletitle = soup.find("h2").get_text() + if len(articletitle) == 0: + articletitle = soup.find("div", class_="albumbody").find("h2").get_text() exist = False for index in range(1,10): if exist is False: From 9ed5ffe3993da7ca72dadf4d3524e689ee336fb7 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Sat, 5 Aug 2023 12:28:33 +0200 Subject: [PATCH 02/12] add variable --- lib/WPImport.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/WPImport.py b/lib/WPImport.py index 60d6980..70843f7 100644 --- a/lib/WPImport.py +++ b/lib/WPImport.py @@ -116,6 +116,10 @@ class WPimport: def _addOrUpdateAlbum(self, soup): self._logger.info("{0} : Add/Update Album".format(self._name)) + albumbody = soup.find("div", class_="albumbody") + albumtitle = albumbody.find("h2").get_text() + self._logger.debug("{0} : Title of the album : {1}".format(self._name, albumtitle)) + albumdesc = albumbody.find("div", class_="albumdesc").find("p") def _fromFileTmp(self): try: From e4eb1b6b68c7329da0d6df03f0c9b05b3e5b073a Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Sat, 5 Aug 2023 23:22:44 +0200 Subject: [PATCH 03/12] add image to media wordpress --- lib/WPImport.py | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/lib/WPImport.py b/lib/WPImport.py index 70843f7..3041514 100644 --- a/lib/WPImport.py +++ b/lib/WPImport.py @@ -120,6 +120,67 @@ class WPimport: albumtitle = albumbody.find("h2").get_text() self._logger.debug("{0} : Title of the album : {1}".format(self._name, albumtitle)) albumdesc = albumbody.find("div", class_="albumdesc").find("p") + img_a = albumbody.find_all("a", {"target": "_blank"}) + + if self._no_image is False: + for i in img_a: + new_img = {} + img = i.find_all("img") + self._logger.debug("{0} : Number of image's tag : {1}".format(self._name, len(img))) + if len(img) > 0: + href_a = i.get("href") + href_img = img[0].get("src") + href_a_o = urlparse(href_a) + href_img_o = urlparse(href_img) + new_img["old_src"]=href_img + new_img["old_href"]=href_a + try: + if len(href_img_o.netloc) > 0: + img_ok = False + page_img = self._request.get(href_img) + + if page_img.status_code == 404: + href_img = href_a + try: + page_img = self._request.get(href_a) + if page_img.status_code == 200: + img_ok = True + except ConnectionError as err: + self._logger.error("{0} : Connection error for get image : {1}".format(self._name, err)) + exit(1) + except Exception as err: + self._logger.error("{0} : Exception error for get image : {1}".format(self._name, err)) + exit(1) + + else: + if os.path.exists("{0}/..{1}".format(self._directory, href_img)): + page_img = open("{0}/..{1}".format(self._directory, href_img), "r") + img_ok = True + else: + if os.path.exists("{0}/..{1}".format(self._directory, href_a)): + page_img = open("{0}/..{1}".format(self._directory, href_a), "r") + img_ok = True + self._logger.debug("{0} : Status code for image {1} : {2}".format(self._name, href_img, page_img.status_code)) + if img_ok is True: + media=self._addOrUpdateMedia(href_img, page_img) + new_img["id"]=media["id"] + new_img["new_src"]=media["rendered"] + list_img.append(new_img) + if href_img != href_a: + media=self._addOrUpdateMedia(href_a, page_img) + new_img["id"]=media["id"] + new_img["new_src"]=media["rendered"] + list_img.append(new_img) + if page_img.status_code not in [200, 404]: + self._logger.error("{0} : Connection error with status code for get image : {1}".format(self._name, page_img.status_code)) + self._logger.debug("{0} : {1}".format(self._name, page_img.content)) + except ConnectionError as err: + self._logger.error("{0} : Connection error for get image : {1}".format(self._name, err)) + exit(1) + except Exception as err: + self._logger.error("{0} : Exception error for get image : {1}".format(self._name, err)) + exit(1) + def _fromFileTmp(self): try: From 5959ab5b2ee7aefddca1b159a1862ddd896fcf34 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Sat, 12 Aug 2023 00:06:09 +0200 Subject: [PATCH 04/12] add galery wip --- .gitignore | 1 + lib/WPImport.py | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/.gitignore b/.gitignore index f82fde7..c986d66 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ backup*/ wp-navigation *.log __pycache__/ +wp-gallery \ No newline at end of file diff --git a/lib/WPImport.py b/lib/WPImport.py index 3041514..16200e4 100644 --- a/lib/WPImport.py +++ b/lib/WPImport.py @@ -180,6 +180,14 @@ class WPimport: except Exception as err: self._logger.error("{0} : Exception error for get image : {1}".format(self._name, err)) exit(1) + content_html = "

{0}

\n\n".format(albumdesc) + + content_html = content_html + "
\"\"
\n\n".format(list_img[0]["id"],list_img[1]["new_src"]) + + for i in range(1, len(list_img)): + content_html = content_html + "
\"\"
\n\n".format(list_img[i]["id"],list_img[i]["new_src"]) + content_html = content_html + "" + def _fromFileTmp(self): From 418bea37783e51e99208d944541a8af39f748ff7 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Thu, 17 Aug 2023 00:18:45 +0200 Subject: [PATCH 05/12] add album test wip --- import_export_canalblog.py | 3 +- lib/WPImport.py | 100 ++++++++++++++----------------------- 2 files changed, 40 insertions(+), 63 deletions(-) diff --git a/import_export_canalblog.py b/import_export_canalblog.py index 4948b94..cb6ea4f 100644 --- a/import_export_canalblog.py +++ b/import_export_canalblog.py @@ -263,8 +263,9 @@ if __name__ == '__main__': for i in wordpress: importWp.setUrl(i) importWp.fromFile(files=args.file.split(",")) + exit(0) menuWp = WPMenu(name="Thread-1", basic=basic, wordpress=args.wordpress, logger=logger, parser=args.parser, ssl_canalblog=ssl_canalblog, ssl_wordpress=ssl_wordpress) - menuWp.fromFile("{0}/index.html".format(args.file.split(",")[0])) + menuWp.fromFile("{0}".format(args.file.split(",")[0])) if len(args.directory) > 0: try: with futures.ThreadPoolExecutor(max_workers=int(args.parallel)) as ex: diff --git a/lib/WPImport.py b/lib/WPImport.py index 16200e4..97397e1 100644 --- a/lib/WPImport.py +++ b/lib/WPImport.py @@ -120,73 +120,49 @@ class WPimport: albumtitle = albumbody.find("h2").get_text() self._logger.debug("{0} : Title of the album : {1}".format(self._name, albumtitle)) albumdesc = albumbody.find("div", class_="albumdesc").find("p") - img_a = albumbody.find_all("a", {"target": "_blank"}) - + img_a = albumbody.find_all("img") + list_img = [] if self._no_image is False: + self._logger.debug("{0} : Number of image's tag : {1}".format(self._name, len(img_a))) + for i in img_a: new_img = {} - img = i.find_all("img") - self._logger.debug("{0} : Number of image's tag : {1}".format(self._name, len(img))) - if len(img) > 0: - href_a = i.get("href") - href_img = img[0].get("src") - href_a_o = urlparse(href_a) - href_img_o = urlparse(href_img) - new_img["old_src"]=href_img - new_img["old_href"]=href_a - try: - if len(href_img_o.netloc) > 0: - img_ok = False - page_img = self._request.get(href_img) - - if page_img.status_code == 404: - href_img = href_a - try: - page_img = self._request.get(href_a) - if page_img.status_code == 200: - img_ok = True - except ConnectionError as err: - self._logger.error("{0} : Connection error for get image : {1}".format(self._name, err)) - exit(1) - except Exception as err: - self._logger.error("{0} : Exception error for get image : {1}".format(self._name, err)) - exit(1) - - else: - if os.path.exists("{0}/..{1}".format(self._directory, href_img)): - page_img = open("{0}/..{1}".format(self._directory, href_img), "r") - img_ok = True - else: - if os.path.exists("{0}/..{1}".format(self._directory, href_a)): - page_img = open("{0}/..{1}".format(self._directory, href_a), "r") - img_ok = True - self._logger.debug("{0} : Status code for image {1} : {2}".format(self._name, href_img, page_img.status_code)) - if img_ok is True: - media=self._addOrUpdateMedia(href_img, page_img) - new_img["id"]=media["id"] - new_img["new_src"]=media["rendered"] - list_img.append(new_img) - if href_img != href_a: - media=self._addOrUpdateMedia(href_a, page_img) - new_img["id"]=media["id"] - new_img["new_src"]=media["rendered"] - list_img.append(new_img) - if page_img.status_code not in [200, 404]: - self._logger.error("{0} : Connection error with status code for get image : {1}".format(self._name, page_img.status_code)) - self._logger.debug("{0} : {1}".format(self._name, page_img.content)) - except ConnectionError as err: - self._logger.error("{0} : Connection error for get image : {1}".format(self._name, err)) - exit(1) - except Exception as err: - self._logger.error("{0} : Exception error for get image : {1}".format(self._name, err)) - exit(1) - content_html = "

{0}

\n\n".format(albumdesc) + href_img = i.get("src") + href_img_o = urlparse(href_img) + new_img["old_src"]=href_img + try: + if len(href_img_o.netloc) > 0: + img_ok = False + page_img = self._request.get(href_img) + if page_img.status_code == 200: + img_ok = True + else: + if os.path.exists("{0}/..{1}".format(self._directory, href_img)): + page_img = open("{0}/..{1}".format(self._directory, href_img), "r") + img_ok = True + self._logger.debug("{0} : Status code for image {1} : {2}".format(self._name, href_img, page_img.status_code)) + if img_ok is True: + media=self._addOrUpdateMedia(href_img, page_img) + new_img["id"]=media["id"] + new_img["new_src"]=media["rendered"] + list_img.append(new_img) + except ConnectionError as err: + self._logger.error("{0} : Connection error for get image : {1}".format(self._name, err)) + exit(1) + except Exception as err: + self._logger.error("{0} : Exception error for get image : {1}".format(self._name, err)) + exit(1) + content_html = "" + if len(list_img) > 0: + content_html = "

{0}

\n\n".format(albumdesc) - content_html = content_html + "
\"\"
\n\n".format(list_img[0]["id"],list_img[1]["new_src"]) + content_html = content_html + "
\"\"
\n\n".format(list_img[0]["id"],list_img[1]["new_src"]) - for i in range(1, len(list_img)): - content_html = content_html + "
\"\"
\n\n".format(list_img[i]["id"],list_img[i]["new_src"]) - content_html = content_html + "" + for i in range(1, len(list_img)): + content_html = content_html + "
\"\"
\n\n".format(list_img[i]["id"],list_img[i]["new_src"]) + content_html = content_html + "" + + self._logger.info("{0} : content html : {1}".format(self._name, content_html)) From 9b58b45ae837c0734eb01aaf07172f6ff7398b8b Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Sun, 20 Aug 2023 21:41:16 +0200 Subject: [PATCH 06/12] replace string --- lib/WPImport.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/WPImport.py b/lib/WPImport.py index 97397e1..3163886 100644 --- a/lib/WPImport.py +++ b/lib/WPImport.py @@ -152,14 +152,16 @@ class WPimport: except Exception as err: self._logger.error("{0} : Exception error for get image : {1}".format(self._name, err)) exit(1) + self._logger.debug("{0} content img : {1}".format(self._name, list_img)) content_html = "" if len(list_img) > 0: content_html = "

{0}

\n\n".format(albumdesc) - content_html = content_html + "
\"\"
\n\n".format(list_img[0]["id"],list_img[1]["new_src"]) + + content_html = content_html + "
\n\n".replace("id-image", str(list_img[0]["id"])).replace("src-image", list_img[0]["new_src"]) for i in range(1, len(list_img)): - content_html = content_html + "
\"\"
\n\n".format(list_img[i]["id"],list_img[i]["new_src"]) + content_html = content_html + "
\"\"
\n\n".replace("id-image", str(list_img[0]["id"])).replace("src-image", list_img[0]["new_src"]) content_html = content_html + "" self._logger.info("{0} : content html : {1}".format(self._name, content_html)) From 50bf31d334db08a314ce15903c94db79191ea744 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Tue, 22 Aug 2023 00:21:14 +0200 Subject: [PATCH 07/12] HTTP Post for album --- lib/WPImport.py | 96 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/lib/WPImport.py b/lib/WPImport.py index 3163886..2f1dc61 100644 --- a/lib/WPImport.py +++ b/lib/WPImport.py @@ -122,6 +122,8 @@ class WPimport: albumdesc = albumbody.find("div", class_="albumdesc").find("p") img_a = albumbody.find_all("img") list_img = [] + page_is_exist = False + if self._no_image is False: self._logger.debug("{0} : Number of image's tag : {1}".format(self._name, len(img_a))) @@ -155,6 +157,7 @@ class WPimport: self._logger.debug("{0} content img : {1}".format(self._name, list_img)) content_html = "" if len(list_img) > 0: + content_html = "

{0}

\n\n".format(albumdesc) @@ -165,6 +168,99 @@ class WPimport: content_html = content_html + "" self._logger.info("{0} : content html : {1}".format(self._name, content_html)) + if len(content_html) > 0: + data = {"title":albumtitle, "content":content_html, "status":"publish"} + + for index in range(1,10): + params = {"search": albumtitle, "per_page":100, "page": index} + try: + self._logger.info("{0} : Search post with index {2} : {1}".format(self._name, albumtitle, index)) + page = self._request.get("{1}://{0}/wp-json/wp/v2/pages".format(self._wordpress, self._protocol), auth=self._basic, params=params, headers=self._headers_json) + if page.status_code == 200: + self._logger.debug("{0} : Encoding : {1}".format(self._name, page.encoding)) + page.encoding = "utf-8" + result = page.json() + if len(result) == 0: + break + self._logger.info("{0} : Number result posts : {1}".format(self._name, len(result))) + count = 0 + for i in result: + title_rendered = i["title"]["rendered"] + self._logger.info("{0} : Search title pages for |{2}| : |{1}|".format(self._name, title_rendered, albumtitle)) + if len(title_rendered) != len(albumtitle): + title_rendered = self._replaceCaracter(title_rendered) + self._logger.debug("{0} : Search title pages for |{2}| : |{1}|".format(self._name, title_rendered, albumtitle)) + self._logger.debug("{0} : SIze of title : {1} - {2}".format(self._name, len(albumtitle), len(title_rendered))) + if title_rendered == albumtitle: + if self._no_update is False: + page_is_exist = True + post_id = i["id"] + count = count + 1 + if count > 1: + self._logger.info("{0} : Page {1} is double and going to delete".format(self._name, albumtitle)) + try: + params = {"force":1} + page = self._request.delete("{2}://{0}/wp-json/wp/v2/pages/{1}".format(self._wordpress, post_id, self._protocol), auth=self._basic, headers=self._headers_json, params=params) + if page.status_code == 200: + self._logger.info("{0} : Page deleted : {1}".format(self._name, albumtitle)) + else: + self._logger.error("{0} : Page not updated due status code : {1}".format(self._name, page.status_code)) + self._logger.debug("{0} : {1}".format(self._name, page.content)) + except ConnectionError as err: + self._logger.error("{0} : Connection error for deleted page : {1}".format(self._name, err)) + exit(1) + except Exception as err: + self._logger.error("{0} : Exception error for deleted page : {1}".format(self._name, err)) + + else: + self._logger.debug("{0} : Data for page to update : {1}".format(self._name, i)) + self._logger.info("{0} : Page {1} already exist and going to update".format(self._name, albumtitle)) + + try: + page = self._request.post("{2}://{0}/wp-json/wp/v2/pages/{1}".format(self._wordpress, post_id, self._protocol), auth=self._basic, headers=self._headers_json, data=json.dumps(data)) + + if page.status_code == 200: + result = page.json() + self._logger.info("{0} : page updated : {1}".format(self._name, albumtitle)) + else: + self._logger.error("{0} : page not updated due status code : {1}".format(self._name, page.status_code)) + self._logger.debug("{0} : {1}".format(self._name, page.content)) + except ConnectionError as err: + self._logger.error("{0} : Connection error for update page : {1}".format(self._name, err)) + exit(1) + except Exception as err: + self._logger.error("{0} : Exception error for update page : {1}".format(self._name, err)) + if page.status_code == 400: + self._logger.error("{0} : Connection for update post unauthorized : {1}".format(self._name, page.status_code)) + self._logger.debug("{0} : {1}".format(self._name, page.content)) + break + else: + self._logger.error("{0} : Connection for update page error with status code : {1}".format(self._name, page.status_code)) + self._logger.debug("{0} : {1}".format(self._name, page.content)) + except ConnectionError as err: + self._logger.error("{0} : Connection error for search page : {1}".format(self._name, err)) + exit(1) + except Exception as err: + self._logger.error("{0} : Exception error for search page : {1}".format(self._name, err)) + + if page_is_exist is False and self._no_create is False: + try: + self._logger.info("{0} : Creating page : {1}".format(self._name, data["title"])) + page = self._request.post("{1}://{0}/wp-json/wp/v2/pages".format(self._wordpress, self._protocol), auth=self._basic, headers=self._headers_json, data=json.dumps(data)) + + if page.status_code == 201: + result = page.json() + self._logger.info("{0} : page added : {1}".format(self._name, result["title"]["raw"])) + + else: + self._logger.error("{0} : page not added due status code : {1}".format(self._name, r.status_code)) + self._logger.debug("{0} : {1}".format(self._name, r.content)) + except ConnectionError as err: + self._logger.error("{0} : Connection error for create page : {1}".format(self._name, err)) + exit(1) + except Exception as err: + self._logger.error("{0} : Exception error for create page : {1}".format(self._name, err)) + From d88ae7ed44a665b198d7d3af6ddc0f04feef261f Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Wed, 23 Aug 2023 22:48:38 +0200 Subject: [PATCH 08/12] add author --- import_export_canalblog.py | 19 ++++++++++--------- lib/WPImport.py | 13 ++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/import_export_canalblog.py b/import_export_canalblog.py index cb6ea4f..246953e 100644 --- a/import_export_canalblog.py +++ b/import_export_canalblog.py @@ -67,7 +67,7 @@ def download(name_thread, max_thread, url, logger, parser, directory, html, img, del exportWp -def importUrl(name_thread, max_thread, canalblog, logger, parser, wordpress, basic, serial, ssl_wordpress, ssl_canalblog, create, update, image, revert, tmp): +def importUrl(name_thread, max_thread, canalblog, logger, parser, wordpress, basic, serial, ssl_wordpress, ssl_canalblog, create, update, image, revert, tmp, author): canalblog = canalblog.split(",") wordpress = wordpress.split(",") name = "Thread-{0}".format(int(name_thread) + 1) @@ -88,7 +88,7 @@ def importUrl(name_thread, max_thread, canalblog, logger, parser, wordpress, bas exportWp.getUrlPage(name_thread, max_thread) del exportWp for j in wordpress: - importWp = WPimport(name=name, basic=basic, wordpress=j, logger=logger, parser=parser, ssl_wordpress=ssl_wordpress, no_create=create, no_update=update, no_image=image, tmp=tmp) + importWp = WPimport(name=name, basic=basic, wordpress=j, logger=logger, parser=parser, ssl_wordpress=ssl_wordpress, no_create=create, no_update=update, no_image=image, tmp=tmp, author=author) for k in ["article", "page"]: for l in ["publications", "principal"]: importWp.fromUrl(l, k) @@ -110,7 +110,7 @@ def importUrl(name_thread, max_thread, canalblog, logger, parser, wordpress, bas if not revert: exportWp.getUrlPage(name_thread, max_thread) del exportWp - importWp = WPimport(name=name, basic=basic, wordpress=wordpress[i], logger=logger, parser=parser, ssl_wordpress=ssl_wordpress, no_create=create, no_update=update, no_image=image, tmp=tmp) + importWp = WPimport(name=name, basic=basic, wordpress=wordpress[i], logger=logger, parser=parser, ssl_wordpress=ssl_wordpress, no_create=create, no_update=update, no_image=image, tmp=tmp, author=author) for k in ["article", "page"]: for l in ["publications", "principal"]: @@ -119,13 +119,13 @@ def importUrl(name_thread, max_thread, canalblog, logger, parser, wordpress, bas del importWp -def importDirectory(name_thread, max_thread, directory, logger, parser, wordpress, basic, serial, ssl_wordpress, create, update, image, revert): +def importDirectory(name_thread, max_thread, directory, logger, parser, wordpress, basic, serial, ssl_wordpress, create, update, image, revert, author): name = "Thread-{0}".format(int(name_thread) + 1) directory = directory.split(",") wordpress = wordpress.split(",") if serial is False: for i in wordpress: - importWp = WPimport(name=name, basic=basic, wordpress=i, logger=logger, parser=parser, ssl_wordpress=ssl_wordpress, no_create=create, no_update=update, no_image=image) + importWp = WPimport(name=name, basic=basic, wordpress=i, logger=logger, parser=parser, ssl_wordpress=ssl_wordpress, no_create=create, no_update=update, no_image=image, author=author) for j in directory: importWp.fromDirectory(j, name_thread, max_thread, revert) del importWp @@ -135,7 +135,7 @@ def importDirectory(name_thread, max_thread, directory, logger, parser, wordpres logger.error("{0} : Error : Number directory is different than wordpress".format(name)) exit(1) for i in range(0, len(wordpress)-1): - importWp = WPimport(name=name, basic=basic, wordpress=wordpress[i], logger=logger, parser=parser, ssl_wordpress=ssl_wordpress, no_create=create, no_update=update, no_image=image) + importWp = WPimport(name=name, basic=basic, wordpress=wordpress[i], logger=logger, parser=parser, ssl_wordpress=ssl_wordpress, no_create=create, no_update=update, no_image=image, author=author) importWp.fromDirectory(directory[i], name_thread, max_thread, revert) del importWp @@ -170,6 +170,7 @@ if __name__ == '__main__': import_parser.add_argument("--no-create", help="No create post", dest="create", default="store_false", action="store_true") import_parser.add_argument("--no-update", help="No update post", dest="update", default="store_false", action="store_true") import_parser.add_argument("--no-image", help="No image add or update", dest="image", default="store_false", action="store_true") + import_parser.add_argument("--author", help="Define author for page album", default="") @@ -264,7 +265,7 @@ if __name__ == '__main__': importWp.setUrl(i) importWp.fromFile(files=args.file.split(",")) exit(0) - menuWp = WPMenu(name="Thread-1", basic=basic, wordpress=args.wordpress, logger=logger, parser=args.parser, ssl_canalblog=ssl_canalblog, ssl_wordpress=ssl_wordpress) + menuWp = WPMenu(name="Thread-1", basic=basic, wordpress=args.wordpress, logger=logger, parser=args.parser, ssl_canalblog=ssl_canalblog, ssl_wordpress=ssl_wordpress, author=args.author) menuWp.fromFile("{0}".format(args.file.split(",")[0])) if len(args.directory) > 0: try: @@ -273,7 +274,7 @@ if __name__ == '__main__': wait(wait_for, return_when=ALL_COMPLETED) errorRevert(logger, args.revert, args.tmp) wait_for = [ - ex.submit(importDirectory, i, int(args.parallel), args.directory, logger, args.parser, args.wordpress, basic, args.serial, ssl_wordpress, args.create, args.update, args.image, args.revert) + ex.submit(importDirectory, i, int(args.parallel), args.directory, logger, args.parser, args.wordpress, basic, args.serial, ssl_wordpress, args.create, args.update, args.image, args.revert, args.author) for i in range(0, int(args.parallel)) ] wait(wait_for, return_when=ALL_COMPLETED) @@ -288,7 +289,7 @@ if __name__ == '__main__': wait(wait_for, return_when=ALL_COMPLETED) errorRevert(logger, args.revert, args.tmp) wait_for = [ - ex.submit(importUrl, i, int(args.parallel), args.canalblog, logger, args.parser, args.wordpress, basic, args.serial, ssl_wordpress, ssl_canalblog, args.create, args.update, args.image, args.revert, args.tmp) + ex.submit(importUrl, i, int(args.parallel), args.canalblog, logger, args.parser, args.wordpress, basic, args.serial, ssl_wordpress, ssl_canalblog, args.create, args.update, args.image, args.revert, args.tmp, args.author) for i in range(0, int(args.parallel)) ] wait(wait_for, return_when=ALL_COMPLETED) diff --git a/lib/WPImport.py b/lib/WPImport.py index 2f1dc61..36969d6 100644 --- a/lib/WPImport.py +++ b/lib/WPImport.py @@ -8,7 +8,7 @@ from requests.packages.urllib3.util.retry import Retry class WPimport: # Constructor - def __init__(self, name="Thread-0", basic=None, wordpress="", logger=None, parser="html.parser", ssl_wordpress=True, no_create=False, no_update=False, no_image=False, tmp="/tmp/import_export_canablog"): + def __init__(self, name="Thread-0", basic=None, wordpress="", logger=None, parser="html.parser", ssl_wordpress=True, no_create=False, no_update=False, no_image=False, tmp="/tmp/import_export_canablog", author=""): self._name = name self._basic = basic self._wordpress = wordpress @@ -29,6 +29,7 @@ class WPimport: self._no_update = no_update self._no_image = no_image self._tmp = tmp + self._author = author # Destructor def __del__(self): @@ -131,10 +132,10 @@ class WPimport: new_img = {} href_img = i.get("src") href_img_o = urlparse(href_img) - new_img["old_src"]=href_img try: if len(href_img_o.netloc) > 0: img_ok = False + href_img = href_img.replace("_q", "_o") page_img = self._request.get(href_img) if page_img.status_code == 200: img_ok = True @@ -158,14 +159,12 @@ class WPimport: content_html = "" if len(list_img) > 0: - content_html = "

{0}

\n\n".format(albumdesc) + content_html = "\n{0}\n\n\n".format(albumdesc) - content_html = content_html + "
\n\n".replace("id-image", str(list_img[0]["id"])).replace("src-image", list_img[0]["new_src"]) - for i in range(1, len(list_img)): - content_html = content_html + "
\"\"
\n\n".replace("id-image", str(list_img[0]["id"])).replace("src-image", list_img[0]["new_src"]) - content_html = content_html + "" + for i in range(0, len(list_img)): + content_html = content_html + "
\"\"
\n\n".replace("id-image", str(list_img[i]["id"])).replace("src-image", list_img[i]["new_src"]) self._logger.info("{0} : content html : {1}".format(self._name, content_html)) if len(content_html) > 0: From 9d41e57379636f4b72aa632a337807e019cce015 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Wed, 23 Aug 2023 23:35:35 +0200 Subject: [PATCH 09/12] add method getAuthor --- import_export_canalblog.py | 4 +-- lib/WPImport.py | 50 +++++++++++++++++++++++--------------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/import_export_canalblog.py b/import_export_canalblog.py index 246953e..1059440 100644 --- a/import_export_canalblog.py +++ b/import_export_canalblog.py @@ -259,13 +259,13 @@ if __name__ == '__main__': basic = HTTPBasicAuth(args.user, password) if args.command == "import": wordpress = args.wordpress.split(",") - importWp = WPimport(basic=basic, wordpress="", logger=logger, parser=args.parser, ssl_wordpress=ssl_wordpress) + importWp = WPimport(basic=basic, wordpress="", logger=logger, parser=args.parser, ssl_wordpress=ssl_wordpress, author=args.author) if len(args.file) > 0: for i in wordpress: importWp.setUrl(i) importWp.fromFile(files=args.file.split(",")) exit(0) - menuWp = WPMenu(name="Thread-1", basic=basic, wordpress=args.wordpress, logger=logger, parser=args.parser, ssl_canalblog=ssl_canalblog, ssl_wordpress=ssl_wordpress, author=args.author) + menuWp = WPMenu(name="Thread-1", basic=basic, wordpress=args.wordpress, logger=logger, parser=args.parser, ssl_canalblog=ssl_canalblog, ssl_wordpress=ssl_wordpress) menuWp.fromFile("{0}".format(args.file.split(",")[0])) if len(args.directory) > 0: try: diff --git a/lib/WPImport.py b/lib/WPImport.py index 36969d6..e28cf1a 100644 --- a/lib/WPImport.py +++ b/lib/WPImport.py @@ -115,6 +115,30 @@ class WPimport: # Private method + + def _getAuthor(self, author): + params = {"search":author, "per_page":100} + author = 0 + try: + self._logger.info("{0} : Search author : {1}".format(self._name, author)) + page = self._request.get("{1}://{0}/wp-json/wp/v2/users".format(self._wordpress, self._protocol), auth=self._basic, headers=self._headers_json, params=params) + self._logger.debug("{0} : End Search author : {1}".format(self._name, author)) + self._logger.debug("{0} : Debug requests : {1}".format(self._name, page.content)) + if page.status_code == 200: + self._logger.info("{0} : Get author : {1}".format(self._name, author)) + result = page.json() + for a in result: + author = a["id"] + else: + self._logger.error("{0} : Connection error with status code for get author : {1}".format(self._name, page.status_code)) + self._logger.debug("{0} : {1}".format(page.content)) + except ConnectionError as err: + self._logger.error("{0} : Connection error for get author : {1}".format(self._name, err)) + exit(1) + except Exception as err: + self._logger.error("{0} : Exception error for get author : {1}".format(self._name, err)) + return author + def _addOrUpdateAlbum(self, soup): self._logger.info("{0} : Add/Update Album".format(self._name)) albumbody = soup.find("div", class_="albumbody") @@ -169,7 +193,11 @@ class WPimport: self._logger.info("{0} : content html : {1}".format(self._name, content_html)) if len(content_html) > 0: data = {"title":albumtitle, "content":content_html, "status":"publish"} - + if len(self._author) > 0: + author = self._getAuthor(self._author) + if author != 0: + data = {"title":albumtitle, "content":content_html, "status":"publish", "author":author} + self._logger.debug("{0} : data for album page : {1}".format(self._name, data)) for index in range(1,10): params = {"search": albumtitle, "per_page":100, "page": index} try: @@ -800,25 +828,7 @@ class WPimport: data = {"title":title, "content":bodyhtml, "status":"publish", "date": "{0}-{1}-{2}T{3}:00".format(time[2],month[time[1]],time[0], hour), "tags": listelement["tags"], "categories": listelement["categories"]} self._logger.debug("{0} : Data for post : |{1}| : {2}" .format(self._name, title, data)) - params = {"search":author, "per_page":100} - try: - self._logger.info("{0} : Search author : {1}".format(self._name, author)) - page = self._request.get("{1}://{0}/wp-json/wp/v2/users".format(self._wordpress, self._protocol), auth=self._basic, headers=self._headers_json, params=params) - self._logger.debug("{0} : End Search author : {1}".format(self._name, author)) - self._logger.debug("{0} : Debug requests : {1}".format(self._name, page.content)) - if page.status_code == 200: - self._logger.info("{0} : Get author id : {1}".format(self._name, result)) - result = page.json() - for a in result: - data["author"] = a["id"] - else: - self._logger.error("{0} : Connection error with status code for get author : {1}".format(self._name, page.status_code)) - self._logger.debug("{0} : {1}".format(page.content)) - except ConnectionError as err: - self._logger.error("{0} : Connection error for get author : {1}".format(self._name, err)) - exit(1) - except Exception as err: - self._logger.error("{0} : Exception error for get author : {1}".format(self._name, err)) + data["author"] = self._getAuthor(author) page_is_exist = False for index in range(1,10): From d9c20cedcbbeddb71d61c8bad38f6a479fdd5606 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Thu, 24 Aug 2023 00:01:46 +0200 Subject: [PATCH 10/12] add menu --- lib/WPMenu.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/WPMenu.py b/lib/WPMenu.py index 1bddf6e..b7bdcdf 100644 --- a/lib/WPMenu.py +++ b/lib/WPMenu.py @@ -86,18 +86,21 @@ class WPMenu: idMenu = {"id":0, "type":"", "link":""} soup = BeautifulSoup(content, self._parser) articletitle = soup.find("h2", class_="articletitle").get_text() + search = "posts" if len(articletitle) == 0: articletitle = soup.find("div", class_="albumbody").find("h2").get_text() + search = "pages" + exist = False for index in range(1,10): if exist is False: params = {"search":articletitle, "per_page":100, "page":index} try: - self._logger.debug("{0} : Get Url for post : {1} {2}".format(self._name, "{1}://{0}/wp-json/wp/v2/posts".format(self._wordpress, self._protocol_wordpress), params)) - page = self._request_wordpress.get("{1}://{0}/wp-json/wp/v2/posts".format(self._wordpress, self._protocol_wordpress), auth=self._basic, params=params) + self._logger.debug("{0} : Get Url for {3} : {1} {2}".format(self._name, "{1}://{0}/wp-json/wp/v2/{2}".format(self._wordpress, self._protocol_wordpress, search), params, search)) + page = self._request_wordpress.get("{1}://{0}/wp-json/wp/v2/{2}".format(self._wordpress, self._protocol_wordpress, search), auth=self._basic, params=params) if page.status_code == 200: result = page.json() - self._logger.info("{0} : Get content post : {1}".format(self._name, len(result))) + self._logger.info("{0} : Get content {2} : {1}".format(self._name, len(result), search)) if len(result) > 0: for i in result: title_rendered = i["title"]["rendered"] @@ -105,7 +108,7 @@ class WPMenu: title_rendered = self._replaceCaracter(title_rendered) self._logger.debug("{0} : comparaison debug {1} {2}".format(self._name, articletitle, title_rendered)) if articletitle == title_rendered: - self._logger.debug("{0} : get post id : {1}".format(self._name, i)) + self._logger.debug("{0} : get {2} id : {1}".format(self._name, i, search)) idMenu = {"id":i["id"], "type":"post", "link": i["link"]} exist = True else: From 1fc9c48d2ce85c9e511d4e99ac1c0087f091e722 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Thu, 24 Aug 2023 22:43:15 +0200 Subject: [PATCH 11/12] fix add menu with album --- lib/WPMenu.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/WPMenu.py b/lib/WPMenu.py index b7bdcdf..4d868d1 100644 --- a/lib/WPMenu.py +++ b/lib/WPMenu.py @@ -85,11 +85,15 @@ class WPMenu: def _getIdfromTitlePost(self, content): idMenu = {"id":0, "type":"", "link":""} soup = BeautifulSoup(content, self._parser) - articletitle = soup.find("h2", class_="articletitle").get_text() + articletitle = soup.find_all("h2", class_="articletitle") + if len(articletitle) > 0: + articletitle = articletitle[0].get_text() search = "posts" + post_type = "post" if len(articletitle) == 0: articletitle = soup.find("div", class_="albumbody").find("h2").get_text() search = "pages" + post_type = "page" exist = False for index in range(1,10): @@ -109,7 +113,7 @@ class WPMenu: self._logger.debug("{0} : comparaison debug {1} {2}".format(self._name, articletitle, title_rendered)) if articletitle == title_rendered: self._logger.debug("{0} : get {2} id : {1}".format(self._name, i, search)) - idMenu = {"id":i["id"], "type":"post", "link": i["link"]} + idMenu = {"id":i["id"], "type":post_type, "link": i["link"]} exist = True else: self._logger.debug("{0} : {2} {1}".format(self._name, result, len(result))) @@ -159,13 +163,18 @@ class WPMenu: idMenu = {"id":0, "type":"", "link":""} if href != "#": title = href[::-1] + second_title = title.split("/")[2] + second_title = second_title[::-1] link = title.split("/")[0] link = link[::-1] title = title.split("/")[1] title = title[::-1] self._logger.info("{0} link {1} title {2}".format(self._name, link, title)) if link == "index.html": - idMenu = self._getId(title) + if second_title == "archives" or second_title == "albums": + idMenu = self._getIdFromPost(href) + else: + idMenu = self._getId(title) else: idMenu = self._getIdFromPost(href) From 6401692d0d62bc36632c61161de4bd61be606551 Mon Sep 17 00:00:00 2001 From: Valentin CZERYBA Date: Fri, 25 Aug 2023 23:46:43 +0200 Subject: [PATCH 12/12] finish menu with album import --- import_export_canalblog.py | 3 +-- lib/WPMenu.py | 10 ++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/import_export_canalblog.py b/import_export_canalblog.py index 1059440..78fdb0f 100644 --- a/import_export_canalblog.py +++ b/import_export_canalblog.py @@ -170,7 +170,7 @@ if __name__ == '__main__': import_parser.add_argument("--no-create", help="No create post", dest="create", default="store_false", action="store_true") import_parser.add_argument("--no-update", help="No update post", dest="update", default="store_false", action="store_true") import_parser.add_argument("--no-image", help="No image add or update", dest="image", default="store_false", action="store_true") - import_parser.add_argument("--author", help="Define author for page album", default="") + import_parser.add_argument("--author-album", dest=author, help="Define author for page album", default="") @@ -264,7 +264,6 @@ if __name__ == '__main__': for i in wordpress: importWp.setUrl(i) importWp.fromFile(files=args.file.split(",")) - exit(0) menuWp = WPMenu(name="Thread-1", basic=basic, wordpress=args.wordpress, logger=logger, parser=args.parser, ssl_canalblog=ssl_canalblog, ssl_wordpress=ssl_wordpress) menuWp.fromFile("{0}".format(args.file.split(",")[0])) if len(args.directory) > 0: diff --git a/lib/WPMenu.py b/lib/WPMenu.py index 4d868d1..bc7c8ea 100644 --- a/lib/WPMenu.py +++ b/lib/WPMenu.py @@ -91,9 +91,11 @@ class WPMenu: search = "posts" post_type = "post" if len(articletitle) == 0: - articletitle = soup.find("div", class_="albumbody").find("h2").get_text() - search = "pages" - post_type = "page" + articletitle = soup.find_all("div", class_="albumbody") + if len(articletitle) > 0: + articletitle = articletitle[0].find("h2").get_text() + search = "pages" + post_type = "page" exist = False for index in range(1,10): @@ -171,7 +173,7 @@ class WPMenu: title = title[::-1] self._logger.info("{0} link {1} title {2}".format(self._name, link, title)) if link == "index.html": - if second_title == "archives" or second_title == "albums": + if second_title == "albums": idMenu = self._getIdFromPost(href) else: idMenu = self._getId(title)