[pitivi: 7/11] Discoverer: rename addFile to addUri.

[Edward Hervey <edwardrv src gnome org>]

commit 7245b302b1f45ce304f87b9515688e002c86179d
Author: Alessandro Decina <alessandro d gmail com>
Date:   Wed May 6 16:39:56 2009 +0200

    Discoverer: rename addFile to addUri.
---
 pitivi/discoverer.py                 |   14 +++++++-------
 pitivi/sourcelist.py                 |    6 +++---
 pitivi/ui/netstream_managerdialog.py |    2 +-
 pitivi/ui/sourcelist.py              |    6 +++---
 pitivi/ui/webcam_managerdialog.py    |    2 +-
 tests/test_discoverer.py             |   32 ++++++++++++++++----------------
 6 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/pitivi/discoverer.py b/pitivi/discoverer.py
index 0139ec0..5ccaa9b 100644
--- a/pitivi/discoverer.py
+++ b/pitivi/discoverer.py
@@ -105,17 +105,17 @@ class Discoverer(Signallable, Loggable):
         for element in self.dynamic_elements:
             self.pipeline.remove(element)
 
-    def addFile(self, filename):
+    def addUri(self, uri):
         """ queue a filename to be discovered """
-        self.info("filename: %s", filename)
-        self.queue.append(filename)
+        self.info("filename: %s", uri)
+        self.queue.append(uri)
         if not self.working:
             self._startAnalysis()
 
-    def addFiles(self, filenames):
+    def addUris(self, uris):
         """ queue a list of filenames to be discovered """
-        self.info("filenames : %s", filenames)
-        self.queue.extend(filenames)
+        self.info("filenames : %s", uris)
+        self.queue.extend(uris)
         if self.queue and not self.working:
             self._startAnalysis()
 
@@ -499,6 +499,6 @@ if __name__ == '__main__':
     import gobject
 
     discoverer = Discoverer()
-    discoverer.addFiles(['file://%s' % i  for i in sys.argv[1:]])
+    discoverer.addUris(['file://%s' % i  for i in sys.argv[1:]])
     loop = gobject.MainLoop()
     loop.run()
diff --git a/pitivi/sourcelist.py b/pitivi/sourcelist.py
index 1b11ea8..78ad1be 100644
--- a/pitivi/sourcelist.py
+++ b/pitivi/sourcelist.py
@@ -107,7 +107,7 @@ class SourceList(Signallable, Loggable):
         if uri in self.sources.keys():
             return
         self.sources[uri] = None
-        self.discoverer.addFile(uri)
+        self.discoverer.addUri(uri)
 
     def addUris(self, uris):
         """ Add the list of uris to the list of sources, they will be discovered """
@@ -119,7 +119,7 @@ class SourceList(Signallable, Loggable):
                 self.sources[uri] = None
                 rlist.append(uri)
 
-        self.discoverer.addFiles(rlist)
+        self.discoverer.addUris(rlist)
 
     def addTmpUri(self, uri):
         """ Adds a temporary uri, will not be saved """
@@ -127,7 +127,7 @@ class SourceList(Signallable, Loggable):
         if uri in self.sources.keys():
             return
         self.tempsources[uri] = None
-        self.discoverer.addFile(uri)
+        self.discoverer.addUri(uri)
 
     def removeFactory(self, factory):
         """ Remove a file using it's objectfactory """
diff --git a/pitivi/ui/netstream_managerdialog.py b/pitivi/ui/netstream_managerdialog.py
index 2fcd34f..49ff081 100644
--- a/pitivi/ui/netstream_managerdialog.py
+++ b/pitivi/ui/netstream_managerdialog.py
@@ -137,7 +137,7 @@ class NetstreamManagerDialog(object):
         else:
             gst.debug("recording stopped")
             self.player.stopRecording()
-            self.sourcefactories.sourcelist.addFiles([self.filepath])
+            self.sourcefactories.sourcelist.addUris([self.filepath])
             self.capture_btn.set_label("Capture")
 
     def on_message(self, bus, message):
diff --git a/pitivi/ui/sourcelist.py b/pitivi/ui/sourcelist.py
index 52e59b3..74fb8bd 100644
--- a/pitivi/ui/sourcelist.py
+++ b/pitivi/ui/sourcelist.py
@@ -426,7 +426,7 @@ class SourceList(gtk.VBox, Loggable):
         self._importDialog.connect('close', self._dialogBoxCloseCb)
         self._importDialog.show()
 
-    def addFiles(self, files):
+    def addUris(self, files):
         """ Add files to the list """
         self.app.current.sources.addUris(files)
 
@@ -527,7 +527,7 @@ class SourceList(gtk.VBox, Loggable):
             if select_folders:
                 self.addFolders(filenames)
             else:
-                self.addFiles(filenames)
+                self.addUris(filenames)
             if self.app.settings.closeImportDialog:
                 dialogbox.destroy()
                 self._importDialog = None
@@ -700,7 +700,7 @@ class SourceList(gtk.VBox, Loggable):
                 directories = [incoming]
         if directories:
             self.addFolders(directories)
-        self.addFiles(filenames)
+        self.addUris(filenames)
 
     def _dndTreeBeginCb(self, unused_widget, context):
         self.info("tree drag_begin")
diff --git a/pitivi/ui/webcam_managerdialog.py b/pitivi/ui/webcam_managerdialog.py
index 697ef02..f2569c5 100644
--- a/pitivi/ui/webcam_managerdialog.py
+++ b/pitivi/ui/webcam_managerdialog.py
@@ -101,7 +101,7 @@ class WebcamManagerDialog(GladeWindow):
             gst.debug("recording stopped")
             self.player.stopRecording()
             # FIXME : use the generic way for adding a file
-            self.sourcefactories.addFiles([self.filepath])
+            self.sourcefactories.addUris([self.filepath])
             self.player.set_state(gst.STATE_PLAYING)
             self.record_btn.set_label("Start Recording")
 
diff --git a/tests/test_discoverer.py b/tests/test_discoverer.py
index b8b56d0..af7a265 100644
--- a/tests/test_discoverer.py
+++ b/tests/test_discoverer.py
@@ -28,7 +28,7 @@ from common import TestCase
 from pitivi.discoverer import Discoverer
 from pitivi.factories.file import FileSourceFactory, PictureFileSourceFactory
 
-class AddFilesStubDiscoverer(Discoverer):
+class AddUrisStubDiscoverer(Discoverer):
     analysis_scheduled = 0
 
     def _scheduleAnalysis(self):
@@ -39,11 +39,11 @@ class AddFilesStubDiscoverer(Discoverer):
         return Discoverer._finishAnalysis(self)
 
 class TestAnalysisQueue(TestCase):
-    def testAddFile(self):
-        discoverer = AddFilesStubDiscoverer()
+    def testAddUri(self):
+        discoverer = AddUrisStubDiscoverer()
         self.failIf(discoverer.working)
         # add a file, should start working
-        discoverer.addFile('meh')
+        discoverer.addUri('meh')
         self.failUnless(discoverer.working)
         self.failUnlessEqual(discoverer.analysis_scheduled, 1)
 
@@ -53,12 +53,12 @@ class TestAnalysisQueue(TestCase):
         self.failUnlessEqual(discoverer.analysis_scheduled, 0)
 
         # add another file, should start working
-        discoverer.addFile('meh1')
+        discoverer.addUri('meh1')
         self.failUnless(discoverer.working)
         self.failUnlessEqual(discoverer.analysis_scheduled, 1)
 
         # queue another while the first isn't finished yet
-        discoverer.addFile('meh2')
+        discoverer.addUri('meh2')
         # this shouldn't trigger a new analysis until the previous is done
         self.failUnless(discoverer.analysis_scheduled, 1)
 
@@ -133,7 +133,7 @@ class TestAnalysis(TestCase):
         def no_media_file_cb(disc, uri, error, error_debug):
             bag['error'] = error
 
-        self.discoverer.addFile('buh://asd')
+        self.discoverer.addUri('buh://asd')
         self.discoverer.connect('discovery-error', no_media_file_cb)
         self.discoverer._analyze()
         self.failUnlessEqual(bag['error'], 'No available source handler.')
@@ -146,7 +146,7 @@ class TestAnalysis(TestCase):
         def no_media_file_cb(disc, uri, error, error_debug):
             bag['error'] = error
 
-        self.discoverer.addFile('file://i/cant/possibly/exist/and/if/you/'
+        self.discoverer.addUri('file://i/cant/possibly/exist/and/if/you/'
             'really/have/a/file/named/like/this/you/deserve/a/faillure')
         self.discoverer.connect('discovery-error', no_media_file_cb)
         self.discoverer._analyze()
@@ -162,7 +162,7 @@ class TestAnalysis(TestCase):
             bag['error'] = error
 
         self.discoverer.connect('discovery-error', discovery_error_cb)
-        self.discoverer.addFile('foo')
+        self.discoverer.addUri('foo')
         self.failUnlessEqual(bag['error'], None)
         self.discoverer._analyze()
         # check that a timeout is scheduled once we start analyzing so we don't
@@ -172,7 +172,7 @@ class TestAnalysis(TestCase):
         self.failUnless(bag['error'])
 
         self.discoverer.timeout_expired = False
-        self.discoverer.addFile('foo')
+        self.discoverer.addUri('foo')
         self.discoverer._analyze()
         # at this point the timeout is scheduled but not expired, so the
         # discoverer should still be working
@@ -279,14 +279,14 @@ class TestAnalysis(TestCase):
         message = gst.message_new_error(src, gerror, 'debug1')
 
         self.failUnlessEqual(self.discoverer.error, None)
-        self.discoverer.addFile('popme')
+        self.discoverer.addUri('popme')
         self.discoverer._busMessageErrorCb(None, message)
         self.failUnlessEqual(dic['debug'], 'debug1')
 
         # errors shouldn't be overridden
         gerror = gst.GError(gst.STREAM_ERROR, gst.STREAM_ERROR_FAILED, 'muh')
         message = gst.message_new_error(src, gerror, 'debug2')
-        self.discoverer.addFile('popme')
+        self.discoverer.addUri('popme')
         self.discoverer._busMessageErrorCb(None, message)
         self.failUnlessEqual(dic['debug'], 'debug2')
 
@@ -387,7 +387,7 @@ class TestStateChange(TestCase):
         # no streams found
         message = gst.message_new_state_changed(self.src,
                 gst.STATE_READY, gst.STATE_PAUSED, gst.STATE_VOID_PENDING)
-        self.discoverer.addFile('illbepopped')
+        self.discoverer.addUri('illbepopped')
         self.failUnlessEqual(self.error, None)
         self.discoverer._busMessageStateChangedCb(None, message)
         self.failUnlessEqual(self.factories, [])
@@ -403,7 +403,7 @@ class TestStateChange(TestCase):
         self.failUnlessEqual(self.error, None)
         message = gst.message_new_state_changed(self.src,
                 gst.STATE_READY, gst.STATE_PAUSED, gst.STATE_VOID_PENDING)
-        self.discoverer.addFile('illbepopped')
+        self.discoverer.addUri('illbepopped')
         self.failUnlessEqual(self.error, None)
         self.discoverer._busMessageStateChangedCb(None, message)
         # should go to PLAYING to do thumbnails
@@ -423,7 +423,7 @@ class TestStateChange(TestCase):
         self.failUnlessEqual(self.error, None)
         message = gst.message_new_state_changed(self.src,
                 gst.STATE_READY, gst.STATE_PAUSED, gst.STATE_VOID_PENDING)
-        self.discoverer.addFile('illbepopped')
+        self.discoverer.addUri('illbepopped')
         self.failUnlessEqual(self.error, None)
         self.discoverer._busMessageStateChangedCb(None, message)
         self.failUnlessEqual(len(self.factories), 1)
@@ -446,7 +446,7 @@ class TestStateChange(TestCase):
         self.failUnlessEqual(self.error, None)
         message = gst.message_new_state_changed(self.src,
                 gst.STATE_READY, gst.STATE_PAUSED, gst.STATE_VOID_PENDING)
-        self.discoverer.addFile('illbepopped')
+        self.discoverer.addUri('illbepopped')
         self.failUnlessEqual(self.error, None)
         self.discoverer._busMessageStateChangedCb(None, message)
         # should go to PLAYING to do thumbnails