Merge branch 'master' of http://git.ivaya.de/BA_SI-Projekt/MediaDBPythonScripte

Conflicts:
	README.md

Media2.py

@@ -20,7 +20,7 @@ class Database(object):
         try:
             self.connection = MySQLdb.connect(host="192.168.0.32", port=3306, db="MediaDB_Nico", user="MediaDB", passwd="MediaDB")
         except:
-            self.connection = MySQLdb.connect(host="pimaster.ddns.net", port=3306, db="MediaDB", user="markus", passwd="")
+            self.connection = MySQLdb.connect(host="192.168.0.32", port=3306, db="MediaDB_Nico", user="MediaDB", passwd="MediaDB")
         self.instance = self.connection.cursor()
 
     def deleteDuplicates(self):
@@ -1024,8 +1024,8 @@ class FilmParser(object):
         number = 1
         for movie in self.movies:        
             print('Berechne md5 %s von %s' % (number, len(self.movies)))
-            #movie['md5'] = subprocess.Popen(['md5sum', movie['path']], shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0].split()[0]
-            movie['md5'] = 'c763d1aa80620530e494b1331151FAKE'
+            movie['md5'] = subprocess.Popen(['md5sum', movie['path']], shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0].split()[0]
+            #movie['md5'] = 'c763d1aa80620530e494b1331151FAKE'
             number += 1
 
     def printOverview(self):

README.md

 # Install
-    sudo apt-get install python-mysqldb python-imdbpy
+    sudo apt-get install python-mysqldb python-imdbpy python-lxml
     sudo apt-get install mediainfo
  
 Datenbank Leeren:
@@ -16,6 +16,13 @@ NAS im Raspberry mounten
     
     sshfs admin@192.168.0.205:/share/Multimedia/Video /media/QNAP/
     
+<<<<<<< HEAD
 Reparieren von belegter Speicher (View)
 
-    CREATE OR REPLACE VIEW belegterSpeicher AS SELECT CONCAT(FORMAT((COALESCE(SUM(size),0)+COALESCE((SELECT SUM(size) FROM Filme WHERE hdd=1),0))/POW(1024,3),0)," GB") AS "Media 1", (SELECT CONCAT(FORMAT(((COALESCE(SUM(size),0)+COALESCE((SELECT SUM(size) FROM Filme WHERE hdd=2),0))/POW(1024,3)),0)," GB") FROM Episoden Where hdd=2) AS "Media 2", (SELECT CONCAT(FORMAT(((COALESCE(SUM(size),0)+COALESCE((SELECT SUM(size) FROM Filme WHERE hdd=3),0))/POW(1024,3)),0)," GB") FROM Episoden Where hdd=3) AS "Media 3", (SELECT CONCAT(FORMAT(((COALESCE(SUM(size),0)+COALESCE((SELECT SUM(size) FROM Filme WHERE hdd=4),0))/POW(1024,3)),0)," GB") FROM Episoden Where hdd=4) AS "Media 4", (SELECT CONCAT(FORMAT(((COALESCE(SUM(size),0)+COALESCE((SELECT SUM(size) FROM Filme WHERE hdd=5),0))/POW(1024,3)),0)," GB") FROM Episoden Where hdd=5) AS "Media 5", CONCAT(FORMAT(((SELECT SUM(size) FROM Filme) + (SELECT SUM(size) FROM Episoden))/POW(1024,3),0), " GB") "Total" FROM Episoden WHERE hdd=1;
\ No newline at end of file
+    CREATE OR REPLACE VIEW belegterSpeicher AS SELECT CONCAT(FORMAT((COALESCE(SUM(size),0)+COALESCE((SELECT SUM(size) FROM Filme WHERE hdd=1),0))/POW(1024,3),0)," GB") AS "Media 1", (SELECT CONCAT(FORMAT(((COALESCE(SUM(size),0)+COALESCE((SELECT SUM(size) FROM Filme WHERE hdd=2),0))/POW(1024,3)),0)," GB") FROM Episoden Where hdd=2) AS "Media 2", (SELECT CONCAT(FORMAT(((COALESCE(SUM(size),0)+COALESCE((SELECT SUM(size) FROM Filme WHERE hdd=3),0))/POW(1024,3)),0)," GB") FROM Episoden Where hdd=3) AS "Media 3", (SELECT CONCAT(FORMAT(((COALESCE(SUM(size),0)+COALESCE((SELECT SUM(size) FROM Filme WHERE hdd=4),0))/POW(1024,3)),0)," GB") FROM Episoden Where hdd=4) AS "Media 4", (SELECT CONCAT(FORMAT(((COALESCE(SUM(size),0)+COALESCE((SELECT SUM(size) FROM Filme WHERE hdd=5),0))/POW(1024,3)),0)," GB") FROM Episoden Where hdd=5) AS "Media 5", CONCAT(FORMAT(((SELECT SUM(size) FROM Filme) + (SELECT SUM(size) FROM Episoden))/POW(1024,3),0), " GB") "Total" FROM Episoden WHERE hdd=1;
+=======
+    
+Suche in DB nach Filmen, Ausgabe in CSV
+
+    SELECT CONCAT(imdbID, ", ", name), 3d  FROM `Filme` WHERE `name` LIKE '%legend%'
+>>>>>>> 744dc96830169ac2344eacfc0166cfbbf48f9b87

renamer.php

 <?php
-$dir ="/media/QNAP/";
+$dir ="/media/QNAP";
 /*
 $kommando = 'find '.$dir.' * | grep mkv';
 echo $kommando.PHP_EOL;
@@ -24,7 +24,7 @@ $Notindexed;
 function dirtoArray($dir, $root = ''){
 	$Arr = scandir($dir);
 	global $Notindexed;
-	$FolderIgnor = array('.@__thumb', '@Recycle', 'HD-Serien', 'Die Olsenbande', 'Serien');
+	$FolderIgnor = array('.@__thumb', '@Recycle', 'HD-Serien', 'Die Olsenbande', 'Serien', 'FilmeALT', 'Filme', 'Filme3D');
 	unset($Arr[array_search('.', $Arr)]);
 	unset($Arr[array_search('..', $Arr)]);
 	unset($Arr[array_search('.@__thumb', $Arr)]);
@@ -58,15 +58,15 @@ foreach ($Notindexed as $value) {
 	else if(strpos($value[1], "(1080p)")){
 		$resolution = "1080p";
 	}
-	if(strpos($value[1], "(3D)")){
+	if(strpos($dir.$value[0]."/".$value[1], "3D")){
 		$dreiD = true;
 	}
 	if(strlen(substr($value[1],0,strpos($value[1], "("))) > 0){
 		$name = substr($value[1],0,strpos($value[1], "("));
 	}else{
-		$name = substr($value[1],0,strpos($value[1], "."));
+		$name = substr($value[1],0,strripos($value[1], "."));
 	}
-	$endung = substr($value[1],strpos($value[1], "."),4);
+	$endung = substr($value[1],strripos($value[1], "."),4);
 	if(strlen($name)>0){
 		$name = str_replace("ue", "_", $name);
 		$name = str_replace("oe", "_", $name);
@@ -85,13 +85,17 @@ foreach ($Notindexed as $value) {
 		
 		//var_dump($resultArr);
 		if(strlen($resultArr["imdbID"])>0){
-			$comando =  "mv '".$dir.$value[0]."/".$value[1]."' '".$dir.$value[0]."/".utf8_encode($resultArr["name"])." (".$resultArr["resolution"].") (".$resultArr["imdbID"].")".$endung."'";
+			$befehl =  "mv '".$dir.$value[0]."/".$value[1]."' '".str_replace("3DHD-Filme", "Filme3D",$dir.$value[0])."/".utf8_encode($resultArr["name"]).($dreiD?" (3D)":"")." (".$resultArr["resolution"].") (".$resultArr["imdbID"].")".$endung."'";
 			/*$comando = str_replace(" ", "\ ", $comando);
 			$comando = str_replace("(", "\(", $comando);
 			$comando = str_replace(") ", "\)", $comando);
 			*///
-			//echo $comando.PHP_EOL;
-			echo exec($comando);
+			//echo exec("mkdir '".str_replace("3DHD-Filme", "Filme3D",$dir.$value[0])."/'").PHP_EOL;
+			echo $befehl.PHP_EOL;
+			
+			//echo exec($befehl);
+		}else{
+			echo "Keine Infos zu ".$dir.$value[0]."/".$value[1]." gefunden!".PHP_EOL;
 		}
 	}