Skip to content
This repository has been archived by the owner on Sep 6, 2023. It is now read-only.

Commit

Permalink
Fix error on getting albums
Browse files Browse the repository at this point in the history
  • Loading branch information
canhlinh committed Sep 27, 2019
1 parent aef09b2 commit c4c30ee
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 6 deletions.
8 changes: 5 additions & 3 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ func (client *Client) DoQuery(endpoint string, query string) (io.ReadCloser, err
// GetAlbums gets all google photo albums
func (client *Client) GetAlbums() (Albums, error) {
log.Info("Request to get albums")
query := fmt.Sprintf(`[[["kbqDO","[]",null,"1"],["kbqDO","[[null,null,[null,[null,null,[null,true]]]]]",null,"2"],["Z5xsfc","[null,null,null,null,1]",null,"3"]]]`)
query := fmt.Sprintf(`[[["Z5xsfc","[null,null,null,null,1]",null,"3"]]]`)

body, err := client.DoQuery(GoogleCommandDataURL, query)
if err != nil {
Expand All @@ -359,13 +359,15 @@ func (client *Client) GetAlbums() (Albums, error) {
defer body.Close()

stringBody := BodyToString(body)
jsonBody := JsonBodyByScanLine(stringBody, 7, 8)
jsonBody := JsonBodyByScanLine(stringBody, 4, 5)

albumlResponse := NewAlbumlResponse(jsonBody)

albums, err := albumlResponse.Albums()
if err != nil {
return nil, err
}

return albums, nil
}

Expand All @@ -391,7 +393,7 @@ func (c *Client) SearchOrCreteaAlbum(name string) (*Album, error) {

// CreateAlbum creates a new album
func (c *Client) CreateAlbum(albumName string) (*Album, error) {
log.Info("Request to create new album %v with photo's id %s \n", albumName)
log.Info("Request to create new album %s", albumName)

query := fmt.Sprintf(`[[["OXvT9d","[\"%s\",null,2,[]]",null,"generic"]]]`, albumName)
endpoint := GoogleCommandDataURL + "&rpcids=OXvT9d"
Expand Down
12 changes: 12 additions & 0 deletions file.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
)]}'

7566
[["wrb.fr","Z5xsfc","[[[\"AF1QipOmC6qmuUUoAP06v7_d6TbAgRVL4fkuhpy1lEGU\",[\"https://lh3.googleusercontent.com/DSD-m2zalVWKcWsadepPFKI6A1vZ1FbCtB9qUdDU1Q8q5BoCA-tRaoNtgMDUaebcTVCO4R5dU_XbH4nQVZCZVHX16GTv7G4HRYC5C6ZYZqOsm0BTSKgCUC5vjLU72MKn6OjD2C0aeqaWF1OQqa9yQEUWHNYGYEsarET0plfuQcyOM-ql8IHn136VGdSqGcq0mXDp7ioaRGGZ-t_i-Nc9mjWZ92GldeThpbM9bAHFOJIRNoFfQVdCPbTQHe0AgosdMKR4ga0Q5tcRykf5SJloT9Y3shUiz7imniZzYnWH44WziDQQYDHg5qfEdw6OgD_wyaXqbfgcIaOtbq56pCLLS9CPa1A0_E4l3CPyTqdMK0abF6YFRrt_KbVjhL86K_g8zys1IdLXxgOgHfn0ahBrf_gyjV-tCnb6ONmRA0d8dkC8tucrTN2fru09ILBTlc4Oe_VlybEQtLy5-SSJ8-9YGipshuPAXAoxT-j1CyNetbGPQg7IsNHdAECXhMpsRscYDFXPpH7yO4jIHqPqVBkpOY4PU6Q5GV7QkaAPENjAwqgXCxALfB46KylzHpXyvefps6aL8QulNMqz9aVjUf8LMhJopUvp5aatcDpq8ES4kmYnkcofQpehDAb5OTa0xXfMxUKsIjxTxu66k-03a9mAPnZOl6vCTmESsVr_UMtp8_SAk8xibpEV_Q\",1280,720,null,null,null,null,null,null,[9937971]\n]\n,null,null,null,null,null,[[3]\n,[4]\n,[5]\n,[6]\n,[8]\n,[21]\n,[10]\n,[11]\n,[13]\n,[12]\n,[16]\n,[19]\n,[22]\n,[23]\n,[34,false,true]\n]\n,null,null,null,null,{\"72930366\":[1,\"DefaultAlbum\",[1524389725000,1524389725000,null,null,1569578792000,[1524389725000,25200000]\n,[1524389725000,25200000]\n,null,null,1569578795037]\n,1,null,null,[19999]\n]\n}]\n,[\"AF1QipNtUrPL8rW07P0hIsyfOZVbZ6zR7B79xjPcolnX\",[\"https://lh3.googleusercontent.com/BphuIzkuYR8ScOxpaZlSij862f3qNVOwmQB57R9HnSBrfsKBFhmQe_joBGG-kiQBJe_uHrUYkwa62Qzg0oxhLwOopW8JRE17zCsjoDoGAjhul3a7cJzPGVCs_gc-sOf9XkgJgcJj7q44CCEhmlc3yr-yiNLEYHwyCmpKudhsWZbyig-jdYxb0s6iHaLlA_1iOZ1UbSscFlNLSG7RRkSQM0HELxGkIttLw0fSgDRzTBKxnQt8VQTdbw0KiW6IdrmcKKfGJNcQQH_kou8TXA42u3yntu5RNvO-OI64y6PibLKRo3T1mqCom47z87LF62lT1yspQFkM938rSsZYUFYzxJao7v2PEaFcuSwxrVABeEcp0qWyZCtT47ewGExosxY_lVUEc_YMYKtdfBVNllySZcM36pZO39qibLtzLAtOGRMvrTiC6MDlzqnPUaiZXdUihhcIWy-o8Mrj3d12IrvoPjWiQ33twneu86Euyhp8q2_FlIPV4fHL55UKdAFUO-adaEGXDfSwGN5rfX6HDchpHA4Pd6yjWZAJ8iCc7XXm5hfvay_hNCYxifApY-EzuG01rlNFzCq9XSHTmYlxL1Ygw60xPoa5GENd26vyxctj9LbkW4jP4bJQSmeCGRWAZwbDGGe3-LvamtqacIMp9TzTcIDK9-Lx9xo56fXTVOMBJP3xmvV0y-LlHg\",1280,720,null,null,null,null,null,null,[9937971]\n]\n,null,null,null,null,null,[[3]\n,[4]\n,[5]\n,[6]\n,[8]\n,[21]\n,[10]\n,[11]\n,[13]\n,[12]\n,[16]\n,[19]\n,[22]\n,[23]\n,[34,false,true]\n]\n,null,null,null,null,{\"72930366\":[1,\"DefaultAlbum\",[1524389725000,1524389725000,null,null,1569578966000,[1524389725000,25200000]\n,[1524389725000,25200000]\n,null,null,1569578970356]\n,1,null,null,[19999]\n]\n}]\n,[\"AF1QipMe2Vu32qkvWhARB7t2Lx4p0UnndqT-yzbM6ZGR\",[\"https://lh3.googleusercontent.com/UePdF_OLPveQ8xu7CNE7z62jM5YUU-Qqn2CUXCKnPkFz89aAm3Rn-MOdV3r8c7_m6l_liuJwkiVlpK-P9kr04aeOJwjks4ZawmwZ5F13FNBYaqqXAkZIRoo3xf8_S2siAVT2Xejeyo7yuMez_kasComkRyuHq5TKoaQvF-ZbFXEkmmMZzb5YiKsUYo9yyIHJHKyP8zW-7lTp4BIKEnnou_9TZwRphLUSIvEX54urp9ebst_Vs0wFFbghBm56qHfr61xCrp0z4KtxqBUHfqvdAWscEGM9CkHEbprGY0wfeXUPhm7Ma7xAQlVIzWIL0cdbqWGrkrTtBh3rekYQp6IeyAu2H4odu4smUaw70WNTktiVez9WeZRLfNh7VF92bVax6paN8nhxU13cgRIVN3OovMV7R8GMk3TXIDIqXeXFvDBM37hcyRYfM28Fyfqoib05Fphmz8j95wxiGdNzetIuRfQeWP-_8y-ZiaCwZCgTTG53GvXA5aqrsqhPIdYpCV4jPRkwHsXNzuxqMbQPOv-yhK23eHOwKr7v7IRau2ctpyIB4OWyyM6t9O6_AbI1LUlmrJNNsiVfemwQILND8RYFPyWvCWDjYoOqrdn75aBnYHAx8jH9wErHaOueJOa6YLGDxnXYhWImjrHQTtUdpMZCAmhQRGz75GHiVdSEb2KV4QIiyRBCfSU7Jg\",1280,720,null,null,null,null,null,null,[9937971]\n]\n,null,null,null,null,null,[[3]\n,[4]\n,[5]\n,[6]\n,[8]\n,[21]\n,[10]\n,[11]\n,[13]\n,[12]\n,[16]\n,[19]\n,[22]\n,[23]\n,[34,false,true]\n]\n,null,null,null,null,{\"72930366\":[1,\"DefaultAlbum\",[1524389725000,1524389725000,null,null,1569578984000,[1524389725000,25200000]\n,[1524389725000,25200000]\n,null,null,1569578986404]\n,1,null,null,[19999]\n]\n}]\n,[\"AF1QipOjfCVcBmQJCkX1Y9BLlqchYSVRnp5RwS7zDlkV\",[\"https://lh3.googleusercontent.com/Wjwe3ft9LY3nTgLC6NV0dFigMoZj8fialLFNCso3h7_0xqSacd_uxW_kY20Upq5tyGRpaUnRR_GL1eL4PNgL3dZt2MZmqMd1SJAMfHcznB0NXTANf_PXxlj0M75ZK2_EA7oI3x-8oB5YA3CLDonZESpqZrp5eBryXIzsXydfQ5pnnSJhtAomRbj5xbXiVvQoTyVXFjx2eefiJ_eBPYacfV4akCvqy7wGooKdgsEks5XC927YF_scP1Y1l78ogPmhvnC9DtWhlCGHl9-Xr-djULESNKK4gaVlfcukPdXFH2RfEZfM3JDjeaTzH4QnCjJPXBfUW_DdRXLbP3hSzUeG2_41Jo4vnHEWzDrnTnI_SUdvrGyXjXX-RXyY4Azk48aYrtUVioLFf-s6DZnt4pKhVYeOEe_Sdrq2sKxkyauZ3VspBffdqLSklxLMWOahxpuRlrJfU6Ntj9sjoPVyWZuS2-JKcXm0Cbjg86JsauQAtNhJwqWckGveX8Y7nY-1s37chioccxB6x8G9hJoABKJ535372989OTMsj_duA6eqywprgXJ2_PO2a_CA2euzxRfAurdY0BM511gbGnRyIp0WB4KxtnSAUaYAT_ArqiS8yDkyR4UsRd0kTFcSevTnnVt7S9aYmKWTVAWY-QBn6BUOh4FYQdIDLsmN3lkC0zYIi5qoSnJvUZap9g\",1280,720,null,null,null,null,null,null,[9937971]\n]\n,null,null,null,null,null,[[3]\n,[4]\n,[5]\n,[6]\n,[8]\n,[21]\n,[10]\n,[11]\n,[13]\n,[12]\n,[16]\n,[19]\n,[22]\n,[23]\n,[34,false,true]\n]\n,null,null,null,null,{\"72930366\":[1,\"DefaultAlbum\",[1524389725000,1524389725000,null,null,1569579068000,[1524389725000,25200000]\n,[1524389725000,25200000]\n,null,null,1569579071281]\n,1,null,null,[19999]\n]\n}]\n,[\"AF1QipM_5jEkQ7r5v-eGzQTnuDUjB9Gq2yJgipa1GAZJ\",[\"https://lh3.googleusercontent.com/VECDMKKWOlaB7UcjL98iGwIGfVa0XwoWW_uFazW0Jy_vkCaUzkonKJLSn0iFcu72a9GTs71wgRpJjQrWhab2q_lamp5Od2BqlCc5sZJlxjubP87GtQ1BkiZ-RPYvatc0iBo1b7_825AG2ELZ61ejNGUl1WpIjWhoIFPVZjbEGOY7eR-wNrWwkPUbgG8Hn8WMxBfI13gyJ00kET4SJGGo0Aig9_BKNjJrPWs8Dxbm11_CdDaadw2QNJe9md8P08Og0JRqwnjnF2qMytzUopt1XjqDS4b8-HmqzhDVwpRdEer4yLpq2U9F7ZGAtWgqm8DtRmXPKizM7YTl_Ao6PjEltU0U12ENTkcmMhzae-sywgcTlSPWAyeqkQoF9uU_ZZBBpN50TBajBQlIlBbQND0JyAUTXMuKMiV6OaRjIxzeAp6yXgb9EzIZsgC8r2RbdV6P5Lb5gr33em4psw_uGBXG4VdptEVZpDa15J5ZibDbBsDOMfSyAtH9WSNIQ7r6Ki4yM8-1eBOFJsYLYGUO-4IP6s2KlGrFzv73JYwlyEngPywXzu-A9Wm_yi5paaWqDIb4aMtP4duf7Aofh9CLdngl8uHyCwHOlHM4A73mfbIcE44T8SI2Xc2emAhEtQYCPTHUDPfy5FtAgV0QGT89CRffXrVsyU0lNsVAH8GahZC26vMaWcy_iA69_Q\",1280,720,null,null,null,null,null,null,[9937971]\n]\n,null,null,null,null,null,[[3]\n,[4]\n,[5]\n,[6]\n,[8]\n,[21]\n,[10]\n,[11]\n,[13]\n,[12]\n,[16]\n,[19]\n,[22]\n,[23]\n,[34,false,true]\n]\n,null,null,null,null,{\"72930366\":[1,\"DefaultAlbum\",[1524389725000,1524389725000,null,null,1569579110000,[1524389725000,25200000]\n,[1524389725000,25200000]\n,null,null,1569579112824]\n,1,null,null,[19999]\n]\n}]\n,[\"AF1QipNtXUYcCQC4Cgc313SGFVi_je-OwyAW0Bsc2u7g\",[\"https://lh3.googleusercontent.com/iwlXr2swp4aA_x3ITVhFIzD4gWL6ZcSvRxP2tJp84htoZi5IkN9TdsKU4ts9LmBkE4-4jjgM6mYSesdmYILmrdUhMoHm3TvLkyLJUpuN6lENm0j5i3h3mDGa0ChPVi6YY2LeSJuE0YIjX1mSSQh5PGhVlqWcb2erHlPZGTuN_x7XvR7qzOKxqQVQFF8JU29o1okBT9awkQHm1J5QNFYvcX2JQ_ZPwbW5DLeo9fX5eOpJLJCA6nHp46AP3KL0ECxsBrddebjY1mzbSkwzKxxUUSkPgLI4HPqPAoUdd_QqB34I8b3bO1KfQs2YlPvb7GCyIcl5Pvq254yrDnEhNQy5HzG1XQEggTJ4NHLR5KsIFa3w_3ToteaqfadxuwKd7TjdRRikHo94qn9vrqlNl11K0xIkywnj-JFCEPKEPqgKoPZ5AsKOtn8vymo1FS1OAzRpmgCd5ufpGvZ7QqJohIbTkh0rBLlnldRRTL2iCbCfIeC-LgDDP_v_AIyEnoQJ4k29PRU2NtYccpbBbHgQEO6iOU_xK-UKEfwviNSXrybq2EqnWNGC17qjAVieoD8dtDRHAwCPICF1KApgnxGqGJPTWyqYrjzlvW27cxLQRBGYRBxhUmOnGYynK8xUKxP6XrKmnQnjyCYHAhCFOYmef0Rs46VVCiKBDF0IUgfBnWnI43l5HfN33Bo_gg\",1280,720,null,null,null,null,null,null,[9937971]\n]\n,null,null,null,null,null,[[3]\n,[4]\n,[5]\n,[6]\n,[8]\n,[21]\n,[10]\n,[11]\n,[13]\n,[12]\n,[16]\n,[19]\n,[22]\n,[23]\n,[34,false,true]\n]\n,null,null,null,null,{\"72930366\":[1,\"DefaultAlbum\",[1524389725000,1524389725000,null,null,1569579128000,[1524389725000,25200000]\n,[1524389725000,25200000]\n,null,null,1569579130656]\n,1,null,null,[19999]\n]\n}]\n,[\"AF1QipOVpf2hcAZDcQAiR2-3xN6_RrnmleIob3CimO7l\",null,null,null,null,null,null,[[3]\n,[4]\n,[5]\n,[6]\n,[8]\n,[21]\n,[10]\n,[11]\n,[16]\n,[19]\n,[22]\n,[23]\n,[34,false,true]\n]\n,null,null,null,null,{\"72930366\":[1,\"DefaultAlbum\",[0,0,null,null,1569578876000,[0]\n,[0]\n,null,null,1569578876373]\n,0,null,null,[20000]\n]\n}]\n]\n,null,[1]\n]\n",null,null,null,"3"]
]
59
[["di",205]
,["af.httprm",204,"-439929426096829686",52]
]
27
[["e",4,null,null,7666]
]
3 changes: 3 additions & 0 deletions models.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,9 @@ func (al *AlbumlResponse) Albums() (albums []*Album, err error) {
}()

mainArray := al.getMainArray()

log.Warn(NewJSONString(mainArray))

for _, arr := range mainArray {
albumID, albumName := al.getAlbumInfo(arr.([]interface{}))
albums = append(albums, &Album{
Expand Down
20 changes: 17 additions & 3 deletions util.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"io"
"net/http"
"net/http/httputil"
"os"
"strings"
"time"
)
Expand Down Expand Up @@ -57,13 +58,26 @@ func SpritMagicToken(t string) []string {

func JsonBodyByScanLine(s string, start, end int) string {
scanner := bufio.NewScanner(strings.NewReader(s))
i := 0
i := 1
var b string
for scanner.Scan() {
i++

text := scanner.Text()

if i >= start && i <= end {
b += scanner.Text()
b += text
}

i++
}
return b
}

func WriteStringToFile(s string) {
file, err := os.Create("file.txt")
if err != nil {
panic(err)
}

io.Copy(file, strings.NewReader(s))
}

0 comments on commit c4c30ee

Please sign in to comment.