search

sihorton / appjs-TiddlyWiki

TiddlyWiki plugin for AppJS
5 stars 0 forks source link

Backups still do not work on Mac #2

Closed JohnHind closed 12 years ago

JohnHind commented 12 years ago

Simon,

I discovered the fix we implemented on Sunday is only partial: backups still do not work on the Mac. They use the other path through the "if" statement to resolve the file name and that is still supplying a relative path, which works on the PC but not on the Mac.

I have fixed this and also added a new feature: the ability to specify the TiddlyWiKi file on the command line to the Node script. You can either just specify a file name allowing multiple TW files in the "content" directory and names other than "index.html". Alternatively you can specify a full file path in which case the file is loaded and the content directory is set to the directory containing it. This allows the system to function as a drop-in replacement for one of the commercial web browsers.

Would you like me to commit this fix/enhancement? Or if you prefer to review it first, I can email it to you. I have tested on Mac and PC, but not on Linux.

-John

sihorton commented 12 years ago

Hi John,

Great sounds good. In github it is easy to clone a repository, do this and then submit a patch through github, it supports comments etc so lets use it.

Thanks for fixing the code and extending the functionality.

/Simon On Oct 9, 2012 12:46 PM, "JohnHind" notifications@github.com wrote:

Simon,

I discovered the fix we implemented on Sunday is only partial: backups still do not work on the Mac. They use the other path through the "if" statement to resolve the file name and that is still supplying a relative path, which works on the PC but not on the Mac.

I have fixed this and also added a new feature: the ability to specify the TiddlyWiKi file on the command line to the Node script. You can either just specify a file name allowing multiple TW files in the "content" directory and names other than "index.html". Alternatively you can specify a full file path in which case the file is loaded and the content directory is set to the directory containing it. This allows the system to function as a drop-in replacement for one of the commercial web browsers.

Would you like me to commit this fix/enhancement? Or if you prefer to review it first, I can email it to you. I have tested on Mac and PC, but not on Linux.

-John

— Reply to this email directly or view it on GitHubhttps://github.com/sihorton/appjs-TiddlyWiki/issues/2.

JohnHind commented 12 years ago

OK, a little help here ...

I tried cloning this fork (using GitHub for Windows). I got to make and commit the changes locally, but it will not sync them back as I do not have permission. I cannot find any option to "submit a patch".

Always eager to learn, I forked your code to JohnHind/appjs-TiddlyWiki, cloned that and commited and sync'ed the changes sucessfully to that, so at least you can see them. I cannot find any option to request that be merged back onto the master fork.

Sorry if I'm missing something obvious - I've always used Subversion up to now.

sihorton commented 12 years ago

Hi JohnHind,

No problem, that is actually how you are supposed to do it. You clone it to your own account exactly as you did, then you can check it out, make your changes and then commit them. Once you are happy with your changes we can follow the process outlined on this page: https://help.github.com/articles/using-pull-requests

So what you should do is go to your repository and then click the "Pull Request" button. Don't worry about branches you can use master for all of the branch names. You get to review what you are sending and write in a comment about what you have changed, then click "Send pull request".

Then I will be able to see your changes and merge them into the repository and publish to github.

The page I linked to has nice pretty screenshots so is quite ok to follow. See how you get along.

/Simon

JohnHind commented 12 years ago

Thanks Simon,

Like many things designed by Unix people, the main barrier is guessing the obscurantist name they've decided to label an operation with! It was easy, once I knew it was called a "pull request"!

Anyway, it's done and I am learning useful new stuff!

sihorton commented 12 years ago

Well I also was thinking of commit or push or send changes, asking the other party to pull them seems counter intuative!

However the github interface itself seems nice and easier to manage than lots of email, I think it encourages contributions like that.

I will take a look through your patch.

/Simon On Oct 9, 2012 8:08 PM, "JohnHind" notifications@github.com wrote:

Thanks Simon,

Like many things designed by Unix people, the main barrier is guessing the obscurantist name they've decided to label an operation with! It was easy, once I knew it was called a "pull request"!

Anyway, it's done and I am learning useful new stuff!

  • John

    — Reply to this email directly or view it on GitHubhttps://github.com/sihorton/appjs-TiddlyWiki/issues/2#issuecomment-9272622.

JohnHind commented 12 years ago

Patch resubmitted.

Github is growing on me. I was a little crabby yesterday because first time I tried the Windows client it dumped me out into Powershell with typical lengthy but staggeringly unhelpful Unix type error message. Two hours of headbanging later I figured you have to give it your email address, even though this was labeled optional in the UI and it had warned that the address would be publically visible if you did enter it! Also it would be more helpful if, when you try to synchronise changes to a repository you do not have permission for, it would offer to create a Pull Request instead - or at the very least mention this procedure to point you in the right direction! Unix-types never seem to grasp that providing a patronisingly simple guide to a procedure with lots of pretty pictures does not help if your audience does not know what the procedure is called! Sorry, now I'm getting crabby again!

sihorton commented 12 years ago

Yes it seems to be the case that you need to already understand how it works for it to work well.

If you give it some time it will grow on you, it has me.

/Simon On Oct 10, 2012 11:39 AM, "JohnHind" notifications@github.com wrote:

Patch resubmitted.

Github is growing on me. I was a little crabby yesterday because first time I tried the Windows client it dumped me out into Powershell with typical lengthy but staggeringly unhelpful Unix type error message. Two hours of headbanging later I figured you have to give it your email address, even though this was labeled optional in the UI and it had warned that the address would be publically visible if you did enter it! Also it would be more helpful if, when you try to synchronise changes to a repository you do not have permission for, it would offer to create a Pull Request instead - or at the very least mention this procedure to point you in the right direction! Unix-types never seem to grasp that providing a patronisingly simple guide to a procedure with lots of pretty pictures does not help if your audience does not know what the procedure is called! Sorry, now I'm getting crabby again!

— Reply to this email directly or view it on GitHubhttps://github.com/sihorton/appjs-TiddlyWiki/issues/2#issuecomment-9295458.