Merge lp:~nikwen/ubuntu-filemanager-app/compressed-tars into lp:ubuntu-filemanager-app

[Niklas Wenzel]

Added support for compressed tar archive extraction

Thanks to Carla Sella for fixing the failing autopilot tests before I even had the chance to look at the results. :)

Added support for compressed tar archive extraction

[Niklas Wenzel (nikwen)]

Let's see whether the autopilot test changes work. :D

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:370
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/452/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1042
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1042/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/74

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/452/rebuild

review: Needs Fixing (continuous-integration)

[Carla Sella (carla-sella)]

Tests are failing for the same problem as this mp: https://code.launchpad.net/~ajalkane/ubuntu-filemanager-app/sdcard-less-is-more/+merge/248444.

[Nicholas Skaggs (nskaggs)]

I'll just note tests in trunk do pass:

http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/453/

That said, there might need to be some changes made to tests in trunk.

[Carla Sella (carla-sella)]

I found the problem, the tar.bz2 and tar.gz files in the content directory are wrong, the content must be the same as the .tar and .zip ones otherwise the tests fail.
I tried to push my changes, but I do not have permission.

[Carla Sella (carla-sella)]

Just in case I put my changes here: https://code.launchpad.net/~carla-sella/junk/compressed-tars.

[Carla Sella (carla-sella)]

https://code.launchpad.net/~carla-sella/ubuntu-filemanager-app/compressed-tars/+merge/249564 you can merge this for the changes I made.

[Carla Sella (carla-sella)]

https://code.launchpad.net/~carla-sella/ubuntu-filemanager-app/compressed-tars/+merge/249567 sorry this is the correct one, non the prevoius one.

[Niklas Wenzel (nikwen)]

Just give me some time to look into it myself! :D :p

You're right, of course. I got the command for producing the archives wrong. Embarassing!

I'll happily merge your changes. ;)

[Carla Sella (carla-sella)]

:-) no worries, four eyes are better than two ;).

[Niklas Wenzel (nikwen)]

Let's wait for someone to review it now. Thanks again. ;)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:372
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/457/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1067
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1067/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/79

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/457/rebuild

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

Looks good to me.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-autolanding/184/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1098/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1098/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-autolanding/27

review: Needs Fixing (continuous-integration)

[Niklas Wenzel (nikwen)]

This looks like an error with resolving dependencies in the chroot.
I'll push a no-change commit to trigger automatic tests again.

[lp:~nikwen/ubuntu-filemanager-app/compressed-tars]

373. By Niklas Wenzel on 2015-02-22

No-change commit to trigger autopilot tests again

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:373
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/460/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2081
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2081/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/82

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/460/rebuild

review: Approve (continuous-integration)

[Niklas Wenzel (nikwen)]

So it worked this time. :)
Since I haven't changed anything since Arto's approval, I'll do a top-level approval myself now. Thank you to all who were involved. :)

=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml	2015-01-06 23:24:33 +0000
+++ src/app/qml/ui/FolderListPage.qml	2015-02-22 10:24:24 +0000
@@ -383,11 +383,28 @@
 
     function getArchiveType(fileName) {
         var splitName = fileName.split(".")
+
+        if (splitName.length <= 1) { // To sort out files simply named "zip" or "tar"
+            return ""
+        }
+
         var fileExtension = splitName[splitName.length - 1]
         if (fileExtension === "zip") {
             return "zip"
         } else if (fileExtension === "tar") {
             return "tar"
+        } else if (fileExtension === "gz") {
+            if (splitName.length > 2 && splitName[splitName.length - 2] === "tar") {
+                return "tar.gz"
+            } else {
+                return ""
+            }
+        } else if (fileExtension === "bz2") {
+            if (splitName.length > 2 && splitName[splitName.length - 2] === "tar") {
+                return "tar.bz2"
+            } else {
+                return ""
+            }
         } else {
             return ""
         }
@@ -938,7 +955,7 @@
         console.log("Extracting...")
 
         var parentDirectory = filePath.substring(0, filePath.lastIndexOf("/"))
-        var fileNameWithoutExtension = fileName.substring(0, fileName.lastIndexOf("."))
+        var fileNameWithoutExtension = fileName.substring(0, fileName.lastIndexOf(archiveType) - 1)
         var extractDirectory = parentDirectory + "/" + fileNameWithoutExtension
 
         // Add numbers if the directory already exist: myfile, myfile-1, myfile-2, etc.
@@ -960,6 +977,10 @@
             archives.extractZip(filePath, extractDirectory)
         } else if (archiveType === "tar") {
             archives.extractTar(filePath, extractDirectory)
+        } else if (archiveType === "tar.gz") {
+            archives.extractGzipTar(filePath, extractDirectory)
+        } else if (archiveType === "tar.bz2") {
+            archives.extractBzipTar(filePath, extractDirectory)
         }
     }
 

=== modified file 'src/plugin/archives/archives.cpp'
--- src/plugin/archives/archives.cpp	2014-12-26 10:44:19 +0000
+++ src/plugin/archives/archives.cpp	2015-02-22 10:24:24 +0000
@@ -37,6 +37,24 @@
     extractArchive(program, arguments);
 }
 
+void Archives::extractGzipTar(const QString path, const QString destination)
+{
+    QString program = "tar";
+    QStringList arguments;
+    arguments << "xzf" << path << "-C" << destination;
+
+    extractArchive(program, arguments);
+}
+
+void Archives::extractBzipTar(const QString path, const QString destination)
+{
+    QString program = "tar";
+    QStringList arguments;
+    arguments << "xjf" << path << "-C" << destination;
+
+    extractArchive(program, arguments);
+}
+
 void Archives::extractArchive(const QString program, const QStringList arguments)
 {
     if (_process != nullptr && _process->state() == QProcess::ProcessState::Running) {

=== modified file 'src/plugin/archives/archives.h'
--- src/plugin/archives/archives.h	2014-12-26 10:44:19 +0000
+++ src/plugin/archives/archives.h	2015-02-22 10:24:24 +0000
@@ -29,6 +29,8 @@
 public:
     Q_INVOKABLE void extractZip(const QString path, const QString destination);
     Q_INVOKABLE void extractTar(const QString path, const QString destination);
+    Q_INVOKABLE void extractGzipTar(const QString path, const QString destination);
+    Q_INVOKABLE void extractBzipTar(const QString path, const QString destination);
     Q_INVOKABLE void cancelArchiveExtraction();
 
 signals:

=== added file 'tests/autopilot/filemanager/content/Test.tar.bz2'
Binary files tests/autopilot/filemanager/content/Test.tar.bz2	1970-01-01 00:00:00 +0000 and tests/autopilot/filemanager/content/Test.tar.bz2	2015-02-22 10:24:24 +0000 differ
=== added file 'tests/autopilot/filemanager/content/Test.tar.gz'
Binary files tests/autopilot/filemanager/content/Test.tar.gz	1970-01-01 00:00:00 +0000 and tests/autopilot/filemanager/content/Test.tar.gz	2015-02-22 10:24:24 +0000 differ
=== modified file 'tests/autopilot/filemanager/tests/test_filemanager.py'
--- tests/autopilot/filemanager/tests/test_filemanager.py	2014-12-11 20:16:40 +0000
+++ tests/autopilot/filemanager/tests/test_filemanager.py	2015-02-22 10:24:24 +0000
@@ -50,6 +50,22 @@
              'extracted_text_file_name': 'CodeOfConduct.txt',
              'extracted_image_dir_name': 'images',
              'extracted_image_name': 'ubuntu.jpg'
+             }),
+
+        ('tar_gz',
+            {'file_to_extract': 'Test.tar.gz',
+             'extracted_dir_name': 'Test',
+             'extracted_text_file_name': 'CodeOfConduct.txt',
+             'extracted_image_dir_name': 'images',
+             'extracted_image_name': 'ubuntu.jpg'
+             }),
+
+        ('tar_bz2',
+            {'file_to_extract': 'Test.tar.bz2',
+             'extracted_dir_name': 'Test',
+             'extracted_text_file_name': 'CodeOfConduct.txt',
+             'extracted_image_dir_name': 'images',
+             'extracted_image_name': 'ubuntu.jpg'
              })
     ]