1
=== modified file 'src/app/qml/ui/FolderListPage.qml'
2
--- src/app/qml/ui/FolderListPage.qml	2015-01-06 23:24:33 +0000
3
+++ src/app/qml/ui/FolderListPage.qml	2015-02-22 10:24:24 +0000
4
@@ -383,11 +383,28 @@
5
383
383
6
384
    function getArchiveType(fileName) {
384
    function getArchiveType(fileName) {
7
385
        var splitName = fileName.split(".")
385
        var splitName = fileName.split(".")
8
386
9
387
        if (splitName.length <= 1) { // To sort out files simply named "zip" or "tar"
10
388
            return ""
11
389
        }
12
390
13
386
        var fileExtension = splitName[splitName.length - 1]
391
        var fileExtension = splitName[splitName.length - 1]
14
387
        if (fileExtension === "zip") {
392
        if (fileExtension === "zip") {
15
388
            return "zip"
393
            return "zip"
16
389
        } else if (fileExtension === "tar") {
394
        } else if (fileExtension === "tar") {
17
390
            return "tar"
395
            return "tar"
18
396
        } else if (fileExtension === "gz") {
19
397
            if (splitName.length > 2 && splitName[splitName.length - 2] === "tar") {
20
398
                return "tar.gz"
21
399
            } else {
22
400
                return ""
23
401
            }
24
402
        } else if (fileExtension === "bz2") {
25
403
            if (splitName.length > 2 && splitName[splitName.length - 2] === "tar") {
26
404
                return "tar.bz2"
27
405
            } else {
28
406
                return ""
29
407
            }
30
391
        } else {
408
        } else {
31
392
            return ""
409
            return ""
32
393
        }
410
        }
33
@@ -938,7 +955,7 @@
34
938
        console.log("Extracting...")
955
        console.log("Extracting...")
35
939
956
36
940
        var parentDirectory = filePath.substring(0, filePath.lastIndexOf("/"))
957
        var parentDirectory = filePath.substring(0, filePath.lastIndexOf("/"))
38
941
        var fileNameWithoutExtension = fileName.substring(0, fileName.lastIndexOf("."))
958
        var fileNameWithoutExtension = fileName.substring(0, fileName.lastIndexOf(archiveType) - 1)
39
942
        var extractDirectory = parentDirectory + "/" + fileNameWithoutExtension
959
        var extractDirectory = parentDirectory + "/" + fileNameWithoutExtension
40
943
960
41
944
        // Add numbers if the directory already exist: myfile, myfile-1, myfile-2, etc.
961
        // Add numbers if the directory already exist: myfile, myfile-1, myfile-2, etc.
42
@@ -960,6 +977,10 @@
43
960
            archives.extractZip(filePath, extractDirectory)
977
            archives.extractZip(filePath, extractDirectory)
44
961
        } else if (archiveType === "tar") {
978
        } else if (archiveType === "tar") {
45
962
            archives.extractTar(filePath, extractDirectory)
979
            archives.extractTar(filePath, extractDirectory)
46
980
        } else if (archiveType === "tar.gz") {
47
981
            archives.extractGzipTar(filePath, extractDirectory)
48
982
        } else if (archiveType === "tar.bz2") {
49
983
            archives.extractBzipTar(filePath, extractDirectory)
50
963
        }
984
        }
51
964
    }
985
    }
52
965
986
53
966
987
54
=== modified file 'src/plugin/archives/archives.cpp'
55
--- src/plugin/archives/archives.cpp	2014-12-26 10:44:19 +0000
56
+++ src/plugin/archives/archives.cpp	2015-02-22 10:24:24 +0000
57
@@ -37,6 +37,24 @@
58
37
    extractArchive(program, arguments);
37
    extractArchive(program, arguments);
59
38
}
38
}
60
39
39
61
40
void Archives::extractGzipTar(const QString path, const QString destination)
62
41
{
63
42
    QString program = "tar";
64
43
    QStringList arguments;
65
44
    arguments << "xzf" << path << "-C" << destination;
66
45
67
46
    extractArchive(program, arguments);
68
47
}
69
48
70
49
void Archives::extractBzipTar(const QString path, const QString destination)
71
50
{
72
51
    QString program = "tar";
73
52
    QStringList arguments;
74
53
    arguments << "xjf" << path << "-C" << destination;
75
54
76
55
    extractArchive(program, arguments);
77
56
}
78
57
79
40
void Archives::extractArchive(const QString program, const QStringList arguments)
58
void Archives::extractArchive(const QString program, const QStringList arguments)
80
41
{
59
{
81
42
    if (_process != nullptr && _process->state() == QProcess::ProcessState::Running) {
60
    if (_process != nullptr && _process->state() == QProcess::ProcessState::Running) {
82
43
61
83
=== modified file 'src/plugin/archives/archives.h'
84
--- src/plugin/archives/archives.h	2014-12-26 10:44:19 +0000
85
+++ src/plugin/archives/archives.h	2015-02-22 10:24:24 +0000
86
@@ -29,6 +29,8 @@
87
29
public:
29
public:
88
30
    Q_INVOKABLE void extractZip(const QString path, const QString destination);
30
    Q_INVOKABLE void extractZip(const QString path, const QString destination);
89
31
    Q_INVOKABLE void extractTar(const QString path, const QString destination);
31
    Q_INVOKABLE void extractTar(const QString path, const QString destination);
90
32
    Q_INVOKABLE void extractGzipTar(const QString path, const QString destination);
91
33
    Q_INVOKABLE void extractBzipTar(const QString path, const QString destination);
92
32
    Q_INVOKABLE void cancelArchiveExtraction();
34
    Q_INVOKABLE void cancelArchiveExtraction();
93
33
35
94
34
signals:
36
signals:
95
35
37
96
=== added file 'tests/autopilot/filemanager/content/Test.tar.bz2'
97
36
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
38
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
98
=== added file 'tests/autopilot/filemanager/content/Test.tar.gz'
99
37
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
39
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
100
=== modified file 'tests/autopilot/filemanager/tests/test_filemanager.py'
101
--- tests/autopilot/filemanager/tests/test_filemanager.py	2014-12-11 20:16:40 +0000
102
+++ tests/autopilot/filemanager/tests/test_filemanager.py	2015-02-22 10:24:24 +0000
103
@@ -50,6 +50,22 @@
104
50
             'extracted_text_file_name': 'CodeOfConduct.txt',
50
             'extracted_text_file_name': 'CodeOfConduct.txt',
105
51
             'extracted_image_dir_name': 'images',
51
             'extracted_image_dir_name': 'images',
106
52
             'extracted_image_name': 'ubuntu.jpg'
52
             'extracted_image_name': 'ubuntu.jpg'
107
53
             }),
108
54
109
55
        ('tar_gz',
110
56
            {'file_to_extract': 'Test.tar.gz',
111
57
             'extracted_dir_name': 'Test',
112
58
             'extracted_text_file_name': 'CodeOfConduct.txt',
113
59
             'extracted_image_dir_name': 'images',
114
60
             'extracted_image_name': 'ubuntu.jpg'
115
61
             }),
116
62
117
63
        ('tar_bz2',
118
64
            {'file_to_extract': 'Test.tar.bz2',
119
65
             'extracted_dir_name': 'Test',
120
66
             'extracted_text_file_name': 'CodeOfConduct.txt',
121
67
             'extracted_image_dir_name': 'images',
122
68
             'extracted_image_name': 'ubuntu.jpg'
123
53
             })
69
             })
124
54
    ]
70
    ]
125
55
71
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2015-02-22
Arto Jalkanen		2015-02-10	Approve on 2015-02-17
Review via email: mp+249250@code.launchpad.net