[01:20:45] today I did some commit as a result of which the entire OOP folder was removed from the sibutest2 repo. [01:21:35] Also some of the files such as https://github.com/infobliss/sibutest2/blob/master/OOP/infobox_templates.py [01:23:07] have been changed [01:23:16] then I recommitted them [01:23:27] then the libraries folder was removed [01:24:04] instead of pushing only one file the entire directory is getting pushed :( [01:59:30] something has caused the remote repository to lose commits [10:16:53] how did you commit them that resulted in history loss? [10:17:44] it shouldn't happen, theoretically [10:20:21] did you force-push? [10:20:54] you seem to be pushing from three locations at once, tool labs, github web interface, and your local computer [10:21:27] usually I only push from local computer only [10:21:55] but if you must push from a second location, make sure local and remote agree on history [10:22:32] use `git pull` (with or without --rebase) when necessary [10:23:31] I will let you know when I see infobliss and I will deliver that message to them [10:23:31] @notify infobliss see logs [15:05:04] hi [15:15:59] * zhuyifei1999_ is here, though unreliably. hotel internet [15:17:19] I'll be here for a bit, seeing if I can get some work done on the amsterdammuseum mapping [15:17:36] not sure I can make it to 20:00 though, this week lot of filled evenings [15:20:11] you're on vacation now zhuyifei? [15:20:19] yeah [15:21:15] (unrelated but) still trying hard to make WP0 pirates' lives miserable [15:22:18] yeah you are right zhuyifei1999_ [15:22:28] I was force pushing [15:22:40] that has resulted in the loss [15:22:45] Hi [15:22:52] try to do more pulling and pushing [15:22:59] you've no commits for almost a month [15:23:15] force push = you probably broke something unless you really know what you are doung [15:23:18] *doing [15:23:21] even yesterday I made changes [15:23:31] pull at the start of the day, continue with that, push at the end of the day [15:23:45] or if you switch working location, push, pull on other location etc. [15:24:15] especially when I'm also going to be committing work it's important to have updated things in the repo [15:24:59] loacl machine to tool labs scp was mot working [15:25:04] *local [15:25:08] then don't scp [15:25:16] git pull on tool labs [15:25:20] dev on local [15:25:32] yeah right [15:25:58] in rare cases you can do dev on tool labs [15:26:03] zhuyifei1999_: Do you know any smart ways to see what can all be in a certain field in (http://amdata.adlibsoft.com/wwwopac.ashx?database=AMcollect&search=priref=12&output=json) [15:26:22] or would I simply need the full database/ask them [15:26:23] but that may do more hard than good. (got pull is no longer straightforward) [15:26:33] but that is still better than force pushing [15:27:31] basvb: I don't think I get "what can all be in a certain field" part [15:27:56] for example now I'm working on the dimensions [15:28:19] dimension.type is hoogte/breedte here [15:28:24] do they have a spec? [15:28:27] http://amdata.adlibsoft.com/wwwopac.ashx?database=AMcollect&search=priref=1&output=json there it is hoogte a, hoogte c [15:28:35] if not I guess we have to ask them [15:28:52] I should investigate the database a bit better [15:29:11] I can't get much wiser from their database descriptions, but there are some standards [15:29:29] https://github.com/infobliss/sibutest2/blob/master/Glam_mappings/AmsterdamMuseum.py#L41 it's for those kind of purposes [15:29:37] mapping the few dutch cases to a commons template [15:30:40] hmm [15:31:06] It's best if they have a spec of API documentation [15:31:09] *or [15:36:02] infobliss: if you have trouble fixing your git repo, feel free to ping me [15:48:12] hi came back from dinner [15:48:54] hi [15:49:05] ok sure I don't think what has been lost can be recovered though [15:49:12] what was lost? [15:49:14] hi basvb [15:49:59] The OOP classes had a number of revisions [15:50:22] Now only the latest version will be available [15:50:36] so then nothing is lost? only some history? [15:51:03] yes [15:54:01] so basvb we are not going the have a textbox for category of the image in the form anymore. [15:54:18] So no more Add categories too. [15:54:26] how will users add categories? [15:54:41] instead they will add them when they edit the raw wikitext [15:55:27] hmm, I think some specific category functionality (which tests for existence of the categories) is something which will be useful quite often [15:55:50] raw_wikitext isn't easy for everybody and if easily avoided we should [15:56:55] yeah it may not be easy to edit wikitext for all the endusers [15:57:27] so are you in favour of not giving the option to edit the wikitext at all. [15:57:29] ? [15:57:33] infobliss: I can try recovering [15:58:02] zhuyifei1999_ oh how? [15:58:11] git magic :) [15:58:58] no editing wikitext is a good idea [15:59:11] but providing some functionalities besides that is also a good idea [15:59:31] ok basvb [15:59:39] adding categories is an important one, where a field which checks whether categories exists adds a lot [16:00:42] anyways the category field is not a *required field [16:01:04] true [16:01:04] so they may choose to edit the wikitext instead [16:01:09] yes [16:02:01] also [16:02:35] now I am showing the sample url/ unique ID as a tooltip on the same page on choosing a glam from the dropdown. [16:02:40] ok I added a bit to the amsterdam museum example, will continue later on [16:02:53] ok basvb [16:02:56] but the tip depends on the glam doesn't it? [16:03:07] yes of course [16:03:10] ok [16:03:12] infobliss: can you send be the .git folder of your repo? [16:03:14] nice [16:03:14] *me [16:03:24] I'm off to dinner now [16:03:39] will be here in an hour or so for a bit and then I'm likely offline [16:03:44] zhuyifei1999_ do you want the one from local repo? [16:03:51] actually, no wait [16:03:53] if there's anything we need to discuss just say it [16:04:03] and try to do daily commits + push [16:04:13] so we can keep better track of the work and give quicker pointers [16:04:43] where did you do your latest commits before the forced push? [16:04:55] yes basvb I was baffled by the git nuances. will be more careful with git ;) [16:05:45] zhuyifei1999_: in both local and toollabs [16:06:24] basvb : so my immediate task will be to integrate the OOP code in the toollabs? [16:06:28] ok, please send me both .git [16:06:56] ok zhuyifei1999_ [16:08:36] actually, just send me your local one [16:08:47] I think I can read your toollabs one [16:09:09] zhuyifei1999_ shall I share in google drive? [16:09:25] uh [16:09:30] ok [16:09:40] tar it though [16:10:06] you mean compress? [16:10:30] I mean pack it into one file. Idc if it is compressed or not [16:11:37] zhuyifei1999_ ok [16:13:24] zhuyifei1999_ : Surprisingly I can't find the .git folder in the local repo. [16:13:29] ... [16:13:37] even though I am sure I committed from here only [16:13:42] ubuntu? [16:13:45] yes [16:13:51] ctrl-H [16:14:12] ok :) [16:14:17] got it [16:19:48] https://drive.google.com/open?id=0B2ezAQyCh8MmUDRNUmFhQm9MR1U [16:21:49] k [16:24:35] where is the git repo on tool labs side? [16:24:53] oh nevermind I see [16:25:04] www/python/src right? [16:26:27] yeah [16:29:45] why do you have a full venv in your repo? [16:31:31] I added everything [16:31:37] also can you get me write access to the repo? I will create a branch with the commits restored as best as I can [16:31:50] well, you're not supposed to add a venv [16:32:02] it's platform-dependent [16:32:03] did not know how to subtract later [16:32:08] ... [16:32:30] I hate to say this as a mentor, but: read the friendly manual [16:32:51] ok [16:33:24] see `man git-rm` and `man gitignore` [16:33:44] ok [16:34:00] How can I get you write access to the repo? [16:34:18] https://github.com/infobliss/sibutest2 there should be settings [16:34:43] oh you mean to add you as a contributor? [16:37:24] yeah [16:37:48] Added you [16:37:54] thanks [16:38:00] https://github.com/infobliss/sibutest2/invitations [16:38:33] the toollsba copy seems okay [16:38:50] ? [16:38:59] the HEAD is in github history [16:39:19] 02ad187 HEAD@{1}: commit: Adding generic library functions [16:41:35] shall I kill https://github.com/infobliss/sibutest2/commit/26a308279fe5960303a6e5d96d7d60b2fdc7bdb5 ? [16:42:07] ok [16:42:23] np that was a trial [16:42:57] what is that commit "reverted changes done in previous commit"? [16:43:09] it does not show anything for me [16:43:43] this is after I realised that the last commit has removed some files I recommitted [16:43:44] oh wait, wrong command [16:44:17] I don't see any removals [16:44:48] https://www.irccloud.com/pastebin/GIUiQHQy/ [16:45:47] uh this is getting confusing [16:46:10] your local's master branch contains the whole history [16:46:29] this is like once I force pushed from toollabs some files got removed. [16:46:43] ... [16:46:55] I'll look into it tomorrow [16:46:58] gotta sleep [16:47:05] ok np [16:47:48] one last thing [16:48:05] Is http://rogerdudler.github.io/git-guide/ the friendly manual? [16:48:34] uh [16:48:40] use manpages [16:48:55] ok [17:51:05] hi basvb [17:51:15] hi [17:52:00] my immediate task will be to integrate the OOP code in the toollabs right? [17:55:22] yep get the current code base working in tool labs [17:55:28] but that shouldn't be too hard should it? [17:55:56] I'd like to see a bit more the daily progress, the small tasks you achieved and what you had trouble with [17:55:59] shouldn't be [17:56:23] getting it on toollabs if all goes well is less than an hour, if there are some troubles it'll take longer [17:56:39] nope not so easu [17:56:43] easy [17:57:07] I will have to make sure that the flow is as planned [17:57:16] then it has to work end-to-end [17:57:39] there's a total redesign [17:57:42] ok ;), you have to test on toollabs? [17:57:53] yep [17:58:22] hmm, ideally you'd want to be able to test locally and not in production (on toollabs is production) [17:58:33] and test often [17:58:51] as in: test after every small improvement, not one big test after some weeks [17:59:02] because the latter will result in disasters in normal coding ;) [18:00:27] that's right but chances are high it will take more than one trials [18:00:44] true, that's why you should test often, then you can quicker identify problems [18:01:15] hmm [18:02:23] if you now find a mistake you have to search really hard which of the many changes in the last 3 weeks broke it [18:03:18] maybe talking about production and testing is a bit much for a project like this, but I think they are important lessons for when you start coding in a professional environment [18:04:08] yeah sure [18:04:41] so tomorrow you upload the code to toollabs, what are you going to test for and how long do you expect it to take? [18:04:49] any difficulties you expect could arise? [18:05:09] there are Oauth and other things which will be working as before [18:05:25] only things to test are: [18:06:18] 1. calling proper subclass methods on choose of specific glams [18:06:31] what do you mean with that? [18:07:02] suppose NA GLAM is chosen [18:07:41] so from app.py a NA subclass method will be called [18:08:04] can't you simulate that call locally? [18:08:11] app.py has to be modified appropriately [18:08:16] that's yet to be done [18:08:19] ok [18:08:28] only the OOP structure is in place [18:08:32] and you don't run the flask app locally? [18:08:37] since it was under review [18:08:42] for my flask projects I always test them locally [18:09:26] but maybe with Oauth that gives issues [18:09:44] ok I can run locally but only after app.py related changes are done [18:10:06] yeah Oauth part is part of the production code [18:10:27] so unless I remove those from the flow can't test locally [18:10:52] well for now you can test on toollabs np, but try to have a work method where you make a change: test locally, and then after some changes upload to toollabs and test there (should only be minor tests since you know most things work from local) [18:11:12] hmm, maybe then this will become a bit too complicated for within this project [18:11:22] honestly I am testing on toollabs alone [18:12:00] I should have a separate project by modifying the code suitably to be able to test locally [18:12:29] normally you'd want to have 1 setting to switch between local and production [18:12:47] but we're getting a bit stuck at the side issues (how to structure code, comments, git, etc.) [18:12:59] time to get some actual coding done and get some new functions working [18:13:13] as we're falling a bit behind what we planned [18:14:52] Do you mean "upload to wikimedia" button or UI related changes? [18:16:19] upload to wikimedia button is a bit too much to expect within this project, it's dependent on outside factors and as such can take months [18:16:48] mainly to get a good user_flow going and get some working mappings with maybe some cool functionalities [18:17:03] for example the upload multiple images or testing whether categories exists [18:17:56] Is upload multiple images = upload by searchstring ? [18:18:28] "Work to make the tool have the ability to provide the flexibility of choosing a number of desired files" [18:18:33] but also search string [18:18:39] although that might get a bit complicated [18:19:27] also some documentation has to be done [18:19:33] that is fairly straightforward [18:19:46] how can people contribute new mappings, where can they suggest them etc, [18:19:56] For multiple images upload the question is how does the enduser specify which files s/he wants to upload? [18:20:11] by specifying all the URLs? [18:20:26] we should aim at something which can work structuraly at the end of the project, a finished working project where adding a new glam is just a matter of 1-3 days work by somebody who can code and json [18:20:45] searchstring seems logical together with multiple images [18:21:04] or any parameter [18:21:45] we should aim at something which can work structuraly at the end of the project <== Our OOP approach will enable this. [18:22:02] yes, that's a good necessary step, that's why we took it ;) [18:22:33] but also documentation is needed for that [18:22:34] Also if it is searchstring is the logical way to upload multiple images then it won't be too hard either [18:22:54] well, there will be some difficulties: how to select images [18:23:04] what to do when a search gives thousands of results [18:23:07] or 0 [18:23:59] yep but that's more of a decision making on our part. [18:24:14] true [18:24:49] Also documentation can be considered pretty much done since I am writing blogs regularly. [18:24:57] that's not documentation [18:25:27] documentation is within the code + structured documents explaining certain step (a how-to-add-a-new-glam-guide) [18:25:53] true [18:25:56] the blogs are to inform on your progress and the lessons you learned, but they are not structured [18:26:33] well they have some structure of course [18:26:43] but you can't expect everybody who wants to edit the code to first read all the blogs [18:26:57] hahaha lol [18:27:06] no they obviously won't [18:27:09] so to come back to the plans for tomorrow [18:27:23] you'll be integrating the current code on toollabs [18:27:43] and test the oop design online [18:27:52] see whether nothing gets broken [18:27:55] and fix any issues [18:28:08] hopefully if all is good and well it works at the end of the day [18:28:25] yeah [18:28:38] and if that is completed what is the next step? [18:29:22] upload by searchstring [18:30:04] but that's something which will require some discussion I think, or do you have planned out how you want to implement that? [18:30:18] no let's discuss [18:30:28] otherwise the next minor steps are to improve documentation and write a how-to-add-a new glam guide [18:30:46] they have less blockers, so you can keep those tasks to do in between [18:31:02] that ensures that there is not a moment where you are stuck on the one big task and can't do anything [18:31:10] do I make a wiki page for "how-to-add-a new glam guide"? [18:31:36] Yep I think that that is the best [18:31:47] a wikipage where you explain a bit what glam2commons is [18:31:48] ok [18:31:52] and one with that guide [18:32:01] you can start them as a subpage to your user page [18:32:03] on commons [18:32:40] sure [18:32:47] for the multiple images I'm not entirely sure what is the best approach [18:33:04] true [18:33:06] might be a bit dependent on the glams [18:34:00] maybe you can write down some ideas you have on that and we can discuss that a bit better at wednesday [18:34:11] for now focus on getting this code running + documentation [18:34:27] ok [18:34:53] I've to go for now, tomorrow I'll very likely not be able to make it, but wednesday I'll likely be here large part of the morning + afternoon [18:35:24] alright [18:35:33] so hopefully then I can test the new code on toollabs and give some pointers on the documentation and we'll discuss multiple-image-upload [18:36:03] wednesday I may be unavailable in the morning though [18:36:08] np [18:36:32] we'll see when you can be here, I'll try to hang out here whole day, and my morning is your afternoon [18:36:42] bb and see you on wednesday [18:36:49] ok cya on Wed evening [18:37:31] your evening? I'll have some difficulties this week with the 20:00 times, so wednesday before that is better for me [18:38:15] youe evening [18:39:19] Say around 18:00 for you [18:39:28] or before