Merge pull request 'directory-file' (#21) from directory-file into master

Reviewed-on: #21

import_export_canalblog.py

@@ -11,9 +11,21 @@ from lib.WPExport import WPExport
 from lib.WPRemove import WPRemove
 from lib.WPChange import WPChange
 
-def change(index, number, args, logger):
+def errorRevert(logger, revert, tmp):
-    changeWp = WPChange(logger=logger, index_name=index, number_thread=number)
+    if revert is True:
-    changeWp.fromDirectory(args.directory)
+        files_tmp = glob.glob("{0}/*.json".format(tmp))
+        if len(files_tmp) == 0:
+            logger.error("Error revert, because files not found")
+            exit(1)
+        if len(files_tmp) != int(args.parallel):
+            for file_r in files_tmp:
+                os.remove(file_r)
+            logger.error("Error revert, because number files tmp is incompatible with parallel number")
+            exit(1)
+
+def change(index, number, args, logger, tmp, revert):
+    changeWp = WPChange(logger=logger, index_name=index, number_thread=number, tmp=tmp)
+    changeWp.fromDirectory(args.directory, revert)
 
     del changeWp
 
@@ -54,7 +66,6 @@ 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):
     canalblog = canalblog.split(",")
     wordpress = wordpress.split(",")
@@ -107,30 +118,29 @@ 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, tmp, revert):
+def importDirectory(name_thread, max_thread, directory, logger, parser, wordpress, basic, serial, ssl_wordpress, create, update, image, revert):
     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, tmp=tmp, revert=revert)
+            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)
             for j in directory:
-                importWp.fromDirectory(j, name_thread, max_thread)
+                importWp.fromDirectory(j, name_thread, max_thread, revert)
                 del importWp
 
     else:
         if len(directory) != len(wordpress):
-            logger.error("{0} : Error : Number directory is differant than wordpress".format(name))
+            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, tmp=tmp, revert=revert)
+            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.fromDirectory(directory[i])
+            importWp.fromDirectory(directory[i], name_thread, max_thread, revert)
             del importWp
 
 
 
 if __name__ == '__main__':
-    TMP = "/tmp/import_export_canablog"
     parser = argparse.ArgumentParser()
     parser.add_argument("--debug", help="Verbosity",  action="store_true")
     parser.add_argument("--logfile", help="Log file",  default="")
@@ -139,6 +149,7 @@ if __name__ == '__main__':
     parser.add_argument("--parallel", help="Define number thread (default : 1)", default=1)
     parser.add_argument("--no-ssl", help="No ssl for canalblog and/or wordpress (example wordpress,canalblog)", dest="ssl", default="")
     parser.add_argument("--revert", help="Restart a work from stopping work", action="store_true")
+    parser.add_argument("--tmp", help="directory tmp", default="/tmp/import_export_canablog")
 
     subparsers = parser.add_subparsers(dest="command")
 
@@ -192,9 +203,6 @@ if __name__ == '__main__':
                       default="",
                       help="File")
 
-
-    if not os.path.exists(TMP):
-        os.mkdir(TMP)
     
     args = parser.parse_args()
 
@@ -230,6 +238,8 @@ if __name__ == '__main__':
         fileHandler.setFormatter(formatter)
         logger.addHandler(fileHandler)
 
+    os.makedirs(args.tmp, exist_ok=True)
+
     if args.command == "import" or args.command == "remove":
         password = args.password
         if len(args.password) == 0:
@@ -251,8 +261,9 @@ if __name__ == '__main__':
                 with futures.ThreadPoolExecutor(max_workers=int(args.parallel)) as ex:
                     wait_for = [ ex.submit(remove, i, args.parallel, args, basic, logger, ssl_wordpress) for i in range(0, int(args.parallel)) ]
                     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, TMP, 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)
                     for i in range(0, int(args.parallel))
                     ]
             except Exception as err:
@@ -262,8 +273,9 @@ if __name__ == '__main__':
                 with futures.ThreadPoolExecutor(max_workers=int(args.parallel)) as ex:
                     wait_for = [ ex.submit(remove, i, args.parallel, args, basic, logger, ssl_wordpress) for i in range(0, int(args.parallel)) ]
                     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, 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)
                     for i in range(0, int(args.parallel))
                     ]
 
@@ -301,7 +313,7 @@ if __name__ == '__main__':
                 try:
                     with futures.ThreadPoolExecutor(max_workers=int(args.parallel)) as ex:
                         wait_for = [
-                        ex.submit(download, i, int(args.parallel), url, logger, args.parser, args.directory, args.html, args.img, ssl_canalblog, args.revert, TMP)
+                        ex.submit(download, i, int(args.parallel), url, logger, args.parser, args.directory, args.html, args.img, ssl_canalblog, args.revert, args.tmp)
                         for i in range(0, int(args.parallel))
                         ]
                 except Exception as err:
@@ -321,7 +333,8 @@ if __name__ == '__main__':
         if len(args.directory) > 0:
             try:
                 with futures.ThreadPoolExecutor(max_workers=int(args.parallel)) as ex:
-                    wait_for = [ ex.submit(change, i, args.parallel, args, logger) for i in range(0, int(args.parallel)) ]
+                    errorRevert(logger, args.revert, args.tmp)
+                    wait_for = [ ex.submit(change, i, args.parallel, args, logger, args.tmp, args.revert) for i in range(0, int(args.parallel)) ]
             except Exception as err:
                 logger.error("Thread error for remove : {0}".format(err))
         if len(args.file) > 0:

lib/WPChange.py

@@ -4,11 +4,13 @@ import requests, os, logging, re, json
 
 class WPChange:
     # Constructor
-    def __init__(self, index_name=1, number_thread=1, logger=None, parser="html.parser"):
+    def __init__(self, index_name=1, number_thread=1, logger=None, parser="html.parser", tmp="/tmp/import_export_canablog"):
         self._name = "Thread-{0}".format(index_name)
         self._logger = logger
         self._number_thread = number_thread
         self._parser = parser
+        self._tmp = tmp
+        self._index_name = index_name
     
     # Destructor 
     def __del__(self):
@@ -37,19 +39,62 @@ class WPChange:
                 
 
     ## From directory
-    
+
-    def fromDirectory(self, directory="", number_thread=1, max_thread=1):
+
+    def fromDirectory(self, directory="", revert=False):
+        self._directory = directory
         directory = "{0}/archives".format(directory)
         directories = self._getDirectories([], "{0}".format(directory))
         if len(directories) > 0:
             files = self._getFiles(directories)
-            self.fromFile(files, number_thread, max_thread)
+            if revert is False:
+                self._tmpFiles(files=files, number_thread=self._index_name, max_thread=self._number_thread)
+            self._fromFileTmp()
         else:
             self._logger.error("{0} : No files for {1}".format(self._name, directory))
+    
+
+    def fromFile(self, files=[]):
+        for i in range(0, len(files)):
+            if os.path.exists(files[i]):
+                self._logger.info("{0} : ({1}/{2}) File is being processed : {3}".format(self._name, i+1, len(files), files[i]))
+                self._change(files[i])
 
 
     # Private method
 
+    def _fromFileTmp(self):
+        try:
+            with open("{0}/{1}.json".format(self._tmp, self._name)) as file:
+                files = json.loads(file.read())
+                self._logger.debug("{0} : size of webpage : {1}".format(self._name, len(files)))
+                for i in range(0, len(files)):
+                    if os.path.exists(files[i]):
+                        self._logger.info("{0} : ({1}/{2}) File is being processed : {3}".format(self._name, i+1, len(files), files[i]))
+                        self._change(files[i])
+        except Exception as ex:
+            self._logger.error("{0} : Read file json from tmp : {1}".format(self._name, ex))
+
+
+    def _tmpFiles(self, files=[], number_thread=1, max_thread=1):
+        print()
+        divFiles = int(len(files) / int(max_thread))
+        currentRangeFiles = int(divFiles * (int(number_thread)+1))
+        firstRange = int(currentRangeFiles - divFiles)
+        self._logger.debug("{0} : index : {1}".format(self._name,number_thread))
+
+        self._logger.debug("{0} : first range : {1}".format(self._name,firstRange))
+        self._logger.debug("{0} : last range : {1}".format(self._name,currentRangeFiles))
+        webpage = []
+        for i in range(firstRange, currentRangeFiles):
+            webpage.append(files[i])
+        
+        try:
+            string_webpage = json.dumps(webpage)
+            open("{0}/{1}.json".format(self._tmp, self._name), "wt").write(string_webpage)
+        except Exception as ex:
+            self._logger.error("{0} : Error for writing webpage : {1}".format(self._name, ex))
+
     ## Get all files
 
     def _getFiles(self, item):

lib/WPExport.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 from bs4 import BeautifulSoup
 from urllib.parse import urlparse
-import requests, os, argparse, logging
+import requests, os, argparse, logging, json
 from requests.adapters import HTTPAdapter
 from requests.packages.urllib3.util.retry import Retry
 

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", revert=False):
+    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"):
         self._name = name
         self._basic = basic
         self._wordpress = wordpress
@@ -29,7 +29,6 @@ class WPimport:
         self._no_update = no_update
         self._no_image = no_image
         self._tmp = tmp
-        self._revert = revert
     
     # Destructor 
     def __del__(self):
@@ -42,71 +41,56 @@ class WPimport:
 
     def fromUrl(self, first, second):
         try:
-            content_file = open("{0}/{1}.json".format(self._name, self._tmp))
+            with open("{0}/{1}.json".format(self._tmp, self._name)) as file:
-            webpage_content = json.loads(content_file)
+                webpage_content = json.loads(file.read())
-            webpage = webpage_content[first][second]
+                self._logger.debug("{0} : size of webpage : {1}".format(self._name, len(webpage_content)))
-            for i in range(0, len(webpage)):
+                webpage = webpage_content[first][second]
-                try:
+                for i in range(0, len(webpage)):
-                    r = self._request.get(webpage[i])
+                    try:
-                    if r.status_code == 200:
+                        r = self._request.get(webpage[i])
-                        self._logger.info("{0} : ({1}/{2}) : Page is importing : {3}".format(self._name, i+1, len(webpage), webpage[i]))
+                        if r.status_code == 200:
-                        soup = BeautifulSoup(r.content, self._parser)
+                            self._logger.info("{0} : ({1}/{2}) : Page is importing : {3}".format(self._name, i+1, len(webpage), webpage[i]))
-                        articlebody = soup.find_all("div", class_="articlebody")
+                            soup = BeautifulSoup(r.content, self._parser)
-                        if len(articlebody) > 0:
+                            articlebody = soup.find_all("div", class_="articlebody")
-                            self._addOrUpdatePost(soup)
+                            if len(articlebody) > 0:
+                                self._addOrUpdatePost(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)
                         else:
-                            self._addOrUpdateFeaturedMedia(soup)
+                            self._logger.error("{0} : Connection error for get url {1} with status code : {2}".format(self._name, webpage[i], r.status_code))
-                        del webpage_content[first][second][i]
+                            self._logger.debug("{0} : {1}".format(self._name, r.content))
-                        open("{0}/{1}.json".format(self._tmp, self._name), "wt").write(webpage_content)
+                    except ConnectionError as err:
-                    else:
+                        self._logger.error("{0} : Connection error for get url {1} : {2}".format(self._name, webpage[i], err))
-                        self._logger.error("{0} : Connection error for get url {1} with status code : {2}".format(self._name, webpage[i], r.status_code))
+                        exit(1)
-                        self._logger.debug("{0} : {1}".format(self._name, r.content))
+                    except IOError as err:
-                except ConnectionError as err:
+                        self._logger.error("{0} : Connection error for IO url {1} : {2}".format(self._name, webpage[i], err))
-                    self._logger.error("{0} : Connection error for get url {1} : {2}".format(self._name, webpage[i], err))
+                        exit(1)
-                    exit(1)
+                    except Exception as err:
-                except IOError as err:
+                        self._logger.error("{0} : Exception error for get url {1} : {2}".format(self._name, webpage[i], err))
-                    self._logger.error("{0} : Connection error for IO url {1} : {2}".format(self._name, webpage[i], err))
-                    exit(1)
-                except Exception as err:
-                    self._logger.error("{0} : Exception error for get url {1} : {2}".format(self._name, webpage[i], err))
-
-
         except Exception as ex:
             self._logger.error("{0} : Read file json from tmp : {1}".format(self._name, ex))
 
 
-    def fromDirectory(self, directory="", number_thread=1, max_thread=1):
+    def fromDirectory(self, directory="", number_thread=1, max_thread=1, revert=False):
-        if self._revert:
+        self._directory = directory
-            self._directory = directory
+        directory = "{0}/archives".format(directory)
-            directory = "{0}/archives".format(directory)
+        directories = self._getDirectories([], "{0}".format(directory))
-            directories = self._getDirectories([], "{0}".format(directory))
+        if len(directories) > 0:
-            if len(directories) > 0:
+            files = self._getFiles(directories)
-                files = self._getFiles(directories)
+            if revert is False:
-                self.fromFile(files, number_thread, max_thread)
+                self._tmpFiles(files=files, number_thread=number_thread, max_thread=max_thread)
-            else:
+            self._fromFileTmp()
-                self._logger.error("{0} : No files for {1}".format(self._name, directory))
         else:
-            try:
+            self._logger.error("{0} : No files for {1}".format(self._name, directory))
-                files = open("{0}/{1}.json".format(self._name, self._tmp))
+    
-                self.fromFile(files, number_thread, max_thread)
-            except Exception as ex:
-                self._logger.error("{0} : Read file json from tmp : {1}".format(self._name, ex))
 
-
+    def fromFile(self, files=[]):
-        
+        for i in range(0, len(files)):
-
-    def fromFile(self, files=[], number_thread=1, max_thread=1):
-        divFiles = int(len(files) / max_thread)
-        currentRangeFiles = int(divFiles * (number_thread+1))
-        firstRange = int(currentRangeFiles - divFiles)
-        self._logger.debug("{0} : index : {1}".format(self._name,number_thread))
-
-        self._logger.debug("{0} : first range : {1}".format(self._name,firstRange))
-        self._logger.debug("{0} : last range : {1}".format(self._name,currentRangeFiles))
-
-        for i in range(firstRange, currentRangeFiles):
             if os.path.exists(files[i]):
-                self._logger.info("{0} : ({1}/{2}) File is being processed : {3}".format(self._name, i+1, currentRangeFiles + 1, files[i]))
+                self._logger.info("{0} : ({1}/{2}) File is being processed : {3}".format(self._name, i+1, len(files), files[i]))
                 with open(files[i], 'r') as f:
                     content = f.read()
                     self._logger.debug("{0} : Size of article : {1}".format(self._name, len(content)))
@@ -117,10 +101,52 @@ class WPimport:
                         self._addOrUpdatePost(soup)
                     else:
                         self._addOrUpdateFeaturedMedia(soup)
+        
     
     
     # Private method
 
+    def _fromFileTmp(self):
+        try:
+            with open("{0}/{1}.json".format(self._tmp, self._name)) as file:
+                files = json.loads(file.read())
+                self._logger.debug("{0} : size of webpage : {1}".format(self._name, len(files)))
+                for i in range(0, len(files)):
+                    if os.path.exists(files[i]):
+                        self._logger.info("{0} : ({1}/{2}) File is being processed : {3}".format(self._name, i+1, len(files), files[i]))
+                        with open(files[i], 'r') as f:
+                            content = f.read()
+                            self._logger.debug("{0} : Size of article : {1}".format(self._name, len(content)))
+                            soup = BeautifulSoup(content, self._parser)
+                            articlebody = soup.find_all("div", class_="articlebody")
+                            self._logger.debug("{0} : Number of article : {1}".format(self._name, len(articlebody)))
+                            if len(articlebody) > 0:
+                                self._addOrUpdatePost(soup)
+                            else:
+                                self._addOrUpdateFeaturedMedia(soup)
+        except Exception as ex:
+            self._logger.error("{0} : Read file json from tmp : {1}".format(self._name, ex))
+
+
+    def _tmpFiles(self, files=[], number_thread=1, max_thread=1):
+        divFiles = int(len(files) / max_thread)
+        currentRangeFiles = int(divFiles * (number_thread+1))
+        firstRange = int(currentRangeFiles - divFiles)
+        self._logger.debug("{0} : index : {1}".format(self._name,number_thread))
+
+        self._logger.debug("{0} : first range : {1}".format(self._name,firstRange))
+        self._logger.debug("{0} : last range : {1}".format(self._name,currentRangeFiles))
+        webpage = []
+        for i in range(firstRange, currentRangeFiles):
+            webpage.append(files[i])
+        
+        try:
+            string_webpage = json.dumps(webpage)
+            open("{0}/{1}.json".format(self._tmp, self._name), "wt").write(string_webpage)
+        except Exception as ex:
+            self._logger.error("{0} : Error for writing webpage : {1}".format(self._name, ex))
+
+
     ## replace caracter 
 
     def _replaceCaracter(self, title_rendered):