diff --git a/Gopkg.lock b/Gopkg.lock index f17f9202..1e4cccfb 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -114,7 +114,7 @@ revision = "cc9eb1d7ad760af14e8f918698f745e80377af4f" [[projects]] - digest = "1:a087369bdc93f79d1b0efe6e60ebc7447b946b78c41607dfc4e417edf1d546c9" + digest = "1:0b15641db1c0286d88a87d5d3377837141322f4971c62c10c8eda26e1ee02b1f" name = "github.com/eschizoid/flixctl" packages = [ "aws/ebs", @@ -135,7 +135,7 @@ "torrent", ] pruneopts = "UT" - revision = "b4c00214fd0575829cffa23ae4c5c035e4c7efa0" + revision = "8a7d0678d98f2ccb4848cd896ba9952528587789" version = "1.2.0" [[projects]] @@ -370,7 +370,7 @@ "html/atom", ] pruneopts = "UT" - revision = "915654e7eabcea33ae277abbecf52f0d8b7a9fdc" + revision = "ed066c81e75eba56dd9bd2139ade88125b855585" [[projects]] branch = "master" diff --git a/README.adoc b/README.adoc index 6502962b..a01d8c50 100644 --- a/README.adoc +++ b/README.adoc @@ -113,8 +113,10 @@ make deploy-lambdas $ flixctl --help To Control The Following flixctl Components: * Library + * NZB Client + * Ombi * Plex - * Torrent + * Torrent Client Usage: flixctl [command] @@ -122,6 +124,8 @@ Usage: Available Commands: help Help about any command library To Control Media Library + nzb To Control Nzb Client + ombi To Control Ombi plex To Control Plex Media Center torrent To Control Torrent Client version To Get flixctl Version @@ -191,6 +195,38 @@ Flags: Use "flixctl torrent [command] --help" for more information about a command. ---- +==== ```flixctl ombi``` +---- +$ flixctl ombi --help +To Control Ombi + +Usage: + flixctl ombi [command] + +Available Commands: + request To Request Movies or Shows + +Flags: + -h, --help help for ombi + +Use "flixctl ombi [command] --help" for more information about a command. +---- +==== ```flixctl nzb``` +---- +$ flixctl nzb --help +To Control Nzb Client + +Usage: + flixctl nzb [command] + +Available Commands: + status To Show Nzb Status + +Flags: + -h, --help help for nzb + +Use "flixctl nzb [command] --help" for more information about a command. +---- === Examples ==== ```flixctl``` @@ -274,3 +310,11 @@ $ flixctl library upload \ --enable-batch-mode "false" \ --source-file "/plex/movies/trainspoting/Trainspoting.mkv" ---- +==== ```flixctl ombi``` +---- +$ flixctl ombi --help +---- +==== ```flixctl nzb``` +---- +$ flixctl nzb --help +---- diff --git a/cmd/nzb/root.go b/cmd/nzb/root.go new file mode 100644 index 00000000..9e43e1de --- /dev/null +++ b/cmd/nzb/root.go @@ -0,0 +1,19 @@ +package nzb + +import ( + "github.com/spf13/cobra" +) + +var ( + RootNzbCmd = &cobra.Command{ + Use: "nzb", + Short: "To Control Nzb Client", + } +) + +var ( + _ = func() struct{} { + RootNzbCmd.AddCommand(StatusNzbCmd) + return struct{}{} + }() +) diff --git a/cmd/nzb/status.go b/cmd/nzb/status.go new file mode 100644 index 00000000..8c19adaa --- /dev/null +++ b/cmd/nzb/status.go @@ -0,0 +1,13 @@ +package nzb + +import ( + "github.com/spf13/cobra" +) + +var StatusNzbCmd = &cobra.Command{ + Use: "status", + Short: "To Show Nzb Status", + Long: "to show the status of the nzb files being downloaded.", + Run: func(cmd *cobra.Command, args []string) { + }, +} diff --git a/cmd/ombi/request.go b/cmd/ombi/request.go new file mode 100644 index 00000000..c42f96fb --- /dev/null +++ b/cmd/ombi/request.go @@ -0,0 +1,13 @@ +package ombi + +import ( + "github.com/spf13/cobra" +) + +var RequestOmbiCmd = &cobra.Command{ + Use: "request", + Short: "To Request Movies or Shows", + Long: "to request movies or shows via ombi.", + Run: func(cmd *cobra.Command, args []string) { + }, +} diff --git a/cmd/ombi/root.go b/cmd/ombi/root.go new file mode 100644 index 00000000..939452ad --- /dev/null +++ b/cmd/ombi/root.go @@ -0,0 +1,19 @@ +package ombi + +import ( + "github.com/spf13/cobra" +) + +var ( + RootOmbiCmd = &cobra.Command{ + Use: "ombi", + Short: "To Control Ombi", + } +) + +var ( + _ = func() struct{} { + RootOmbiCmd.AddCommand(RequestOmbiCmd) + return struct{}{} + }() +) diff --git a/cmd/root.go b/cmd/root.go index 6720adbf..7b3152e7 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -6,6 +6,8 @@ import ( "os" "github.com/eschizoid/flixctl/cmd/library" + "github.com/eschizoid/flixctl/cmd/nzb" + "github.com/eschizoid/flixctl/cmd/ombi" "github.com/eschizoid/flixctl/cmd/plex" "github.com/eschizoid/flixctl/cmd/torrent" "github.com/spf13/cobra" @@ -15,9 +17,10 @@ var FlixctlCmd = &cobra.Command{ Use: "flixctl", Long: `To Control The Following flixctl Components: * Library + * NZB Client + * Ombi * Plex - * Tautulli - * Torrent`, + * Torrent Client`, } var ( @@ -41,7 +44,14 @@ var VersionCmd = &cobra.Command{ var ( _ = func() struct{} { - FlixctlCmd.AddCommand(VersionCmd, plex.RootPlexCmd, torrent.RootTorrentCmd, library.RootLibraryCmd) + FlixctlCmd.AddCommand( + VersionCmd, + library.RootLibraryCmd, + nzb.RootNzbCmd, + ombi.RootOmbiCmd, + plex.RootPlexCmd, + torrent.RootTorrentCmd, + ) return struct{}{} }() ) diff --git a/cmd/torrent/status.go b/cmd/torrent/status.go index 2f55c152..61a2fa3f 100644 --- a/cmd/torrent/status.go +++ b/cmd/torrent/status.go @@ -17,7 +17,7 @@ import ( var StatusTorrentCmd = &cobra.Command{ Use: "status", Short: "To Show Torrents Status", - Long: "to show the status of the torrents being downloaded", + Long: "to show the status of the torrents files being downloaded", Run: func(cmd *cobra.Command, args []string) { Status() }, diff --git a/infrastructure/database/storm/library.db b/infrastructure/database/storm/library.db index eabcd3fb..ad316166 100755 Binary files a/infrastructure/database/storm/library.db and b/infrastructure/database/storm/library.db differ diff --git a/infrastructure/hooks/library.sh b/infrastructure/hooks/library.sh index 44b8f219..73c0d354 100755 --- a/infrastructure/hooks/library.sh +++ b/infrastructure/hooks/library.sh @@ -22,7 +22,7 @@ case $# in download) /home/webhook/go/bin/flixctl library download \ --job-id "${JOB_ID}" \ - --target-file "/plex/movies/glacier/movie-$(date +%Y-%m-%d.%H:%M:%S).zip" + --target-file "/plex/glacier/downloads/movie-$(date +%Y-%m-%d.%H:%M:%S).zip" ;; initiate) /home/webhook/go/bin/flixctl library initiate \ diff --git a/vendor/github.com/eschizoid/flixctl/cmd/root.go b/vendor/github.com/eschizoid/flixctl/cmd/root.go index 6720adbf..7b3152e7 100644 --- a/vendor/github.com/eschizoid/flixctl/cmd/root.go +++ b/vendor/github.com/eschizoid/flixctl/cmd/root.go @@ -6,6 +6,8 @@ import ( "os" "github.com/eschizoid/flixctl/cmd/library" + "github.com/eschizoid/flixctl/cmd/nzb" + "github.com/eschizoid/flixctl/cmd/ombi" "github.com/eschizoid/flixctl/cmd/plex" "github.com/eschizoid/flixctl/cmd/torrent" "github.com/spf13/cobra" @@ -15,9 +17,10 @@ var FlixctlCmd = &cobra.Command{ Use: "flixctl", Long: `To Control The Following flixctl Components: * Library + * NZB Client + * Ombi * Plex - * Tautulli - * Torrent`, + * Torrent Client`, } var ( @@ -41,7 +44,14 @@ var VersionCmd = &cobra.Command{ var ( _ = func() struct{} { - FlixctlCmd.AddCommand(VersionCmd, plex.RootPlexCmd, torrent.RootTorrentCmd, library.RootLibraryCmd) + FlixctlCmd.AddCommand( + VersionCmd, + library.RootLibraryCmd, + nzb.RootNzbCmd, + ombi.RootOmbiCmd, + plex.RootPlexCmd, + torrent.RootTorrentCmd, + ) return struct{}{} }() ) diff --git a/vendor/github.com/eschizoid/flixctl/cmd/torrent/status.go b/vendor/github.com/eschizoid/flixctl/cmd/torrent/status.go index 2f55c152..61a2fa3f 100644 --- a/vendor/github.com/eschizoid/flixctl/cmd/torrent/status.go +++ b/vendor/github.com/eschizoid/flixctl/cmd/torrent/status.go @@ -17,7 +17,7 @@ import ( var StatusTorrentCmd = &cobra.Command{ Use: "status", Short: "To Show Torrents Status", - Long: "to show the status of the torrents being downloaded", + Long: "to show the status of the torrents files being downloaded", Run: func(cmd *cobra.Command, args []string) { Status() },