Changeset 844

Timestamp:

2008-03-04 20:31:01 (10 months ago)

Author:

MaierMan

Message:

#168: import/export multiple links at a once
WIP: Import for metalink

Files:

• trunk/chrome/content/dta/manager.js (modified) (2 diffs)
• trunk/chrome/content/dta/manager.xul (modified) (1 diff)
• trunk/chrome/content/dta/manager/metalinker.js (modified) (4 diffs)
• trunk/chrome/content/dta/manager/metaselect.xul (modified) (1 diff)
• trunk/chrome/content/dta/manager/tree.js (modified) (3 diffs)

trunk/chrome/content/dta/manager.js

@@ -37 +37 @@
- * ***** END LICENSE BLOCK ***** */
- 
+const NS_DTA = 'http://www.downthemall.net/properties#';
+const NS_METALINKER = 'http://www.metalinker.org/';
+ 
+ 
-const NS_ERROR_MODULE_NETWORK = 0x804B0000;
-const NS_ERROR_BINDING_ABORTED = NS_ERROR_MODULE_NETWORK + 2;
@@ -2473 +2477 @@
-                        e.referrer
-                );
+                if (e.startDate) {
+                        d.startDate = e.startDate;
+                }
-                if (e.url.hash) {
-                        d.hash = e.url.hash;

trunk/chrome/content/dta/manager.xul

@@ -102 +102 @@
-                                        <menuitem id="force" class="menuitem-iconic" label="&force.label;" image="chrome://dta/skin/manager/force.png" oncommand="Tree.force()" />                                      
-                                        <menuseparator />
+                                        <menuitem id="import" class="menuitem-iconic" label="&import.label;" image="chrome://dta/skin/manager/import.png" oncommand="Tree.import();"/>
-                                        <menuitem id="export" class="menuitem-iconic" label="&export.label;" image="chrome://dta/skin/manager/export.png" oncommand="Tree.export();"/>
-                                        <menuseparator />

trunk/chrome/content/dta/manager/metalinker.js

@@ -102 +102 @@
-        },
-        handleDownload: function ML_handleDownload(download) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        var domParser = new DOMParser();
-f
+aF
-                        var root = doc.documentElement;
-                        fiStream.close();
-                        
-                        try {
-                                file.remove(false);
-                        } catch (ex) {
-                                Debug.log("failed to remove metalink file!", ex);
-                        }
-                        
-                        
-                        if (root.nodeName != 'metalink' || root.getAttribute('version') != '3.0') {
-                                throw new Error(_('mlinvalid'));
-                        }
+        
+                        var aNum = Preferences.getDTA('numistance', 0);
+                        if (++aNum > 999) {
+                                aNum = 1;
+                        }
+                        Preferences.setDTA('numistance', aNum);
+        
+        
-                        var locale = this.locale.split('-').map(function(l) { return l.slice(0, 2).toLowerCase(); }).reverse();
-                        var downloads = [];
@@ -128 +143 @@
-                        for (var i = 0; i < files.length; ++i) {
-                                var file = files[i];
+                                var referrer = null;
+                                if (file.hasAttributeNS(NS_DTA, 'referrer')) {
+                                        referrer = file.getAttributeNS(NS_DTA, 'referrer');
+                                }
+                                else {
+                                        referrer = aReferrer;
+                                }
+                                var num = aNum;
+                                if (file.hasAttributeNS(NS_DTA, 'num')) {
+                                        try {
+                                                num = parseInt(file.getAttributeNS(NS_DTA, 'num'));
+                                        } catch (ex) { /* no-op */ }
+                                }
+                                var startDate = new Date();
+                                if (file.hasAttributeNS(NS_DTA, 'date')) {
+                                        try {
+                                                startDate = new Date(parseInt(file.getAttributeNS(NS_DTA, 'num')));
+                                        } catch (ex) { /* no-op */ }
+                                }                               
+                                        
-                                var urls = [];
-                                var urlNodes = this._getNodes(file, 'ml:resources/ml:url');
@@ -182 +217 @@
-                                downloads.push({
-                                        'url': new UrlManager(urls),
-
-
-
-
+
+
-                                        'description': desc,
+                                        'startDate': startDate,
-                                        'ultDescription': '',
-                                        'hash': hash,
@@ -294 +328 @@
-                }               
-        },
+        browseDir: function() {
+
+                // get a new directory
+                var newDir = Utils.askForDir(
+                        $('directory').value, // initialize dialog with the current directory
+                        _("validdestination")
+                );
+                // alright, we got something new, so lets set it.
+                if (newDir) {
+                        $('directory').value = newDir;
+                }
+        },      
-        accept: function ML_accept() {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        },
-        cancel: function ML_cancel() {

trunk/chrome/content/dta/manager/metaselect.xul

@@ -110 +110 @@
-        
-        <richlistbox context="context" id="downloads" class="metalinker" flex="1" suppressonselect="true"/>
+        
+        <hbox style="margin:7px 7px 3px 7px;" >
+                <vbox autostretch="never" flex="1">
+                        <caption label="&dest.caption;" />
+                        <hbox>
+                                <saveddropdown id="directory" preference="directory" flex="1"/>
+                                <toolbarbutton id="browsedir" oncommand="Metalinker.browseDir();" tooltiptext="&browse.tip;" />
+                        </hbox>
+                </vbox>
+                <vbox id="renamingbox">
+                        <caption label="&mask.label;:" />
+                        <hbox>
+                                <saveddropdown id="renaming" preference="renaming" flex="1" tooltiptext="&mask.tip;"/>
+                                <maskbutton/>
+                        </hbox>
+                </vbox>
+        </hbox> 
+        
-</dialog>

trunk/chrome/content/dta/manager/tree.js

@@ -38 +38 @@
-const ConverterOutputStream = Construct('@mozilla.org/intl/converter-output-stream;1', 'nsIConverterOutputStream', 'init');
-
-const NS_DTA = 'http://www.downthemall.net/properties#';
-const NS_METALINKER = 'http://www.metalinker.org/';
-
-DTA_include("common/verinfo.js");
- 
@@ -457 +454 @@
-                let fp = new FilePicker(window, _('exporttitle'), Ci.nsIFilePicker.modeSave);
-                fp.appendFilters(Ci.nsIFilePicker.filterHTML | Ci.nsIFilePicker.filterText);
-export
+
-                fp.defaultExtension = "metalink";
-                fp.filterIndex = 2;
@@ -548 +545 @@
-                
-                return true;
+        },
+        import: function T_import() {
+                try {
+                        if (!this._import()) {
+                                throw new Exception("Cannot import");
+                        }
+                }
+                catch (ex) {
+                        Debug.log("Cannot import downloads", ex);               
+                        DTA_alert(_('importtitle'), _('importfailed'));
+                }
+        },
+        _import: function T_import() {
+                let fp = new FilePicker(window, _('importtitle'), Ci.nsIFilePicker.modeOpen);
+                fp.appendFilters(Ci.nsIFilePicker.filterText);
+                fp.appendFilter(_('filtermetalink'), '*.metalink');
+                fp.defaultExtension = "metalink";
+                fp.filterIndex = 1;
+                
+                let rv = fp.show();
+                if (rv == Ci.nsIFilePicker.returnOK) {
+                        switch (fp.filterIndex) {
+                                case 0: return this._importText(fp.file);
+                                case 1: return this._importMetalink(fp.file);
+                        } 
+                }
+                return false;   
+        },
+        _importText: function T__importText() {
+        
+        },
+        _importMetalink: function T__importMetalink(file) {
+                try {
+                        DTA_include("dta/manager/metalinker.js");
+                        Metalinker.handleFile(file);
+                        return true;
+                }
+                catch (ex) {
+                        Debug.log("T__importMetalink", ex);
+                }       
+                return false;
-        },
-        showInfo: function T_showInfo() {