Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

TeoBigusGeekus · 2019-10-03 14:58:17

[[Time:17:51 Location:~/1_accuweather]]
$ git remote update && git status
Fetching origin
On branch random_photo
nothing to commit, working tree clean

$ git remote update && git status
Fetching origin
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean

$ git log --all --oneline --graph --decorate --abbrev-commit
* 902e5c6 (HEAD -> master, origin/master) Changelog
* 770d4f5 Changelog
| * 581433a (random_photo) test
| * e46a937 test
| * 251d431 test
| * e7b4770 test
| *   ffe3454 Merge branch 'master' into random_photo
| |\  
| |/  
|/|   
* | 93ceae7 Changed downloader again
| * ca8cb6e test commit
| * d68d006 test commit
| * 53a1b6a Made my custom changes to the script
|/  
* adf9acb Changed downloader again
* b4c5f50 Changed downloader again
* a3595b7 Final Release
* 76a5cd3 Release Candidate 3
*   909a3a9 Merge branch 'master' of https://gitlab.com/teobigusgeekus/1_accuweather
|\  
| * fa02456 Add CHANGELOG
* | f7b6b02 Release Candidate 2
|/  
* 804f598 Release Candidate 2

TeoBigusGeekus · 2019-10-03 15:07:32

ohnonot wrote:

You always should test with different user agents!
(apparently w3m does not have that option, but lynx has, and wget and curl of course).
I thought I might try to fiigure out how to build it dynamically against the installed browser.

User agents work with Accuweather and wget, lynx, etc., they just didn't work with my vpn.
Even now, if I do a

wget -O save_file https://www.accuweather.com/en/gr/kastoria/178682/october-weather/178682

or a

wget -U "Firefox" -O save_file https://www.accuweather.com/en/gr/kastoria/178682/october-weather/178682

or

wget -U "Chrome" -O save_file https://www.accuweather.com/en/gr/kastoria/178682/october-weather/178682

or whatever, I get nothing from Accuweather.
However, if I replace the user agent with gibberish

wget -U "Supercalifragilisticexpialidocious" -O save_file https://www.accuweather.com/en/gr/kastoria/178682/october-weather/178682

it works!
Don't ask me why, maybe the Accuweather coders have banned specific user agents from reaching the site, who knows?
The thing is that it works this way with expressvpn and that's what I wanted.

PS: I used the string "Oh hi Mark!" as the user agent to pay my respects to the greatest cinema masterpiece ever, "The Room".

morfik · 2019-10-03 19:17:38

@TeoBigusGeekus , so basically the `93ceae7` commit shouldn't go to the master branch, right?

TeoBigusGeekus · 2019-10-03 20:04:57

Hmm... now that I see it, it might mean that the "93ceae7 Changed downloader again" commit happened from the branch instead of the master.

I'm not sure I'm reading this correctly, sorry

Last edited by TeoBigusGeekus (2019-10-03 20:20:47)

morfik · 2019-10-03 20:46:56

I just compared what you have in the public repo, and it looks like this commit shouldn't go where it went. I think you simply have to reset the head in the master branch by 3 commits, and make the changes covered by the two latest commits once more:

$ git reset HEAD~3

Then repush the local master branch to the remote with the -f parameter, and it should work again well.

TeoBigusGeekus · 2019-10-03 20:53:18

The last two commits where nothing of importance, I was just desperate to push something, just in case the repository was corrected.

So...

git checkout master
git reset HEAD~3
git push -u origin master

Am I right?

morfik · 2019-10-03 20:55:58

When you reset head, git will say that your local version is behind some commits. So if you don't want to commit anything in the master, after reseting the head, you have to sync your local repo with force, and the -f switch is for that. Then the remote repo will have the same changes what your local one.

TeoBigusGeekus · 2019-10-03 20:57:39

Ok, wish me luck.

morfik · 2019-10-03 20:58:23

I wish you luck.

TeoBigusGeekus · 2019-10-03 20:59:37

Ok

$ git push -u -f origin master
Username for 'https://gitlab.com': teobigusgeekus
Password for 'https://teobigusgeekus@gitlab.com': 
Total 0 (delta 0), reused 0 (delta 0)
remote: GitLab: You are not allowed to force push code to a protected branch on this project.
To https://gitlab.com/teobigusgeekus/1_accuweather.git
 ! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to 'https://gitlab.com/teobigusgeekus/1_accuweather.git'

morfik · 2019-10-03 21:01:20

You have to configure the repo in gitlab settings for force push.

Last edited by morfik (2019-10-03 21:01:36)

TeoBigusGeekus · 2019-10-03 21:02:00

Also

$ git checkout random_photo
error: Your local changes to the following files would be overwritten by checkout:
        CHANGELOG
Please commit your changes or stash them before you switch branches.
Aborting

TeoBigusGeekus · 2019-10-03 21:04:26

morfik wrote:

You have to configure the repo in gitlab settings for force push.

Ok, I did that and then force pushed.

morfik · 2019-10-03 21:04:53

What `git status` says?

TeoBigusGeekus · 2019-10-03 21:08:16

I did a git stash and then gave a git status:

$ git status
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean

morfik · 2019-10-03 21:08:50

What about the other branch?

TeoBigusGeekus · 2019-10-03 21:09:51

$ git status
On branch random_photo
nothing to commit, working tree clean

morfik · 2019-10-03 21:10:21

So you did what you wanted?

TeoBigusGeekus · 2019-10-03 21:11:25

Let me test.

morfik · 2019-10-03 21:11:44

Show also the graph.

#2861 2019-10-03 14:58:17

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2862 2019-10-03 15:07:32

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2863 2019-10-03 19:17:38

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2864 2019-10-03 20:04:57

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2865 2019-10-03 20:46:56

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2866 2019-10-03 20:53:18

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2867 2019-10-03 20:55:58

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2868 2019-10-03 20:57:39

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2869 2019-10-03 20:58:23

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2870 2019-10-03 20:59:37

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2871 2019-10-03 21:01:20

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2872 2019-10-03 21:02:00

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2873 2019-10-03 21:04:26

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2874 2019-10-03 21:04:53

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2875 2019-10-03 21:08:16

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2876 2019-10-03 21:08:50

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2877 2019-10-03 21:09:51

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2878 2019-10-03 21:10:21

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2879 2019-10-03 21:11:25

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

#2880 2019-10-03 21:11:44

Re: Conky weather+moon scripts (Accuw/WUndergr/NWS/MoonGiant)

Board footer