From 5519ab072d2c49b85aa9930733b5a856ea7593ad Mon Sep 17 00:00:00 2001
From: mrbesen <y.g.2@gmx.de>
Date: Sun, 21 Oct 2018 21:57:36 +0200
Subject: [PATCH] a

---
 src/de/mrbesen/youtubecrawler/Crawler.java |  6 ----
 src/de/mrbesen/youtubecrawler/DB.java      |  2 ++
 src/de/mrbesen/youtubecrawler/Main.java    | 39 ++++++----------------
 3 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/src/de/mrbesen/youtubecrawler/Crawler.java b/src/de/mrbesen/youtubecrawler/Crawler.java
index 4336371..2639726 100644
--- a/src/de/mrbesen/youtubecrawler/Crawler.java
+++ b/src/de/mrbesen/youtubecrawler/Crawler.java
@@ -326,12 +326,6 @@ public class Crawler implements Runnable {
 			}
 			profiler.endSection();//main
 		}
-		profiler.startSection("cleanup");
-		profiler.startSection("deleteDouble");
-		//db.deleteDouble();
-		profiler.endStartSection("stopDB");
-		db.stop();
-		profiler.endSection();
 		profiler.endSection();//root
 		log.info("Profiler:");
 		for(String s : profiler.getTreeView()) {
diff --git a/src/de/mrbesen/youtubecrawler/DB.java b/src/de/mrbesen/youtubecrawler/DB.java
index 1a71606..471671c 100644
--- a/src/de/mrbesen/youtubecrawler/DB.java
+++ b/src/de/mrbesen/youtubecrawler/DB.java
@@ -133,6 +133,7 @@ public class DB implements Runnable {
 		//log.info("add " + input.size() + " videos");
 		if(input != null) {
 			if(input.size() > 0) {
+				writebuffercurrentsize += input.size();
 				for(int i = 0; i < input.size(); i++) {
 					Video v = input.get(i);
 					if(v != null)
@@ -142,6 +143,7 @@ public class DB implements Runnable {
 		}
 		if(writebuffercurrentsize > writebuffersize || force) {
 			if(tostorebuffer.length() > 10) {
+				log.info("Write data to DB video count: " + writebuffercurrentsize);
 				dbsize += writebuffercurrentsize;
 				tostorebuffer.deleteCharAt(0);//delete leading ','
 				String qu = "INSERT IGNORE INTO `ytcrawler`.`videos`(`id`, `length`, `created`, `langcode`, `category`, `videotitle`, `channel`, `tags`) VALUES " + tostorebuffer.toString();
diff --git a/src/de/mrbesen/youtubecrawler/Main.java b/src/de/mrbesen/youtubecrawler/Main.java
index 6ced97e..4967752 100644
--- a/src/de/mrbesen/youtubecrawler/Main.java
+++ b/src/de/mrbesen/youtubecrawler/Main.java
@@ -2,7 +2,6 @@ package de.mrbesen.youtubecrawler;
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.Thread.State;
 import java.util.ArrayList;
 import java.util.Random;
 import java.util.Scanner;
@@ -118,6 +117,7 @@ public class Main implements JSONCommandHandler, EventListener{
 				}
 			} else if(in.equalsIgnoreCase("crastop")) {
 				log.info("Stop crawler");
+				startcrawler = false;
 				cra.stop();
 			} else if(in.equalsIgnoreCase("profiler")) {
 				for(String profline : cra.getProfiling()) {
@@ -143,35 +143,18 @@ public class Main implements JSONCommandHandler, EventListener{
 	public void stop() {
 		log.info("Stop.");
 		cra.stop();
-		if(startcrawler) {
-			new Thread(new Runnable() {
-				@Override
-				public void run() {
-					int count = 0;
-					while(crawlerthread.isAlive()) {
-						try {
-							Thread.sleep(20000);
-						} catch(InterruptedException ignored) {}
-						count = 0;
-						for(Thread t : Thread.getAllStackTraces().keySet()) {
-							String name = format(t.getName(), 15);
-							log.info(name + ":\t" + t.getState().name());
-							if(t.getState() == State.RUNNABLE) {
-								count ++;
-							} 
-						}
-						log.info("count: " + count);
-					}
-					log.info("Stoped Shutdown Watchdog");
-				}
-			}, "Shutdown Watchdog").start();
+		if(!startcrawler) {//crawler not running
+			cra.getDB().stop();
+			tapi.stop();
 		}
 	}
 
 	void stopcallback() {
-		tapi.stop();
-		log.info("tapi stopped");
-		mainthread.interrupt();
+		if(startcrawler) {//crawler should run
+			tapi.stop();
+			cra.getDB().stop();
+			mainthread.interrupt();
+		}
 	}
 
 	@Override
@@ -179,7 +162,7 @@ public class Main implements JSONCommandHandler, EventListener{
 		//unused
 		return false;
 	}
-	
+
 	@Override
 	public boolean onCommand(TUser sender, String cmd, String[] args, JSONObject j) {
 		if(cmd.startsWith("random")) {
@@ -222,7 +205,7 @@ public class Main implements JSONCommandHandler, EventListener{
 				return true;
 			}
 		}
-		
+
 		/*else if(cmd.equals("stop")) {
 			if(admins.contains(sender.getName())) {
 				stop();