piwigo/PiwigoDirectoryUploader
2
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

automatically add the rpc php part to the url

Browse Source
This commit is contained in:
Philipp Häfelfinger 2019-02-24 23:39:55 +01:00
parent b6ba48b2ab
commit f65698c587
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/defaultConfig.ini
View File

@ -3,5 +3,5 @@ allowUnknownFlags = false # Don't terminate the app if ini file contains unknow
configUpdateInterval = 0s # Update interval for re-reading config file set via -config flag. Zero disables config file re-reading. configUpdateInterval = 0s # Update interval for re-reading config file set via -config flag. Zero disables config file re-reading.
imagesRootPath = # This is the images root path that should be mirrored to piwigo. imagesRootPath = # This is the images root path that should be mirrored to piwigo.
piwigoPassword = # This is password to the given username. piwigoPassword = # This is password to the given username.
piwigoUrl = # The root url to your piwigo installation. piwigoUrl = # The root url without tailing slash to your piwigo installation.
piwigoUser = # The username to use during sync. piwigoUser = # The username to use during sync.

5
internal/app/app.go
View File

@ -3,6 +3,7 @@ package app
import ( import (
"errors" "errors"
"flag" "flag"
"fmt"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"haefelfinger.net/piwigo/DirectoriesToAlbums/internal/pkg/localFileStructure" "haefelfinger.net/piwigo/DirectoriesToAlbums/internal/pkg/localFileStructure"
"haefelfinger.net/piwigo/DirectoriesToAlbums/internal/pkg/piwigo/authentication" "haefelfinger.net/piwigo/DirectoriesToAlbums/internal/pkg/piwigo/authentication"
@ -11,7 +12,7 @@ import (
var ( var (
imagesRootPath = flag.String("imagesRootPath", "", "This is the images root path that should be mirrored to piwigo.") imagesRootPath = flag.String("imagesRootPath", "", "This is the images root path that should be mirrored to piwigo.")
piwigoUrl = flag.String("piwigoUrl", "", "The root url to your piwigo installation.") piwigoUrl = flag.String("piwigoUrl", "", "The root url without tailing slash to your piwigo installation.")
piwigoUser = flag.String("piwigoUser", "", "The username to use during sync.") piwigoUser = flag.String("piwigoUser", "", "The username to use during sync.")
piwigoPassword = flag.String("piwigoPassword", "", "This is password to the given username.") piwigoPassword = flag.String("piwigoPassword", "", "This is password to the given username.")
) )
@ -87,7 +88,7 @@ func configureContext() (*AppContext, error) {
context := new(AppContext) context := new(AppContext)
context.LocalRootPath = *imagesRootPath context.LocalRootPath = *imagesRootPath
context.Piwigo = new(authentication.PiwigoContext) context.Piwigo = new(authentication.PiwigoContext)
context.Piwigo.Url = *piwigoUrl context.Piwigo.Url = fmt.Sprintf("%s/ws.php?format=json", *piwigoUrl)
context.Piwigo.Username = *piwigoUser context.Piwigo.Username = *piwigoUser
context.Piwigo.Password = *piwigoPassword context.Piwigo.Password = *piwigoPassword