Changeset 4668

Timestamp:

May 10, 2017, 1:35:05 PM (4 years ago)

Author:

Juanma

Message:

Added ubuntu screenshots

File:

• devtools/desktop_to_xml/desktop_to_xml.sh (modified) (6 diffs)

devtools/desktop_to_xml/desktop_to_xml.sh

@@ -28 +28 @@
 msg_select_pkg="\nSelect the name of the package to process\n"
 msg_desktop_not_found="\nDesktop file not found at %s. Process aborted.\n"
-msg_searching_img="\nSearching screenshots...\n"
+msg_searching_img="\nSearching screenshots in %s...\n"
 msg_image_found="\nScreenshoot %s finded for app %s\n"
 function usage_help
@@ -163 +163 @@
         [ -z $index ] && index=0
         installDir=${installDir/\**/}
-        [ -z $installDir ] && installDir='.'
+        [ -z "$installDir" ] && installDir='.'
         process_pkg $installDir
 }
@@ -227 +227 @@
                         printf("") > outFile
                         xmlFile=metainfoDir"/"array[1]".appdata.xml"
+                        print "XML: "xmlFile
                         print "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > xmlFile
                         print "<component type=\"desktop-application\">" >> xmlFile
@@ -364 +365 @@
 function get_screenshot
 {
-        printf "$msg_searching_img"
+        printf "$msg_searching_img" "debian"
         imageFound=0
         pkgName=${1/.desktop/}
         url="https://screenshots.debian.net/packages?page=1&search=${pkgName}&utf8=✓"
+        get_screenshot_from $url $pkgName
+        if [[ $imageFound == 0 ]]
+        then
+                printf "$msg_searching_img" "ubuntu"
+                url="http://screenshots.ubuntu.com/packages?page=1&search=${pkgName}&utf8=✓"
+                get_screenshot_from $url $pkgName
+        fi
+
+}
+
+function get_screenshot_from
+{
+        url=$1
+        baseUrl=${url/packages*/}
+        pkgName=$2
         outFile=$(mktemp)
-        wget  $url -o /dev/null -O $outFile
+        wget $url -t 2 -T 10 -o /dev/null -O $outFile
         if [ $? -eq 0 ]
         then
@@ -377 +393 @@
                         searchResult=${searchResult/href=\"\//}
                         searchResult=${searchResult/\"/}
-                        url="https://screenshots.debian.net/${searchResult}"
-                        wget  $url -o /tmp/log -O $outFile
+                        url=${baseUrl}${searchResult}
+                        wget $url -t 2 -T 10 -o /tmp/log -O $outFile
                         if [ $? -eq 0 ]
                         then
@@ -384 +400 @@
                                 imageFound=${imageFound/href=\"\//}
                                 imageFound=${imageFound/\"/}
-                                imageFound="https://screenshots.debian.net/${imageFound}"
+                                imageFound=${baseUrl}${imageFound}
                                 printf "$msg_image_found" $imageFound $pkgName
                         fi