From b396d03cdf826401db7f28437e96d2b13c9d95a4 Mon Sep 17 00:00:00 2001
From: ffont <frederic.font@upf.edu>
Date: Wed, 19 Nov 2025 13:27:33 +0100
Subject: [PATCH 1/2] Update API client after removal of content search and
 combined search resources in Freesound API

---
 freesound.js | 448 +++++++++++++++++++++++++++++++++++++--------------
 test.html    | 134 ++++++++-------
 2 files changed, 400 insertions(+), 182 deletions(-)

diff --git a/freesound.js b/freesound.js
index b5105bb..43e1312 100644
--- a/freesound.js
+++ b/freesound.js
@@ -1,132 +1,340 @@
-var freesound = {
-    BASE_URI : "http://www.freesound.org/api",
-    apiKey : '',
-    _URI_SOUND : '/sounds/<sound_id>/',
-    _URI_SOUND_ANALYSIS : '/sounds/<sound_id>/analysis/',
-    _URI_SOUND_ANALYSIS_FILTER :'/sounds/<sound_id>/analysis/<filter>',
-    _URI_SIMILAR_SOUNDS : '/sounds/<sound_id>/similar/',
-    _URI_SEARCH : '/sounds/search/',
-    _URI_CONTENT_SEARCH : '/sounds/content_search/',
-    _URI_GEOTAG : '/sounds/geotag',
-    _URI_USER : '/people/<user_name>/',
-    _URI_USER_SOUNDS : '/people/<user_name>/sounds/',
-    _URI_USER_PACKS : '/people/<user_name>/packs/',
-    _URI_USER_BOOKMARKS : '/people/<username>/bookmark_categories',
-    _URI_BOOKMARK_CATEGORY_SOUNDS : '/people/<username>/bookmark_categories/<category_id>/sounds',
-    _URI_PACK : '/packs/<pack_id>/',
-    _URI_PACK_SOUNDS : '/packs/<pack_id>/sounds/',
-
-    _make_uri : function(uri,args){
-        for (a in args) {uri = uri.replace(/<[\w_]+>/, args[a])};
-        return this.BASE_URI+uri;
-    },
-    _make_request : function(uri,success,error,params,wrapper){
-        var fs = this;
-
-        if(uri.indexOf('?') == -1){ uri = uri+"?" }
-        uri = uri+"&api_key="+this.apiKey;
-        for(p in params){uri = uri+"&"+p+"="+params[p]};
-        var xhr;
-        try {xhr = new XMLHttpRequest()}
-        catch (e) {xhr = new ActiveXObject('Microsoft.XMLHTTP')};
-        xhr.onreadystatechange = function(){
-            if (xhr.readyState == 4 && xhr.status == 200){
-                var data = eval("(" + xhr.responseText + ")");
+(function () {
+
+    var freesound = function () {        
+        var authHeader = '';
+        var clientId = '';
+        var clientSecret = '';
+        var host = 'freesound.org';
+
+        var uris = {
+            base : 'https://'+host+'/apiv2',
+            search : '/search/',
+            sound : '/sounds/<sound_id>/',
+            soundAnalysis : '/sounds/<sound_id>/analysis/',
+            similarSounds : '/sounds/<sound_id>/similar/',
+            comments : '/sounds/<sound_id>/comments/',
+            download : '/sounds/<sound_id>/download/',
+            upload : '/sounds/upload/',
+            describe : '/sounds/<sound_id>/describe/',
+            pending : '/sounds/pending_uploads/',
+            bookmark : '/sounds/<sound_id>/bookmark/',
+            rate : '/sounds/<sound_id>/rate/',
+            comment : '/sounds/<sound_id>/comment/',
+            authorize : '/oauth2/authorize/',
+            logout : '/api-auth/logout/',
+            logoutAuthorize : '/oauth2/logout_and_authorize/',
+            me : '/me/',
+            user : '/users/<username>/',
+            userSounds : '/users/<username>/sounds/',
+            userPacks : '/users/<username>/packs/',
+            userBookmarkCategories : '/users/<username>/bookmark_categories/',
+            userBookmarkCategorySounds : '/users/<username>/bookmark_categories/<category_id>/sounds/',
+            pack : '/packs/<pack_id>/',
+            packSounds : '/packs/<pack_id>/sounds/',
+            packDownload : '/packs/<pack_id>/download/'            
+        };
+        
+        var makeUri = function (uri, args){
+            for (var a in args) {uri = uri.replace(/<[\w_]+>/, args[a]);}
+            return uris.base+uri;
+        };
+
+        var makeRequest = function (uri, success, error, params, wrapper, method, data, content_type){
+            if(method===undefined) method='GET';
+            if(!error)error = function(e){console.log(e)};
+            params = params || {};
+            params['format'] = 'json';
+            var fs = this;
+            var parse_response = function (response){
+                var data = eval("(" + response + ")");
                 success(wrapper?wrapper(data):data);
+            };                      
+            var paramStr = "";
+            for(var p in params){paramStr = paramStr+"&"+p+"="+params[p];}
+            if (paramStr){
+                uri = uri +"?"+ paramStr;
+            }
+            
+            if (typeof module !== 'undefined'){ // node.js
+                var http = require("http");
+                var options = {
+                    host: host,
+                    path: uri.substring(uri.indexOf("/",8),uri.length), // first '/' after 'http://'
+                    port: '80',
+                    method: method,
+                    headers: {'Authorization': authHeader}
+                };
+                var req = http.request(options,function(res){
+                	var result = '';
+                    res.setEncoding('utf8');            
+                    res.on('data', function (data){ 
+                        result += data;
+                    });
+                    res.on('end', function() {
+                    	if([200,201,202].indexOf(res.statusCode)>=0)
+                            success(wrapper?wrapper(data):data);
+                        else   
+                            error(data);
+                    });
+                });                
+                req.on('error', error).end();
             }
-            else if (xhr.readyState == 4 && xhr.status != 200){
-                error();
+            else{ // browser
+                var xhr;
+                try {xhr = new XMLHttpRequest();}
+                catch (e) {xhr = new ActiveXObject('Microsoft.XMLHTTP');}
+
+                xhr.onreadystatechange = function(){
+                    if (xhr.readyState === 4 && [200,201,202].indexOf(xhr.status)>=0){
+                        var data = eval("(" + xhr.responseText + ")");
+                        if(success) success(wrapper?wrapper(data):data);
+                    }
+                    else if (xhr.readyState === 4 && xhr.status !== 200){
+                        if(error) error(xhr);
+                    }
+                };
+                xhr.open(method, uri);
+                xhr.setRequestHeader('Authorization',authHeader);
+                if(content_type!==undefined)
+                    xhr.setRequestHeader('Content-Type',content_type);
+                xhr.send(data);
             }
+    };
+    var checkOauth = function(){
+        if(authHeader.indexOf("Bearer")==-1)
+            throw("Oauth authentication required");
+    };
+        
+    var makeFD = function(obj,fd){
+        if(!fd)
+            fd = new FormData(); 
+        for (var prop in obj){
+            fd.append(prop,obj[prop])
+        }
+        return fd;
+    };
+    
+    var search = function(options, uri, success, error,wrapper){  
+        if(options.analysis_file){ 
+                makeRequest(makeUri(uri), success,error,null, wrapper, 'POST',makeFD(options));
+        }
+        else{
+                makeRequest(makeUri(uri), success,error,options, wrapper);
+        }    
+    };
+        
+    var Collection = function (jsonObject){
+        var nextOrPrev = function (which,success,error){
+            makeRequest(which,success,error,{}, Collection);
+        };        
+        jsonObject.nextPage = function (success,error){
+            nextOrPrev(jsonObject.next,success,error);
+        };
+        jsonObject.previousPage = function (success,error){
+            nextOrPrev(jsonObject.previous,success,error);
+        };
+        jsonObject.getItem = function (idx){
+            return jsonObject.results[idx];
+        }
+        
+        return jsonObject;
+    };  
+        
+    var SoundCollection = function(jsonObject){
+        var collection = Collection(jsonObject);
+        collection.getSound = function (idx){
+            return new SoundObject(collection.results[idx]);
         };
-        console.log(uri);
-        xhr.open('GET', uri);
-        xhr.send(null);
-    },
-    _make_sound_object: function(snd){ // receives json object already "parsed" (via eval)
-        snd.get_analysis = function(showAll, filter, success, error){
+        return collection;
+    };
+    
+    var PackCollection = function(jsonObject){
+        var collection = Collection(jsonObject);
+        collection.getPack = function (idx){
+            return new PackObject(collection.results[idx]);
+        };   
+        return collection;
+    };
+        
+    var SoundObject = function (jsonObject){ 
+        jsonObject.getAnalysis = function(filter, success, error, showAll){
             var params = {all: showAll?1:0};
-            var base_uri = filter? freesound._URI_SOUND_ANALYSIS_FILTER:freesound._URI_SOUND_ANALYSIS;
-            freesound._make_request(freesound._make_uri(base_uri,[snd.id,filter?filter:""]),success,error);
+            makeRequest(makeUri(uris.soundAnalysis,[jsonObject.id,filter?filter:""]),success,error);
         };
-        snd.get_similar_sounds = function(success, error){
-            freesound._make_request(freesound._make_uri(freesound._URI_SIMILAR_SOUNDS,[snd.id]),success,error);
+
+        jsonObject.getSimilar = function (success, error, params){
+            makeRequest(makeUri(uris.similarSounds,[jsonObject.id]),success,error, params,SoundCollection);
         };
-        return snd;
-    },
-    _make_sound_collection_object: function(col){
-        var get_next_or_prev = function(which,success,error){
-            freesound._make_request(which,success,error,null);
-        }
-        col.next_page = function(success,error){get_next_or_prev(this.next,success,error)};
-        col.previous_page = function(success,error){get_next_or_prev(this.previous,success,error)};
-        return col;
-    },
-    _make_user_object: function(user){ // receives json object already "parsed" (via eval)
-        user.get_sounds = function(success, error){
-            freesound._make_request(freesound._make_uri(freesound._URI_USER_SOUNDS,[user.username]),success,error);
+ 
+       jsonObject.getComments = function (success, error){
+            makeRequest(makeUri(uris.comments,[jsonObject.id]),success,error,{},Collection);
+       };
+
+       jsonObject.download = function (targetWindow){// can be window, new, or iframe
+            checkOauth();
+            var uri = makeUri(uris.download,[jsonObject.id]);
+            targetWindow.location = uri;
+       };
+       
+	jsonObject.comment = function (commentStr, success, error){
+            checkOauth();
+            var data = new FormData();
+            data.append('comment', comment);
+            var uri = makeUri(uris.comment,[jsonObject.id]);
+            makeRequest(uri, success, error, {}, null, 'POST', data);
+        };
+
+        jsonObject.rate = function (rating, success, error){
+            checkOauth();
+            var data = new FormData();
+            data.append('rating', rating);
+            var uri = makeUri(uris.rate,[jsonObject.id]);
+            makeRequest(uri, success, error, {}, null, 'POST', data);
+        };
+
+        jsonObject.bookmark = function (name, category,success, error){
+            checkOauth();
+            var data = new FormData();
+            data.append('name', name);
+            if(category)
+                data.append("category",category);
+            var uri = makeUri(uris.bookmark,[jsonObject.id]);            
+            makeRequest(uri, success, error, {}, null, 'POST', data);
+        };
+        
+        jsonObject.edit = function (description,success, error){
+            checkOauth();
+            var data = makeFD(description);
+            var uri = makeUri(uris.edit,[jsonObject.id]);
+            makeRequest(uri, success, error, {}, null, 'POST', data);
+        };        
+
+        return jsonObject;
+    };
+    var UserObject = function(jsonObject){
+        jsonObject.sounds = function (success, error, params){
+            var uri = makeUri(uris.userSounds,[jsonObject.username]);
+            makeRequest(uri, success, error,params,SoundCollection);            
         };
-        user.get_packs = function(success, error){
-            freesound._make_request(freesound._make_uri(freesound._URI_USER_PACKS,[user.username]),success,error);
+
+        jsonObject.packs = function (success, error){
+            var uri = makeUri(uris.userPacks,[jsonObject.username]);
+            makeRequest(uri, success, error,{},PackCollection);                    
         };
-        user.get_bookmark_categories = function(success, error){
-            freesound._make_request(freesound._make_uri(freesound._URI_USER_BOOKMARKS,[user.username]),success,error);
+
+        jsonObject.bookmarkCategories = function (success, error){
+            var uri = makeUri(uris.userBookmarkCategories,[jsonObject.username]);
+            makeRequest(uri, success, error);                    
         };
-        user.get_bookmark_category_sounds = function(ref, success, error){
-            freesound._make_request(ref,success,error);
+
+        jsonObject.bookmarkCategorySounds = function (success, error,params){
+            var uri = makeUri(uris.userBookmarkCategorySounds,[jsonObject.username]);
+            makeRequest(uri, success, error,params);                    
         };
-        return user;
-    },
-    _make_pack_object: function(pack){ // receives json object already "parsed" (via eval)
-        pack.get_sounds = function(success, error){
-            freesound._make_request(freesound._make_uri(freesound._URI_PACK_SOUNDS,[pack.id]),success,error);
+
+        return jsonObject;
+    };
+        
+    var PackObject = function(jsonObject){
+        jsonObject.sounds = function (success, error){
+            var uri = makeUri(uris.packSounds,[jsonObject.id]);
+            makeRequest(uri, success, error,{},SoundCollection);            
         };
-        return pack;
-    },
-    /************* "Public" interface *****************/
-    get_from_ref : function(ref, success,error){
-        this._make_request(ref,success,error,{});
-    },
-    get_sound : function(soundId, success,error){
-        this._make_request(this._make_uri(this._URI_SOUND,[soundId]),success,error,{},this._make_sound_object);
-    },
-    get_user : function(username, success,error){
-        this._make_request(this._make_uri(this._URI_USER,[username]),success,error,{},this._make_user_object);
-    },
-    get_pack : function(packId, success,error){
-        this._make_request(this._make_uri(this._URI_PACK,[packId]),success,error,{},this._make_pack_object);
-    },
-    quick_search : function(query,success,error){
-        this.search(query,0,null,null,success,error);
-    },
-    search: function(query, page, filter, sort, num_results, fields, sounds_per_page, success, error){
-        var params = {q:(query ? query : " ")};
-        if(page)params.p=page;
-        if(filter)params.f = filter;
-        if(sort)params.s = sort;
-        if(num_results)params.num_results = num_results;
-        if(sounds_per_page)params.sounds_per_page = sounds_per_page;
-        if(fields)params.fields = fields;
-        this._make_request(this._make_uri(this._URI_SEARCH), success,error,params, this._make_sound_collection_object);
-    },
-    content_based_search: function(target, filter, max_results, fields, page, sounds_per_page, success, error){
-        var params = {};
-        if(page)params.p=page;
-        if(filter)params.f = filter;
-        if(target)params.t = target;
-        if(max_results)params.max_results = max_results;
-        if(sounds_per_page)params.sounds_per_page = sounds_per_page;
-        if(fields)params.fields = fields;
-        this._make_request(this._make_uri(this._URI_CONTENT_SEARCH), success,error,params, this._make_sound_collection_object);
-    },
-    geotag: function(min_lat, max_lat, min_lon, max_lon, page, fields, sounds_per_page, success, error){
-        var params = {};
-        if(min_lat)params.min_lat=min_lat;
-        if(max_lat)params.max_lat=max_lat;
-        if(min_lon)params.min_lon=min_lon;
-        if(max_lon)params.max_lon=max_lon;
-        if(page)params.p=page;
-        if(sounds_per_page)params.sounds_per_page = sounds_per_page;
-        if(fields)params.fields = fields;
-        this._make_request(this._make_uri(this._URI_GEOTAG), success,error,params, this._make_sound_collection_object);
-    }
-};
\ No newline at end of file
+        
+        jsonObject.download = function (targetWindow){// can be current or new window, or iframe
+            checkOauth();
+            var uri = makeUri(uris.packDownload,[jsonObject.id]);
+            targetWindow.location = uri;
+        };                
+        return jsonObject;
+    };
+                
+    return {
+            // authentication
+            setToken: function (token, type) {
+                authHeader = (type==='oauth' ? 'Bearer ':'Token ')+token;
+            },
+            setClientSecrets: function(id,secret){
+                clientId = id;
+                clientSecret = secret;
+            },
+
+            postAccessCode: function(code, success, error){
+                var post_url = uris.base+"/oauth2/access_token/"
+                var data = new FormData();
+                data.append('client_id',clientId);
+                data.append('client_secret',clientSecret);
+                data.append('code',code);
+                data.append('grant_type','authorization_code');
+                                
+                if (!success){
+                    success = function(result){
+                        setToken(result.access_token,'oauth');                        
+                    }
+                }
+                makeRequest(post_url, success, error, {}, null, 'POST', data);
+            },
+            search: function(query, options, success, error){                
+                options = options || {};
+                options.query = query ? query : " ";
+                search(options,uris.search,success,error,SoundCollection);
+            },                    
+            getSound: function(soundId,success, error){
+                makeRequest(makeUri(uris.sound, [soundId]), success,error,{}, SoundObject);
+            },
+
+            upload: function(audiofile,filename, description, success,error){
+                checkOauth();
+                var fd = new FormData();
+                fd.append('audiofile', audiofile,filename);                    
+                if(description){                    
+                    fd = makeFD(description,fd);
+                }
+                makeRequest(makeUri(uris.upload), success, error, {}, null, 'POST', fd);
+            },
+            describe: function(upload_filename , description, license, tags, success,error){
+                checkOauth();                
+                var fd = makeFD(description);
+                makeRequest(makeUri(uris.upload), success, error, {}, null, 'POST', fd);
+            },
+
+            getPendingSounds: function(success,error){
+                checkOauth();
+                makeRequest(makeUri(uris.pending), success,error,{});
+            },
+
+            // user resources
+            me: function(success,error){
+                checkOauth();
+                makeRequest(makeUri(uris.me), success,error);
+            },
+
+            getLoginURL: function(){
+                    if(clientId===undefined) throw "client_id was not set"
+                    var login_url = makeUri(uris.authorize);
+                    login_url += "?client_id="+clientId+"&response_type=code";
+                    return login_url;
+            },
+            getLogoutURL: function(){
+                var logout_url = makeUri(uris.logoutAuthorize);
+                logout_url += "?client_id="+clientId+"&response_type=code";
+                
+                return logout_url;
+            },
+
+            getUser: function(username, success,error){
+                makeRequest(makeUri(uris.user, [username]), success,error,{}, UserObject);
+            },
+        
+            getPack: function(packId,success,error){                
+                makeRequest(makeUri(uris.pack, [packId]), success,error,{}, PackObject);            
+            }        
+        }    
+    };
+
+    // compatible with CommonJS (node), AMD (requireJS) failing back to browser global 
+    // working with node requires web-audio-api module
+    if (typeof module !== 'undefined') {module.exports = freesound(); }
+    else if (typeof define === 'function' && typeof define.amd === 'object') { define("freesound", [], freesound); }
+    else {this.freesound = freesound(); }
+}());
diff --git a/test.html b/test.html
index f3a4dc9..7440a12 100644
--- a/test.html
+++ b/test.html
@@ -7,17 +7,19 @@
 </head>
 <body style="font-family: Helvetica">
 <script type="text/javascript">
-    window.onload = function(){
 
-        freesound.apiKey = "YOUR_API_KEY_HERE";
+    window.onload = function(){
 
+        freesound.setToken("YOUR_API_KEY_HERE"); // Replace with your API key
+        
         // Example 1
         // Example of geeting the info of a sound, queying for similar sounds (content based) and showing some analysis
         // features. Both similar sounds and analysis features are obtained with additional requests to the api.
-        freesound.get_sound(96541,
+        freesound.getSound(96541,
                 function(sound){
                     var msg = "";
-                    msg = "<h3>Getting info of sound: " + sound.original_filename + "</h3>";
+
+                    msg = "<h3>Getting info of sound: " + sound.name + "</h3>";
                     msg += "<strong>Url:</strong> " + sound.url + "<br>";
                     msg += "<strong>Description:</strong> " + sound.description + "<br>";
                     msg += "<strong>Tags:</strong><ul>";
@@ -25,97 +27,101 @@
                         msg += "<li>" + sound.tags[i] + "</li>";
                     }
                     msg += "</ul><br>";
-                    msg += "<img src='" + sound.waveform_l + "'>";
+                    msg += "<img src='" + sound.images.waveform_l + "'>";
 
-                    snd = new Audio(sound['preview-hq-mp3']);
+                    snd = new Audio(sound.previews['preview-hq-mp3']);
                     msg += '<br><button onclick="snd.play()">play</button><button onclick="snd.pause()">pause</button><br><br>';
-                    displayMessage(msg,'resp1')
+                    displayMessage(msg,'resp1');                    
 
                     // When we have printed some sound info, ask for analysis
-                    sound.get_analysis(true,null,function(analysis){
+                    sound.getAnalysis(null,function(analysis){
                         msg += "<strong>Mfccs:</strong><ul>";
-                        for (i in analysis.lowlevel.mfcc.mean){
-                            msg += "<li>" + analysis.lowlevel.mfcc.mean[i] + "</li>"
+                        for (i in analysis.mfcc){
+                            msg += "<li>" + analysis.mfcc[i] + "</li>"
                         }
                         msg += "</ul>";
                         displayMessage(msg,'resp1')
 
                         // When we have printed the analysis, ask for similar sounds
-                        sound.get_similar_sounds(function(sounds){
+                        sound.getSimilar(function(sounds){
                             msg += "<strong>Similar sounds:</strong><ul>";
-                            for (i in sounds.sounds){
-                                msg += "<li>" + sounds.sounds[i].original_filename + ": " + sounds.sounds[i].url + "</li>"
+                            for (i =0;i<=10;i++){                                
+                                var snd = sounds.getSound(i);
+                                msg += "<li>" + snd.id + ": " + snd.url + "</li>"
                             }
                             msg += "</ul>";
+
                             displayMessage(msg,'resp1')
-                        }, function(){ displayError("Similar sounds could not be retrieved.")});
-                    }, function(){ displayError("Analysis could not be retrieved.")});
+                        }, function(){ displayError("Similar sounds could not be retrieved.")}, {fields: "id,url"});
+                    }, function(){ displayError("Analysis could not be retrieved.")},
+                    true);// showAll
                 }, function(){ displayError("Sound could not be retrieved.")}
         );
-
+        
         // Example 2
-        // Example of searching sounds: querying the freesound db for sounds
+        // Example of searching sounds: querying the freesound db for sounds and retrieving some audio descriptors
         var query = "violoncello"
         var page = 1
         var filter = "tag:tenuto duration:[1.0 TO 15.0]"
         var sort = "rating_desc"
-        freesound.search(query, page, filter, sort, null, null, null,
+        var fields = 'id,name,url,analysis,username,spectral_centroid';
+        freesound.search(query, {page:page, filter:filter, sort:sort, fields:fields},
             function(sounds){
                 var msg = ""
                 msg = "<h3>Searching for: " + query + "</h3>"
                 msg += "With filter: " + filter +" and sorting: " + sort + "<br>"
-                msg += "Num results: " + sounds.num_results + "<br><ul>"
-                for (i in sounds.sounds){
-                    msg += "<li>" + sounds.sounds[i].original_filename + " by " + sounds.sounds[i].user.username + "</li>"
+                msg += "Num results: " + sounds.count + "<br><ul>"
+                for (i =0;i<=10;i++){  
+                    var snd = sounds.getSound(i);
+                    msg += "<li>" + snd.name + " by " + snd.username + " with spectral centroid mean value: " + snd.spectral_centroid.toString() + "</li>"
                 }
                 msg += "</ul>"
                 displayMessage(msg,"resp2")
             },function(){ displayError("Error while searching...")}
         );
-
-
+        
+        
         // Example 3
-        // Example of content based searching
-        var t = '.lowlevel.pitch_salience.mean:1.0 .lowlevel.pitch.mean:440'
-        var f = ".lowlevel.pitch.var:[* TO 20] AND .metadata.audio_properties.length:[1 TO 10]"
-        var sounds_per_page = 10
-        var fields = 'id,original_filename,url'
-        freesound.content_based_search(t,f,null,fields,null,sounds_per_page,
-            function(sounds){
+        // Example of filtering search results using audio descriptors
+        var filter = "spectral_centroid:[1000 TO 2000] AND duration:[1 TO 5] AND tag:single-note";
+        var page_size  = 10;
+        var fields = 'id,name,url,username,spectral_centroid,duration,tags';
+        freesound.search("", {filter:filter, page_size:page_size, fields:fields},
+            function(sounds){                
                 var msg = ""
-                msg = "<h3>Content based searching</h3>"
-                msg += "Target: " + t +"<br>"
-                msg += "Filter: " + f +"<br>"
+                msg = "<h3>Filtering by audio descriptors and metadata</h3>"
+                msg += "Filter: " + filter +"<br>"
                 msg += "Fields: " + fields +"<br>"
-                msg += "Num results: " + sounds.num_results + "<br><ul>"
-                msg += "<li> ---------- PAGE 1 ---------- </li>"
-                for (i in sounds.sounds){
-                    msg += "<li>" +  sounds.sounds[i].id.toString(10) + " | " + sounds.sounds[i].original_filename + " | " + sounds.sounds[i].url + "</li>"
+                msg += "Num results: " + sounds.count + "<br><ul>"
+                msg += "---------- PAGE 1 ----------"
+                for (i in sounds.results){                                        
+                    msg += "<pre>" +  JSON.stringify(sounds.results[i], null, 2) + "</pre>"
                 }
-                msg += "</ul>"
                 displayMessage(msg,"resp3")
 
                 // Once we got the first page of results, go to the following one
-                sounds.next_page(
+                sounds.nextPage(
                         function(sounds){
-                            msg += "<ul><li> ---------- PAGE 2 ---------- </li>"
-                            for (i in sounds.sounds){
-                                msg += "<li>" +  sounds.sounds[i].id.toString(10) + " | " + sounds.sounds[i].original_filename + " | " + sounds.sounds[i].url + "</li>"
+                            msg += "---------- PAGE 2 ----------"
+                            for (i in sounds.results){
+                                var j = parseInt(i);
+                                msg += "<pre>" +  JSON.stringify(sounds.results[j], null, 2) + "</pre>"
                             }
-                            msg += "</ul>"
                             displayMessage(msg,"resp3")
                         },
                         function(){ displayError("Error getting next page...")})
-            },function(){ displayError("Error while content based searching...")}
+            },function(e){ console.log(e)}
         );
 
+        
         // Example 4
         // Example of geoquerying
-        var min_lat = 41.3265528618605
-        var max_lat = 41.4504467428547
-        var min_lon = 2.005176544189453
-        var max_lon = 2.334766387939453
-        freesound.geotag(min_lat, max_lat, min_lon, max_lon, null, null, null,
+        var min_lat = 41.3265528618605;
+        var max_lat = 41.4504467428547;
+        var min_lon = 2.005176544189453;
+        var max_lon = 2.334766387939453;
+        filterString = "geotag:\"Intersects("+min_lon.toFixed(3)+" "+min_lat.toFixed(3)+" "+max_lon.toFixed(3)+" "+max_lat.toFixed(3)+")\"";
+        freesound.search("",{filter:filterString, fields:fields},
                 function(sounds){
                     var msg = ""
                     msg = "<h3>Geoquerying</h3>"
@@ -123,30 +129,34 @@
                     msg += "Max lat: " + max_lat +"<br>"
                     msg += "Min lon: " + min_lon +"<br>"
                     msg += "Max lon: " + max_lon +"<br>"
-                    msg += "Num results: " + sounds.num_results + "<br><ul>"
-                    for (i in sounds.sounds){
-                        msg += "<li>" +  sounds.sounds[i].id.toString(10) + " | " + sounds.sounds[i].original_filename + " | " + sounds.sounds[i].url + "</li>"
+                    msg += "Num results: " + sounds.count + "<br><ul>"
+                    for (i in sounds.results){
+                        msg += "<li>" +  sounds.results[i].id + " | " + 
+                            sounds.results[i].name + " | " + 
+                            sounds.results[i].url + "</li>";
                     }
                     msg += "</ul>"
                     displayMessage(msg,"resp4")
-                },function(){ displayError("Error while geoquerying...")}
+                },function(err){ console.log(err);displayError("Error while geoquerying...")}
         );
-
-        freesound.get_user("Jovica",
+        
+        freesound.getUser("Jovica",
             function(user){
-                var msg = ""
-                msg = "<h3>User info</h3>"
-                msg += "Username: " + user.username +"<br>"
+                var msg = "";
+                msg = "<h3>User info</h3>";
+                msg += "Username: " + user.username +"<br>";
                 // Get user sounds
-                user.get_sounds(
+                user.sounds(
                         function(sounds){
                             msg += "User sounds:<ul>"
-                            for (i in sounds.sounds){
-                                msg += "<li>" +  sounds.sounds[i].id.toString(10) + " | " + sounds.sounds[i].original_filename + " | " + sounds.sounds[i].url + "</li>"
+                            for (i in sounds.results){
+                                msg += "<li>" +  sounds.results[i].id + " | " + 
+                                    sounds.results[i].name + " | " + 
+                                    sounds.results[i].url + "</li>";
                             }
                             msg += "</ul>"
                             displayMessage(msg,"resp5")
-                        }
+                        },null,{fields:fields}
                 )
             }, function(){ displayError("Error getting user info...")}
         );

From fbe670a202bca4b2a1b349222b98876edcfd7ef5 Mon Sep 17 00:00:00 2001
From: ffont <frederic.font@upf.edu>
Date: Tue, 13 Jan 2026 17:12:29 +0100
Subject: [PATCH 2/2] Add example with sorting target based of audio
 descriptors

---
 test.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test.html b/test.html
index b2e085b..04d15cc 100644
--- a/test.html
+++ b/test.html
@@ -10,7 +10,7 @@
 
     window.onload = function(){
 
-        freesound.setToken("YOUR_API_KEY_HERE"); // Replace with your API key
+        freesound.setToken(""); // Replace with your API key
         
         // Example 1
         // Example of geeting the info of a sound, queying for similar sounds (content based) and showing some analysis
@@ -68,7 +68,6 @@
         freesound.search(query, {page:page, filter:filter, sort:sort, fields:fields},
             function(sounds){
                 var msg = ""
-                
                 msg = "<h3>Searching for: " + query + "</h3>"
                 msg += "With filter: " + filter +" and sorting: " + sort + "<br>"
                 msg += "Num results: " + sounds.count + "<br><ul>"
@@ -83,14 +82,15 @@
         
         
         // Example 3
-        // Example of filtering search results using audio descriptors
-        var filter = "spectral_centroid:[1000 TO 2000] AND duration:[1 TO 5] AND tag:single-note";
+        // Example of sorting sounds using some audio descriptors target, and filtering using audio descriptors
+        var sortingTarget = "pitch_salience:1.0,pitch:440"
+        var filter = "pitch_var:[0 TO 20] AND duration:[1 TO 10] AND tag:single-note";
         var page_size  = 10;
-        var fields = 'id,name,url,username,spectral_centroid,duration,tags';
-        freesound.search("", {filter:filter, page_size:page_size, fields:fields},
+        var fields = 'id,name,url,username,pitch,pitch_salience,pitch_var,duration,tags';
+        freesound.search("", {filter:filter, page_size:page_size, fields:fields, sort:sortingTarget},
             function(sounds){                
                 var msg = ""
-                msg = "<h3>Filtering by audio descriptors and metadata</h3>"
+                msg = "<h3>Searching sounds by specifying audio descriptors as a target, and filtering by audio descriptor values and metadata</h3>"
                 msg += "Filter: " + filter +"<br>"
                 msg += "Fields: " + fields +"<br>"
                 msg += "Num results: " + sounds.count + "<br><ul>"