Skip to content

Commit dedc797

Browse files
ttimerttimer
authored
Add files via upload
continuous optimization
1 parent 03d0e1a commit dedc797

10 files changed

+212
-95
lines changed

‎mid3TagMp3.inc.php‎

Lines changed: 87 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?PHP
1+
<?php
22
/**
33
*
44
* @author Jürgen Smolka
@@ -202,7 +202,7 @@ function buildSites1($batch)
202202
else
203203
echo ' | ' . $strValue;
204204
}
205-
echo "<br> \n <br> \n <br> \n";
205+
echo "<br> \n <br> \n";
206206
}
207207
}
208208
}
@@ -212,25 +212,31 @@ function buildSites1($batch)
212212
// Hörbücher u. ä. - Aufruf per: mid3TagMp3??????.php
213213
function buildSites2($batch)
214214
{
215-
$ausgabe = ""; // JS
216-
$tracknr = "001"; // JS
217-
$lenTrack = 3; // JS
218-
$trackpa = ""; // JS
219-
$trackpo = ""; // JS
215+
$GUI = "ID3-tags-powered-by:ID3 by GitHub.com/ttimer/GUI-for-mID3v2";
216+
$LNK = "https://GitHub.com/ttimer/GUI-for-mID3v2/";
217+
218+
$genreini = "101"; // JS
219+
$trackini = "001"; // JS
220+
$ausgabe = ""; // JS
221+
$tracknr = ""; // JS
222+
$lenTrack = ""; // JS
223+
$trackpa = ""; // JS
224+
$trackpo = ""; // JS
220225

221226
reset($batch);
222-
ksort($batch); // JS sortiert Verzeichnisse (CD1, CD2 ...)
223-
224-
if(!empty($_POST["track"]) && isset($_POST["Xtrack"])) {
227+
ksort($batch); // JS sortiert Verzeichnisse (CD1, CD2 ...)
228+
229+
if((!empty($_POST["track"]) || $_POST["track"] == 0) && isset($_POST["Xtrack"])) {
225230
$tracknr = $_POST["track"];
226231
if(strstr($tracknr, "/")) {
227232
$tracknr = str_replace(" ", "", $tracknr);
228233
$trackpa = explode("/", $tracknr, 2);
229234
$tracknr = $trackpa[0];
230235
$trackpo = "/" . $trackpa[1];
231236
}
232-
$lenTrack = strlen($tracknr);
233237
}
238+
if($tracknr == "") $tracknr = $trackini;
239+
$lenTrack = strlen($tracknr);
234240

235241
foreach($batch as $key => $array)
236242
{
@@ -285,20 +291,24 @@ function buildSites2($batch)
285291
$Album = $_POST["album"];
286292
if(!empty($_POST["titel"]))
287293
$Titel = $_POST["titel"];
288-
if(!empty($_POST["track"]))
294+
if(!empty($_POST["track"]) || $_POST["track"] == 0)
289295
$Track = $_POST["track"];
290-
if(!empty($_POST["genre"]))
296+
if($tracknr == "")
297+
$tracknr = $trackini;
298+
if(!empty($_POST["genre"]) || $_POST["genre"] == 0)
291299
$Genre = $_POST["genre"];
300+
if($Genre == "")
301+
$Genre = $genreini;
292302
// if(!empty($_POST["comment"]))
293303
// $Coment = $_POST["comment"];
294304
if(isset($_POST["execute"]))
295305
$Exe = $_POST["execute"];
296306

297307
//echo("mid3v2 -a '$_POST[artist]' -A '$_POST[album]' -t '$_POST[titel]' -T $_POST[track] -g $_POST[genre] '$Datei'<br />\n");
298308
//echo("mid3v2 -a '$Artist' -A '$Album' -t '$Titel' -T $Track -g '$Genre' -c '$Coment' '$Datei'<br />\n");
299-
echo("mid3v2 -a '$Artist' -A '$Album' -t '$Titel' -T $Track -g '$Genre' '$Datei'<br />\n");
309+
echo("mid3v2 -a '$Artist' -A '$Album' -t '$Titel' -T '$Track' -g '$Genre' '$Datei'<br />\n");
300310
if($Exe == "on")
301-
exec("mid3v2 -a '$Artist' -A '$Album' -t '$Titel' -T $Track -g '$Genre' '$Datei'");
311+
exec("mid3v2 -a '$Artist' -A '$Album' -t '$Titel' -T '$Track' -g '$Genre' --WXXX '$GUI' '$Datei'");
302312
//exec("mid3v2 -a '$Artist' -A '$Album' -t '$Titel' -T $Track -g '$Genre' -c '$Coment' '$Datei'");
303313
//exec("mid3v2 -a '$Artist' -A 'Moerderische Cote d Azur' -t '$Titel' -T $Track -g 101 '$Datei'");
304314

@@ -344,25 +354,31 @@ function buildSites2($batch)
344354
// Hörbücher u. ä. - Aufruf per: mid3TagMp3AudioBook.php
345355
function buildSites2b($batch)
346356
{
347-
$ausgabe = ""; // JS
348-
$tracknr = "001"; // JS
349-
$lenTrack = 3; // JS
350-
$trackpa = ""; // JS
351-
$trackpo = ""; // JS
357+
$GUI = "ID3-tags-powered-by:ID3 by GitHub.com/ttimer/GUI-for-mID3v2";
358+
$LNK = "https://GitHub.com/ttimer/GUI-for-mID3v2/";
359+
360+
$genreini = "101"; // JS
361+
$trackini = "001"; // JS
362+
$ausgabe = ""; // JS
363+
$tracknr = ""; // JS
364+
$lenTrack = ""; // JS
365+
$trackpa = ""; // JS
366+
$trackpo = ""; // JS
352367

353368
reset($batch);
354-
ksort($batch); // JS sortiert Verzeichnisse (CD1, CD2 ...)
369+
ksort($batch); // JS sortiert Verzeichnisse (CD1, CD2 ...)
355370

356-
if(!empty($_POST["track"]) && isset($_POST["Xtrack"])) {
371+
if((!empty($_POST["track"]) || $_POST["track"] == 0) && isset($_POST["Xtrack"])) {
357372
$tracknr = $_POST["track"];
358373
if(strstr($tracknr, "/")) {
359374
$tracknr = str_replace(" ", "", $tracknr);
360375
$trackpa = explode("/", $tracknr, 2);
361376
$tracknr = $trackpa[0];
362377
$trackpo = "/" . $trackpa[1];
363378
}
364-
$lenTrack = strlen($tracknr);
365379
}
380+
if($tracknr == "") $tracknr = $trackini;
381+
$lenTrack = strlen($tracknr);
366382

367383
foreach($batch as $key => $array)
368384
{
@@ -410,12 +426,10 @@ function buildSites2b($batch)
410426
$Titel = str_replace("%T", $tracknr, $Titel); //$Titel = str_replace("%T", $Track, $Titel);
411427
$Titel = str_replace("%t", $Titelt, $Titel);
412428
}
413-
if(!empty($_POST["genre"]) && isset($_POST["Xgenre"])) {
429+
if((!empty($_POST["genre"]) || $_POST["genre"] == 0) && isset($_POST["Xgenre"]))
414430
$Genre = $_POST["genre"];
415-
if($Genre == "'0'" || stristr("zero", $Genre) ||
416-
$Genre == '"0"' || stristr("null", $Genre))
417-
$Genre = (string)0;
418-
}
431+
if($Genre == "")
432+
$Genre = $genreini;
419433
if(!empty($_POST["year"]) && isset($_POST["Xyear"]))
420434
$Year = $_POST["year"];
421435
if(!empty($_POST["comment"]) && isset($_POST["Xcomment"]))
@@ -433,20 +447,22 @@ function buildSites2b($batch)
433447
if(isset($_POST["Xtitel"]))
434448
$Befehl .= " -t '$Titel'";
435449
if(isset($_POST["Xtrack"]))
436-
$Befehl .= " -T $Track";
450+
$Befehl .= " -T '$Track'";
437451
if(isset($_POST["Xgenre"]))
438452
$Befehl .= " -g '$Genre'";
439453
if(isset($_POST["Xyear"]))
440-
$Befehl .= " -y $Year";
454+
$Befehl .= " -y '$Year'";
441455
if(isset($_POST["Xcomment"]))
442456
$Befehl .= " -c '$Comment'";
443457
if(isset($_POST["Xpicture"]))
444458
$Befehl .= " -p '$Picture'";
445459

460+
$Anzeige = $Befehl . " '$Datei'";
461+
$Befehl .= " --WXXX '$GUI'";
446462
$Befehl .= " '$Datei'";
447463

448464
// Batch-Anzeige
449-
echo "<p style='margin-left:7%;'>" . $Befehl . "</p>\n"; //echo("mid3v2 -a '$Artist' -A '$Album' -t '$Titel' -T $Track -g '$Genre' '$Datei'<br />\n");
465+
echo "<p style='margin-left:7%;'>" . $Anzeige . "</p>\n"; //echo("mid3v2 -a '$Artist' -A '$Album' -t '$Titel' -T $Track -g '$Genre' '$Datei'<br />\n");
450466

451467
// Änderung durchführen
452468
if($Exe == "on")
@@ -491,25 +507,32 @@ function buildSites2b($batch)
491507
// -- P1(!) :: Bild nur in erster MP3-Datei speichern
492508
function buildSites2c($batch)
493509
{
494-
$ausgabe = ""; // JS
495-
$tracknr = "001"; // JS
496-
$lenTrack = 3; // JS
497-
$trackpa = ""; // JS
498-
$trackpo = ""; // JS
510+
$GUI = "ID3-tags-powered-by:ID3 by GitHub.com/ttimer/GUI-for-mID3v2";
511+
$LNK = "https://GitHub.com/ttimer/GUI-for-mID3v2/";
512+
513+
$genreini = "101"; // JS
514+
$trackini = "001"; // JS
515+
$ausgabe = ""; // JS
516+
$tracknr = ""; // JS
517+
$lenTrack = ""; // JS
518+
$trackpa = ""; // JS
519+
$trackpo = ""; // JS
499520

500521
reset($batch);
501-
ksort($batch); // JS sortiert Verzeichnisse (CD1, CD2 ...)
522+
ksort($batch); // JS sortiert Verzeichnisse (CD1, CD2 ...)
502523

503-
if(!empty($_POST["track"]) && isset($_POST["Xtrack"])) {
524+
if((!empty($_POST["track"]) || $_POST["track"] == 0) && isset($_POST["Xtrack"])) {
504525
$tracknr = $_POST["track"];
505526
if(strstr($tracknr, "/")) {
506527
$tracknr = str_replace(" ", "", $tracknr);
507528
$trackpa = explode("/", $tracknr, 2);
508529
$tracknr = $trackpa[0];
509530
$trackpo = "/" . $trackpa[1];
510531
}
511-
$lenTrack = strlen($tracknr);
512532
}
533+
if($tracknr == "")
534+
$tracknr = $trackini;
535+
$lenTrack = strlen($tracknr);
513536

514537
foreach($batch as $key => $array)
515538
{
@@ -557,12 +580,10 @@ function buildSites2c($batch)
557580
$Titel = str_replace("%T", $tracknr, $Titel); //$Titel = str_replace("%T", $Track, $Titel);
558581
$Titel = str_replace("%t", $Titelt, $Titel);
559582
}
560-
if(!empty($_POST["genre"]) && isset($_POST["Xgenre"])) {
583+
if((!empty($_POST["genre"]) || $_POST["genre"] == 0) && isset($_POST["Xgenre"]))
561584
$Genre = $_POST["genre"];
562-
if($Genre == "'0'" || stristr("zero", $Genre) ||
563-
$Genre == '"0"' || stristr("null", $Genre))
564-
$Genre = (string)0;
565-
}
585+
if($Genre == "")
586+
$Genre = $genreini;
566587
if(!empty($_POST["year"]) && isset($_POST["Xyear"]))
567588
$Year = $_POST["year"];
568589
if(!empty($_POST["comment"]) && isset($_POST["Xcomment"]))
@@ -580,11 +601,11 @@ function buildSites2c($batch)
580601
if(isset($_POST["Xtitel"]))
581602
$Befehl .= " -t '$Titel'";
582603
if(isset($_POST["Xtrack"]))
583-
$Befehl .= " -T $Track";
604+
$Befehl .= " -T '$Track'";
584605
if(isset($_POST["Xgenre"]))
585606
$Befehl .= " -g '$Genre'";
586607
if(isset($_POST["Xyear"]))
587-
$Befehl .= " -y $Year";
608+
$Befehl .= " -y '$Year'";
588609
if(isset($_POST["Xcomment"]))
589610
$Befehl .= " -c '$Comment'";
590611
if((isset($_POST["Xpicture"]) && $Picture != "") &&
@@ -595,10 +616,12 @@ function buildSites2c($batch)
595616
$Befehl .= " -p '$Picture'";
596617
}
597618

619+
$Anzeige = $Befehl . " '$Datei'";
620+
$Befehl .= " --WXXX '$GUI'";
598621
$Befehl .= " '$Datei'";
599622

600623
// Batch-Anzeige
601-
echo "<p style='margin-left:7%;'>" . $Befehl . "</p>\n"; //echo("mid3v2 -a '$Artist' -A '$Album' -t '$Titel' -T $Track -g '$Genre' '$Datei'<br />\n");
624+
echo "<p style='margin-left:7%;'>" . $Anzeige . "</p>\n"; //echo("mid3v2 -a '$Artist' -A '$Album' -t '$Titel' -T $Track -g '$Genre' '$Datei'<br />\n");
602625

603626
// Änderung durchführen
604627
if($Exe == "on")
@@ -642,8 +665,13 @@ function buildSites2c($batch)
642665
// Musikstücke/Songs (mp3-Dateien) - Aufruf per: mid3TagMp3Music.php
643666
function buildSites3($batch)
644667
{
645-
$ausgabe = ""; // JS
646-
$tracknr = "1"; // JS
668+
$GUI = "ID3-tags-powered-by:ID3 by GitHub.com/ttimer/GUI-for-mID3v2";
669+
$LNK = "https://GitHub.com/ttimer/GUI-for-mID3v2/";
670+
671+
$genreini = "11"; // JS
672+
$trackini = "1"; // JS
673+
$tracknr = $trackini; // JS
674+
$ausgabe = ""; // JS
647675

648676
reset($batch);
649677
ksort($batch); // JS sortiert Verzeichnisse (CD1, CD2 ...)
@@ -691,24 +719,24 @@ function buildSites3($batch)
691719
$Album = $_POST["album"];
692720
if(!empty($_POST["titel"]))
693721
$Titel = $_POST["titel"];
694-
if(!empty($_POST["track"]))
695-
$Track = $_POST["track"];
696-
if(!empty($_POST["genre"])) {
697-
$Genre = $_POST["genre"];
698-
if($Genre == "'0'" || stristr("zero", $Genre) ||
699-
$Genre == '"0"' || stristr("null", $Genre))
700-
$Genre = (string)0;
701-
}
722+
// if(!empty($_POST["track"]) || $_POST["track"] == 0)
723+
// $Track = $_POST["track"];
724+
// if($tracknr == "")
725+
// $tracknr = $trackini;
726+
if(!empty($_POST["genre"]) || $_POST["genre"] == 0)
727+
$Genre = $_POST["genre"];
728+
if($Genre == "")
729+
$Genre = $genreini;
702730
// if(!empty($_POST["comment"]))
703731
// $Coment = $_POST["comment"];
704732
if(isset($_POST["execute"]))
705733
$Exe = $_POST["execute"];
706734

707735
//echo("mid3v2 -a '$_POST[artist]' -A '$_POST[album]' -t '$_POST[titel]' -T $_POST[track] -g $_POST[genre] '$Datei'<br />\n");
708736
//echo("mid3v2 -a '$Artist' -A '$Album' -t '$Titel' -T $Track -g '$Genre' -c '$Coment' '$Datei'<br />\n");
709-
echo("mid3v2 -a '$Artist' -A '$Album' -t '$Titel' -T $Track -g '$Genre' '$Datei'<br />\n");
737+
echo("mid3v2 -a '$Artist' -A '$Album' -t '$Titel' -T '$Track' -g '$Genre' '$Datei'<br />\n");
710738
if($Exe == "on")
711-
exec("mid3v2 -a '$Artist' -A '$Album' -t '$Titel' -T $Track -g '$Genre' '$Datei'");
739+
exec("mid3v2 -a '$Artist' -A '$Album' -t '$Titel' -T '$Track' -g '$Genre' --WXXX '$GUI' '$Datei'");
712740
//exec("mid3v2 -a '$Artist' -A '$Album' -t '$Titel' -T $Track -g '$Genre' -c '$Coment' '$Datei'");
713741
//exec("mid3v2 -a '$Artist' -A 'Moerderische Cote d Azur' -t '$Titel' -T $Track -g 101 '$Datei'");
714742

@@ -843,6 +871,4 @@ function scan_dir($dir, $type=array(),$only=FALSE, $allFiles=FALSE, $recursive=T
843871
return $pictures;
844872

845873
}
846-
847-
848874
?>

‎mid3TagMp3AudioBook.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ function ladenein() { document.load.style.display = "block"; }
9595

9696
if (isset($_POST["relpfad"]))
9797
$relpfad = $_POST["relpfad"];
98+
if(substr($relpfad, -1, 1) != "/" && strlen($relpfad) > 1)
99+
$relpfad = $relpfad . "/";
98100

99101
if(isset($_POST["Xartist"]))
100102
$Xartist = "checked";
@@ -119,10 +121,10 @@ function ladenein() { document.load.style.display = "block"; }
119121
$album = $_POST["album"];
120122
if(!empty($_POST["titel"]))
121123
$titel = $_POST["titel"];
122-
if(!empty($_POST["track"]))
123-
$track = $_POST["track"];
124-
if(!empty($_POST["genre"]))
125-
$genre = $_POST["genre"];
124+
if(!empty(@$_POST["track"]) || @$_POST["track"] == 0)
125+
$track = @$_POST["track"];
126+
if(!empty(@$_POST["genre"]) || @$_POST["genre"] == 0)
127+
$genre = @$_POST["genre"];
126128
if(!empty($_POST["year"]))
127129
$year = $_POST["year"];
128130
if(!empty($_POST["comment"]))
@@ -219,6 +221,8 @@ function ladenein() { document.load.style.display = "block"; }
219221
if(isset($_POST["Xalbum"]))
220222
$Xalbum = $_POST["Xalbum"];
221223

224+
if(substr($relpfad, -1, 1) != "/" && strlen($relpfad) > 1)
225+
$relpfad = $relpfad . "/";
222226
$batch = scan_dir($relpfad, $fileTyp, TRUE, FALSE, TRUE, $onlyDir, $dateien);
223227

224228
if($batch == false) {

‎mid3TagMp3AudioBookP1.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ function ladenein() { document.load.style.display = "block"; }
9595

9696
if (isset($_POST["relpfad"]))
9797
$relpfad = $_POST["relpfad"];
98+
if(substr($relpfad, -1, 1) != "/" && strlen($relpfad) > 1)
99+
$relpfad = $relpfad . "/";
98100

99101
if(isset($_POST["Xartist"]))
100102
$Xartist = "checked";
@@ -119,10 +121,10 @@ function ladenein() { document.load.style.display = "block"; }
119121
$album = $_POST["album"];
120122
if(!empty($_POST["titel"]))
121123
$titel = $_POST["titel"];
122-
if(!empty($_POST["track"]))
123-
$track = $_POST["track"];
124-
if(!empty($_POST["genre"]))
125-
$genre = $_POST["genre"];
124+
if(!empty(@$_POST["track"]) || @$_POST["track"] == 0)
125+
$track = @$_POST["track"];
126+
if(!empty(@$_POST["genre"]) || @$_POST["genre"] == 0)
127+
$genre = @$_POST["genre"];
126128
if(!empty($_POST["year"]))
127129
$year = $_POST["year"];
128130
if(!empty($_POST["comment"]))
@@ -220,6 +222,8 @@ function ladenein() { document.load.style.display = "block"; }
220222
if(isset($_POST["Xalbum"]))
221223
$Xalbum = $_POST["Xalbum"];
222224

225+
if(substr($relpfad, -1, 1) != "/" && strlen($relpfad) > 1)
226+
$relpfad = $relpfad . "/";
223227
$batch = scan_dir($relpfad, $fileTyp, TRUE, FALSE, TRUE, $onlyDir, $dateien);
224228

225229
if($batch == false) {

0 commit comments

Comments
 (0)