rusoto: Rename s3 as rusoto

Will disambiguate from any other S3 plugins, and matches how we name
other plugins (soup, lewton, rav1e, ...).

Fixes: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/issues/76

Cargo.toml

@@ -13,7 +13,7 @@ members = [
     "gst-plugin-sodium",
     "gst-plugin-cdg",
     "gst-plugin-rav1e",
-    "gst-plugin-s3",
+    "gst-plugin-rusoto",
     "gst-plugin-fallbackswitch",
     "gst-plugin-lewton",
 ]

gst-plugin-rusoto/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "gst-plugin-s3"
+name = "gst-plugin-rusoto"
 version = "0.6.0"
 authors = ["Arun Raghavan <arun@arunraghavan.net>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugin-rs"
@@ -20,7 +20,7 @@ percent-encoding = "2"
 tokio = "0.1"
 
 [lib]
-name = "gsts3"
+name = "gstrusoto"
 crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 

gst-plugin-rusoto/src/lib.rs

@@ -27,7 +27,7 @@ fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
 }
 
 gst_plugin_define!(
-    s3,
+    rusoto,
     env!("CARGO_PKG_DESCRIPTION"),
     plugin_init,
     concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")),

gst-plugin-rusoto/src/s3sink.rs

@@ -375,7 +375,7 @@ impl S3Sink {
 }
 
 impl ObjectSubclass for S3Sink {
-    const NAME: &'static str = "S3Sink";
+    const NAME: &'static str = "RusotoS3Sink";
     type ParentType = gst_base::BaseSink;
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
@@ -387,14 +387,14 @@ impl ObjectSubclass for S3Sink {
             settings: Mutex::new(Default::default()),
             state: Mutex::new(Default::default()),
             cat: gst::DebugCategory::new(
-                "s3sink",
+                "rusotos3sink",
                 gst::DebugColorFlags::empty(),
                 Some("Amazon S3 Sink"),
             ),
             canceller: Mutex::new(None),
             runtime: runtime::Builder::new()
                 .core_threads(1)
-                .name_prefix("S3-sink-runtime")
+                .name_prefix("rusotos3sink-runtime")
                 .build()
                 .unwrap(),
             client: Mutex::new(S3Client::new(Region::default())),
@@ -478,7 +478,7 @@ impl BaseSinkImpl for S3Sink {
     fn start(&self, _element: &gst_base::BaseSink) -> Result<(), gst::ErrorMessage> {
         let mut state = self.state.lock().unwrap();
         if let State::Started(_) = *state {
-            unreachable!("S3Sink already started");
+            unreachable!("RusotoS3Sink already started");
         }
 
         *state = State::Started(self.start()?);
@@ -560,7 +560,7 @@ impl BaseSinkImpl for S3Sink {
 pub fn register(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
     gst::Element::register(
         Some(plugin),
-        "s3sink",
+        "rusotos3sink",
         gst::Rank::Primary,
         S3Sink::get_type(),
     )

gst-plugin-rusoto/src/s3src.rs

@@ -222,7 +222,7 @@ impl S3Src {
 }
 
 impl ObjectSubclass for S3Src {
-    const NAME: &'static str = "S3Src";
+    const NAME: &'static str = "RusotoS3Src";
     type ParentType = gst_base::BaseSrc;
     type Instance = gst::subclass::ElementInstanceStruct<Self>;
     type Class = subclass::simple::ClassStruct<Self>;
@@ -234,13 +234,13 @@ impl ObjectSubclass for S3Src {
             url: Mutex::new(None),
             state: Mutex::new(StreamingState::Stopped),
             cat: gst::DebugCategory::new(
-                "s3src",
+                "rusotos3src",
                 gst::DebugColorFlags::empty(),
                 Some("Amazon S3 Source"),
             ),
             runtime: runtime::Builder::new()
                 .core_threads(1)
-                .name_prefix("gst-s3-tokio")
+                .name_prefix("rusotos3src-runtime")
                 .build()
                 .unwrap(),
             canceller: Mutex::new(None),
@@ -353,7 +353,7 @@ impl BaseSrcImpl for S3Src {
         let state = self.state.lock().unwrap();
 
         if let StreamingState::Started { .. } = *state {
-            unreachable!("S3Src is already started");
+            unreachable!("RusotoS3Src is already started");
         }
 
         /* Drop the lock as self.head() needs it */
@@ -448,5 +448,10 @@ impl BaseSrcImpl for S3Src {
 }
 
 pub fn register(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
-    gst::Element::register(Some(plugin), "s3src", gst::Rank::Primary, S3Src::get_type())
+    gst::Element::register(
+        Some(plugin),
+        "rusotos3src",
+        gst::Rank::Primary,
+        S3Src::get_type(),
+    )
 }