import_export_canalblog.py

@@ -8,29 +8,7 @@ from concurrent.futures import as_completed, wait
 import argparse, logging, threading
 from lib.WPImport import WPimport
 from lib.WPExport import WPExport
-from lib.WPRemove import WPRemove
 
-def remove(args, basic, logger):
-    removeWp = WPRemove(basic=basic, wordpress="", logger=logger)
-    if args.remove:
-        for i in args.wordpress.split(","):
-            removeWp.setUrl(i)
-            removeWp.cleanPosts()
-            removeWp.cleanTags()
-            removeWp.cleanCategories()
-            removeWp.cleanMedia()
-    else:
-        for i in args.wordpress.split(","):
-            removeWp.setUrl(i)
-            if args.posts:
-                removeWp.cleanPosts()
-            if args.categories:
-                removeWp.cleanCategories()
-            if args.tags:
-                removeWp.cleanTags()
-            if args.media:
-                removeWp.cleanMedia()
-    del removeWp
 
 
 def download(name_thread, max_thread, url, logger, parser, directory, html, img):
@@ -135,22 +113,7 @@ if __name__ == '__main__':
     import_parser.add_argument("--canalblog", help="URL Canalblog", default="")
     import_parser.add_argument("--wordpress", help="URL Wordpress", required=True)
     import_parser.add_argument("--serial", help="Serial execution", action="store_true")
-    import_parser.add_argument("--remove-all", dest="remove", help="Remove all", action="store_true")
+    import_parser.add_argument("--remove", help="Remove all articles", action="store_true")
-    remove_parser.add_argument("--remove-posts", help="Remove all posts", dest="posts", action="store_true")
-    remove_parser.add_argument("--remove-categories", help="Remove all categories", dest="categories", action="store_true")
-    remove_parser.add_argument("--remove-tags", help="Remove all tags", dest="tags", action="store_true")
-    remove_parser.add_argument("--remove-media", help="Remove all media", dest="media", action="store_true")
-
-
-    remove_parser = subparsers.add_parser("remove")
-    remove_parser.add_argument("--user", help="wordpress user", required=True)
-    remove_parser.add_argument("--password", help="password wordpress's user", default="")
-    remove_parser.add_argument("--wordpress", help="URL Wordpress", required=True)
-    remove_parser.add_argument("--all", dest="remove", help="Remove all (posts, media, tags, categories)", action="store_true")
-    remove_parser.add_argument("--posts", help="Remove all posts", action="store_true")
-    remove_parser.add_argument("--categories", help="Remove all categories", action="store_true")
-    remove_parser.add_argument("--tags", help="Remove all tags", action="store_true")
-    remove_parser.add_argument("--media", help="Remove all media", action="store_true")
 
 
 
@@ -209,7 +172,10 @@ if __name__ == '__main__':
                 importWp.setUrl(i)
                 importWp.fromFile(files=args.file.split(","))
         if len(args.directory) > 0:
-            remove(args, basic, logger)
+            if args.remove:
+                for i in args.wordpress.split(","):
+                    importWp.setUrl(i)
+                    importWp.removeAll()
             try:
                 with futures.ThreadPoolExecutor(max_workers=int(args.parallel)) as ex:
                     wait_for = [
@@ -219,7 +185,10 @@ if __name__ == '__main__':
             except Exception as err:
                 logger.error("Threading error : {0}".format(err))
         if len(args.canalblog) > 0:
-            remove(args, basic, logger)
+            if args.remove:
+                for i in args.wordpress.split(","):
+                    importWp.setUrl(i)
+                    importWp.removeAll()
             try:
                 with futures.ThreadPoolExecutor(max_workers=int(args.parallel)) as ex:
                     wait_for = [
@@ -262,15 +231,5 @@ if __name__ == '__main__':
                 except Exception as err:
                     logger.error("Threading error : {0}".format(err))
 
-
+                
-        if args.command == "remove":
-            password = args.password
-            if len(args.password) == 0:
-                password = getpass()
-                if len(password) == 0:
-                    logger.error("No password error !!! ")
-                    exit(1)
-
-            basic = HTTPBasicAuth(args.user, password)
-            remove(args, basic, logger) 
         exit(0)

lib/WPImport.py

@@ -86,6 +86,34 @@ class WPimport:
                     else:
                         self._addOrUpdateFeaturedMedia(soup)
     
+    def removeAll(self):
+        params = {"per_page":100}
+        try:
+            self._logger.info("{0} : List posts to remove for url : {1}".format(self._name, self._wordpress))
+            
+            r = self._request.get("http://{0}/wp-json/wp/v2/posts".format(self._wordpress), auth=self._basic, params=params, headers=self._headers_json)
+        except Exception as err:
+            self._logger.error("{0} : Connection error for list post to remove : {1}".format(self._name, err))
+        if r.status_code == 200:
+            result = r.json()
+            if len(result) > 0:
+                for i in result:
+                    self._logger.info("{0} : Remove article for url {1} : {2}".format(self._name, self._wordpress, i["title"]["rendered"]))
+                    params = {"force":1}
+                    try:
+                        r = self._request.delete("http://{0}/wp-json/wp/v2/posts/{1}".format(self._wordpress, i["id"]), auth=self._basic, headers=self._headers_json , params=params)
+                        if r.status_code == 200:
+                            self._logger.info("{0} : Post removed for URL {1} : {2}".format(self._name, self._wordpress, i["title"]["rendered"]))
+                        else:
+                            self._logger.error("{0} : Connection error for post {1} with status code {2}".format(self._name, self._wordpress, i["title"]["rendered"]))
+                    except Exception as err:
+                        self._logger.error("{0} : Connection error for post remove : {1}".format(self._name, err))
+                        exit(1)
+                self.removeAll()
+        else:
+            self._logger.error("{0} : Error for list to remove due status code {1}".format(self._name, r.status_code))
+            self._logger.debug("{0} : Content error : {1}".format(self._name, r.content))
+
     
     # Private method
 

lib/WPRemove.py

@@ -1,75 +0,0 @@
-#!/usr/bin/python3
-
-from bs4 import BeautifulSoup
-from urllib.parse import urlparse
-import requests, os, logging, re, json
-from requests.adapters import HTTPAdapter
-from requests.packages.urllib3.util.retry import Retry
-
-class WPRemove:
-    # Constructor
-    def __init__(self, name="Thread-0", basic=None, wordpress="", logger=None):
-        self._name = name
-        self._basic = basic
-        self._wordpress = wordpress
-        self._logger = logger
-        self._headers_json = {'Content-Type': 'application/json', 'Accept':'application/json'}
-
-        self._request = requests.Session()
-
-        retries = Retry(connect=10, read=10, redirect=5,
-                status_forcelist=[429, 500, 502, 503, 504], backoff_factor=2)
-
-        self._request.mount('http://', HTTPAdapter(max_retries=retries))
-
-    
-    # Destructor 
-    def __del__(self):
-        print("{0} : Import finished for {1}".format(self._name, self._wordpress))
-
-    # Public method
-
-    def setUrl(self, wordpress):
-        self._wordpress = wordpress
-    
-    def cleanPosts(self):
-        self._removeAll("posts")
-
-    def cleanTags(self):
-        self._removeAll("tags")
-
-    def cleanCategories(self):
-        self._removeAll("categories")
-    
-    def cleanMedia(self):
-        self._removeAll("media")
-
-    # Private method
-    
-    def _removeAll(self, composant):
-        params = {"per_page":100}
-        try:
-            self._logger.info("{0} : List {2} to remove for url : {1}".format(self._name, self._wordpress, composant))
-            
-            r = self._request.get("http://{0}/wp-json/wp/v2/{1}".format(self._wordpress, composant), auth=self._basic, params=params, headers=self._headers_json)
-        except Exception as err:
-            self._logger.error("{0} : Connection error for list {1} to remove : {2}".format(self._name, composant, err))
-        if r.status_code == 200:
-            result = r.json()
-            if len(result) > 0:
-                for i in result:
-                    self._logger.info("{0} : Remove {2} for url {1} : {3}".format(self._name, self._wordpress, composant, i["title"]["rendered"]))
-                    params = {"force":1}
-                    try:
-                        r = self._request.delete("http://{0}/wp-json/wp/v2/{1}/{2}".format(self._wordpress, composant, i["id"]), auth=self._basic, headers=self._headers_json , params=params)
-                        if r.status_code == 200:
-                            self._logger.info("{0} : Post removed for URL {1} {2} : {3}".format(self._name, self._wordpress, composant, i["title"]["rendered"]))
-                        else:
-                            self._logger.error("{0} : Connection error for post {1} {2} {3} with status code {4}".format(self._name, self._wordpress, composant, i["title"]["rendered"], r.status_code))
-                    except Exception as err:
-                        self._logger.error("{0} : Connection error for {1} remove : {2}".format(self._name, composant, err))
-                        exit(1)
-                self._removeAll(composant)
-        else:
-            self._logger.error("{0} : Error for list to remove {1} due status code {2}".format(self._name, composant, r.status_code))
-            self._logger.debug("{0} : Content error for {1} : {2}".format(self._name, composant, r.content))