updates cached list, add back http mirror and modifing script (which works better but slowly)

2 files changed, 265 insertions, 77 deletions

diff --git a/lib/Downloads.php b/lib/Downloads.php
index 534cd5e0f..a44404ea0 100644
--- a/lib/Downloads.php
+++ b/lib/Downloads.php
@@ -125,7 +125,10 @@ class Downloads
                     );
 		   
 		    $torrent =$item['url'].'/iso/3/torrents/Mageia-3-LiveDVD-KDE4-x86_64-DVD.torrent' ;
-		    if (file_exists($torrent)){
+		    if (false === file_get_contents($torrent)){
+			echo "down $torrent \n";
+			} else { 
+			echo "Up $torrent \n";
 
 	            $mirrors[$m['country']][]           = $item;
                     $mirrors['_C:' . $m['continent']][] = $item;
diff --git a/lib/cached.list.php b/lib/cached.list.php
index 90a687dcb..fcd221cfd 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -6,8 +6,29 @@
       'city' => '?',
       'continent' => 'NA',
       'zone' => 'US',
+      'url' => 'http://mirrors.kernel.org/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Kansas City',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'http://mirror.9nav.com/mageia',
+    ),
+    2 => 
+    array (
+      'city' => '?',
+      'continent' => 'NA',
+      'zone' => 'US',
       'url' => 'ftp://mirrors.kernel.org/mageia',
     ),
+    3 => 
+    array (
+      'city' => 'Lenoir',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'http://mirror.dacentec.com/mageia',
+    ),
   ),
   '_C:NA' => 
   array (
@@ -16,126 +37,262 @@
       'city' => '?',
       'continent' => 'NA',
       'zone' => 'US',
-      'url' => 'ftp://mirrors.kernel.org/mageia',
+      'url' => 'http://mirrors.kernel.org/mageia',
     ),
     1 => 
     array (
       'city' => 'Toronto',
       'continent' => 'NA',
       'zone' => 'CA',
+      'url' => 'http://mageia.webconquest.com',
+    ),
+    2 => 
+    array (
+      'city' => 'Toronto',
+      'continent' => 'NA',
+      'zone' => 'CA',
       'url' => 'ftp://mageia.webconquest.com',
     ),
-  ),
-  'BR' => 
-  array (
-    0 => 
+    3 => 
     array (
-      'city' => 'Campinas',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'ftp://ftp.las.ic.unicamp.br/pub/mageia',
+      'city' => 'Kansas City',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'http://mirror.9nav.com/mageia',
     ),
-  ),
-  '_C:SA' => 
-  array (
-    0 => 
+    4 => 
     array (
-      'city' => 'Campinas',
-      'continent' => 'SA',
-      'zone' => 'BR',
-      'url' => 'ftp://ftp.las.ic.unicamp.br/pub/mageia',
+      'city' => '?',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'ftp://mirrors.kernel.org/mageia',
     ),
-  ),
-  'TR' => 
-  array (
-    0 => 
+    5 => 
     array (
-      'city' => 'Ankara',
-      'continent' => 'AS',
-      'zone' => 'TR',
-      'url' => 'ftp://ftp.linux.org.tr/mageia',
+      'city' => 'Lenoir',
+      'continent' => 'NA',
+      'zone' => 'US',
+      'url' => 'http://mirror.dacentec.com/mageia',
     ),
   ),
-  '_C:AS' => 
+  'DE' => 
   array (
     0 => 
     array (
-      'city' => 'Ankara',
-      'continent' => 'AS',
-      'zone' => 'TR',
-      'url' => 'ftp://ftp.linux.org.tr/mageia',
+      'city' => 'Cologne',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://mirror.netcologne.de/mageia',
     ),
-  ),
-  'CA' => 
-  array (
-    0 => 
+    1 => 
     array (
-      'city' => 'Toronto',
-      'continent' => 'NA',
-      'zone' => 'CA',
-      'url' => 'ftp://mageia.webconquest.com',
+      'city' => 'Hermsdorf',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://mirror.tuxinator.org/mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'Cologne',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'ftp://mirror.netcologne.de/mageia',
     ),
   ),
-  'NL' => 
+  '_C:EU' => 
   array (
     0 => 
     array (
+      'city' => 'Cologne',
+      'continent' => 'EU',
+      'zone' => 'DE',
+      'url' => 'http://mirror.netcologne.de/mageia',
+    ),
+    1 => 
+    array (
       'city' => 'Enschede',
       'continent' => 'EU',
       'zone' => 'NL',
-      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
+      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-  ),
-  '_C:EU' => 
-  array (
-    0 => 
+    2 => 
     array (
       'city' => 'Enschede',
       'continent' => 'EU',
       'zone' => 'NL',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    1 => 
+    3 => 
     array (
-      'city' => 'Esslingen',
+      'city' => 'Hermsdorf',
       'continent' => 'EU',
       'zone' => 'DE',
-      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'url' => 'http://mirror.tuxinator.org/mageia',
     ),
-    2 => 
+    4 => 
     array (
       'city' => 'Lyon',
       'continent' => 'EU',
       'zone' => 'FR',
-      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
+      'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    3 => 
+    5 => 
     array (
-      'city' => 'Hermsdorf',
+      'city' => 'Paris',
       'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror.tuxinator.org/mageia',
+      'zone' => 'FR',
+      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    4 => 
+    6 => 
     array (
       'city' => 'Cologne',
       'continent' => 'EU',
       'zone' => 'DE',
       'url' => 'ftp://mirror.netcologne.de/mageia',
     ),
-    5 => 
+    7 => 
+    array (
+      'city' => 'Paris',
+      'continent' => 'EU',
+      'zone' => 'FR',
+      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+    ),
+    8 => 
     array (
       'city' => '?',
       'continent' => 'EU',
       'zone' => 'CZ',
       'url' => 'ftp://ftp.sh.cvut.cz/MIRRORS/mageia',
     ),
-    6 => 
+    9 => 
     array (
-      'city' => 'Paris',
+      'city' => '?',
       'continent' => 'EU',
-      'zone' => 'FR',
-      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'zone' => 'CZ',
+      'url' => 'http://mageia.supp.name',
+    ),
+    10 => 
+    array (
+      'city' => '?',
+      'continent' => 'EU',
+      'zone' => 'CZ',
+      'url' => 'http://ftp.sh.cvut.cz/MIRRORS/mageia',
+    ),
+  ),
+  'NL' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Enschede',
+      'continent' => 'EU',
+      'zone' => 'NL',
+      'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Enschede',
+      'continent' => 'EU',
+      'zone' => 'NL',
+      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
+    ),
+  ),
+  'CA' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Toronto',
+      'continent' => 'NA',
+      'zone' => 'CA',
+      'url' => 'http://mageia.webconquest.com',
+    ),
+    1 => 
+    array (
+      'city' => 'Toronto',
+      'continent' => 'NA',
+      'zone' => 'CA',
+      'url' => 'ftp://mageia.webconquest.com',
+    ),
+  ),
+  'BR' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Campinas',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'ftp://ftp.las.ic.unicamp.br/pub/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Campinas',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
+    ),
+  ),
+  '_C:SA' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Campinas',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'ftp://ftp.las.ic.unicamp.br/pub/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Campinas',
+      'continent' => 'SA',
+      'zone' => 'BR',
+      'url' => 'http://ftp.las.ic.unicamp.br/pub/mageia',
+    ),
+  ),
+  'TR' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Ankara',
+      'continent' => 'AS',
+      'zone' => 'TR',
+      'url' => 'ftp://ftp.linux.org.tr/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Ankara',
+      'continent' => 'AS',
+      'zone' => 'TR',
+      'url' => 'http://ftp.linux.org.tr/mageia',
+    ),
+  ),
+  '_C:AS' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Ankara',
+      'continent' => 'AS',
+      'zone' => 'TR',
+      'url' => 'ftp://ftp.linux.org.tr/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Ankara',
+      'continent' => 'AS',
+      'zone' => 'TR',
+      'url' => 'http://ftp.linux.org.tr/mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'Tsukuba',
+      'continent' => 'AS',
+      'zone' => 'JP',
+      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
+    ),
+    3 => 
+    array (
+      'city' => '石川',
+      'continent' => 'AS',
+      'zone' => 'JP',
+      'url' => 'http://ftp.jaist.ac.jp/pub/Linux/Mageia',
     ),
   ),
   'ZA' => 
@@ -147,6 +304,13 @@
       'zone' => 'ZA',
       'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
     ),
+    1 => 
+    array (
+      'city' => 'Stellenbosch',
+      'continent' => 'AF',
+      'zone' => 'ZA',
+      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
+    ),
   ),
   '_C:AF' => 
   array (
@@ -157,29 +321,29 @@
       'zone' => 'ZA',
       'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
     ),
+    1 => 
+    array (
+      'city' => 'Stellenbosch',
+      'continent' => 'AF',
+      'zone' => 'ZA',
+      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
+    ),
   ),
-  'DE' => 
+  'JP' => 
   array (
     0 => 
     array (
-      'city' => 'Esslingen',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'city' => 'Tsukuba',
+      'continent' => 'AS',
+      'zone' => 'JP',
+      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
     1 => 
     array (
-      'city' => 'Hermsdorf',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror.tuxinator.org/mageia',
-    ),
-    2 => 
-    array (
-      'city' => 'Cologne',
-      'continent' => 'EU',
-      'zone' => 'DE',
-      'url' => 'ftp://mirror.netcologne.de/mageia',
+      'city' => '石川',
+      'continent' => 'AS',
+      'zone' => 'JP',
+      'url' => 'http://ftp.jaist.ac.jp/pub/Linux/Mageia',
     ),
   ),
   'FR' => 
@@ -189,13 +353,20 @@
       'city' => 'Lyon',
       'continent' => 'EU',
       'zone' => 'FR',
-      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
+      'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
     1 => 
     array (
       'city' => 'Paris',
       'continent' => 'EU',
       'zone' => 'FR',
+      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+    ),
+    2 => 
+    array (
+      'city' => 'Paris',
+      'continent' => 'EU',
+      'zone' => 'FR',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
   ),
@@ -208,5 +379,19 @@
       'zone' => 'CZ',
       'url' => 'ftp://ftp.sh.cvut.cz/MIRRORS/mageia',
     ),
+    1 => 
+    array (
+      'city' => '?',
+      'continent' => 'EU',
+      'zone' => 'CZ',
+      'url' => 'http://mageia.supp.name',
+    ),
+    2 => 
+    array (
+      'city' => '?',
+      'continent' => 'EU',
+      'zone' => 'CZ',
+      'url' => 'http://ftp.sh.cvut.cz/MIRRORS/mageia',
+    ),
   ),
 ); ?>
\ No newline at end of file