add debug

Reviewed-on: #5

backup_canalblog.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+TAR=/usr/bin/tar
+PYTHON=/usr/bin/python3
+GZIP=/usr/bin/gzip
+SCRIPTDIR=/home/valentin/script
+WEBSCRAP=${SCRIPTDIR}/web_scrap.py
+URL=www.clarissariviere.com
+DATE=$(date +%Y%m%d)
+DIRECTORY=/home/valentin/backup
+BACKUPDIR=/home/valentin/backup_clarissa
+LIST=${BACKUPDIR}/backup.list
+fileBackup="backup-clarissa-${DATE}"
+LOGFILE=web_scrap.txt
+SENDER="valczebackup@gmail.com"
+if [ $(date +%u) -eq 5 ]; then
+	echo > ${LIST}
+	rm -rf "${BACKUPDIR}/*-incr.tar.gz"
+	fileBackup="${fileBackup}-full"
+	subject="Sauvegarde full"	
+else
+	fileBackup="${fileBackup}-incr"
+	subject="Sauvegarde incremental"
+fi
+subject="${subject} ${URL} ${DATE}"
+echo > ${BACKUPDIR}/${LOGFILE}
+${PYTHON} ${WEBSCRAP} --url ${URL} --dir ${DIRECTORY}  --quiet --logfile ${BACKUPDIR}/${LOGFILE}
+if [ ${?} -ne 0 ]; then
+	subject="${subject} echoue : recuperation page"
+	echo ${subject} | mail -s "${subject}" -A ${BACKUPDIR}/${LOGFILE} ${SENDER}
+	exit 1
+fi
+${TAR} --create --file="${BACKUPDIR}/${fileBackup}.tar" --listed-incremental=${LIST} ${DIRECTORY}
+if [ ${?} -ne 0 ]; then
+	subject="${subject} echoue : archivage page "
+	echo ${subject} | mail -s "${subject}" -A ${BACKUPDIR}/${LOGFILE} ${SENDER}
+	exit 1
+fi
+${GZIP} -f -9 "${BACKUPDIR}/${fileBackup}.tar"
+if [ ${?} -ne 0 ]; then
+	subject="${subject} echoue : compression archive "
+	echo ${subject} | mail -s "${subject}" -A ${BACKUPDIR}/${LOGFILE} ${SENDER}
+	exit 1
+fi
+subject="${subject} OK"
+echo ${subject}| mail -s "${subject}" -A ${BACKUPDIR}/${LOGFILE} ${SENDER}
+exit 0

web_scrap.py

@@ -13,9 +13,11 @@ def mkdirPath(path_dir, logger):
             if not os.path.exists(repath):
                 logger.debug("Dossier crée : {0}".format(repath))
                 try:
-                    os.mkdir(repath)
+                    if len(repath) > 0:
+                        os.mkdir(repath)
                 except Exception as err:
                     logger.error("Directory error : {0}".format(err))
+                    logger.debug("Directory error : {0} {1} {2} {3} {4}".format(err, path_dir, repath, pathh, makedir))
                     exit(1)
 
 
@@ -184,25 +186,37 @@ if __name__ == '__main__':
                       default="backup",
                       help="backup file path")
     parser.add_argument("--debug", help="Verbosity",  action="store_true")
+    parser.add_argument("--logfile", help="Log file",  default="")
     parser.add_argument("--no-css", help="No CSS", dest="css",  action="store_true")
     parser.add_argument("--no-js", help="No JS", dest="js",  action="store_true")
     parser.add_argument("--no-img", help="No img", dest="img",  action="store_true")
     parser.add_argument("--no-html", help="No HTML", dest="html", action="store_true")
-
+    parser.add_argument("--quiet", help="No console output", action="store_true")
     args = parser.parse_args()
     logger = logging.getLogger('web_scrap')
-    ch = logging.StreamHandler()
-
-    if args.debug is True:
-        logger.setLevel(logging.DEBUG)
-        ch.setLevel(logging.DEBUG)
-    else:
-        logger.setLevel(logging.INFO)
-        ch.setLevel(logging.INFO)
-
     formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-    ch.setFormatter(formatter)
+
-    logger.addHandler(ch)
+    if args.quiet is False:
+        ch = logging.StreamHandler()
+        if args.debug is True:
+            logger.setLevel(logging.DEBUG)
+            ch.setLevel(logging.DEBUG)
+        else:
+            logger.setLevel(logging.INFO)
+            ch.setLevel(logging.INFO)
+        ch.setFormatter(formatter)
+        logger.addHandler(ch)
+
+
+    if len(args.logfile) > 0:
+        fileHandler = logging.FileHandler(args.logfile)
+        if args.debug is True:
+            fileHandler.setLevel(logging.DEBUG)
+        else:
+            fileHandler.setLevel(logging.INFO)
+        fileHandler.setFormatter(formatter)
+        logger.addHandler(fileHandler)
+    
     try:
         o = urlparse(args.url)
         o = o._replace(scheme="https")
@@ -224,4 +238,4 @@ if __name__ == '__main__':
     
     if args.img is False:
         page_src = getImg(webpage, logger)
-        downloadPage(page_src, "{0}/{1}/{2}".format(args.dir, o.path, "img"), logger)
+        downloadPage(page_src, "{0}/{1}/{2}".format(args.dir, o.path, "img"), logger)