diff --git a/.travis.yml b/.travis.yml index df4eb121f..dd3b081eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,7 @@ python: install: - pip install -e .[develop] script: -- nosetests tests/ \ No newline at end of file +- nosetests --with-doctest +sudo: false +git: + depth: 250 diff --git a/.versioneer-lookup b/.versioneer-lookup index 41fd3a301..b0de673da 100644 --- a/.versioneer-lookup +++ b/.versioneer-lookup @@ -10,13 +10,14 @@ # master shall not use the lookup table, only tags master -# maintenance is currently the branch for preparation of maintenance release 1.2.7 -# so are any fix/... branches -maintenance 1.2.7-dev 536bb31965db17b969e7c1c53e241ddac4ae1814 -fix/.* 1.2.7-dev 536bb31965db17b969e7c1c53e241ddac4ae1814 - -# Special case disconnected checkouts, e.g. 'git checkout ' +# neither should disconnected checkouts, e.g. 'git checkout ' +HEAD \(detached.* +# maintenance is currently the branch for preparation of maintenance release 1.2.8 +# so are any fix/... branches +maintenance 1.2.8 6c622f7c4332b71c6ece59552ffc87c146155c84 pep440-dev +fix/.* 1.2.8 6c622f7c4332b71c6ece59552ffc87c146155c84 pep440-dev + # every other branch is a development branch and thus gets resolved to 1.3.0-dev for now -.* 1.3.0-dev 198d3450d94be1a2 +.* 1.3.0 198d3450d94be1a2 pep440-dev diff --git a/AUTHORS.md b/AUTHORS.md index 0309fdf53..44e77f485 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -53,6 +53,8 @@ date of first contribution): * [Andrew Erickson](https://github.com/aerickson) * [Nicanor Romero Venier](https://github.com/nicanor-romero) * [Thomas Hou](https://github.com/masterhou) + * [Mark Bastiaans](https://github.com/markbastiaans) + * [Kevin Murphy](https://github.com/kevingelion) OctoPrint started off as a fork of [Cura](https://github.com/daid/Cura) by [Daid Braam](https://github.com/daid). Parts of its communication layer and diff --git a/CHANGELOG.md b/CHANGELOG.md index be40008fe..a07b2b19c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,128 @@ # OctoPrint Changelog +## 1.2.8 (2015-12-07) + +### Notes for Upgraders + +#### A bug in 1.2.7 prevents directly updating to 1.2.8, here's what to do + +A bug in OctoPrint 1.2.7 (fixed in 1.2.8) prevents updating OctoPrint to version +1.2.8. If you try to perform the update, you will simply be told that "the update +was successful", but the update won't actually have taken place. To solve this +hen-egg-problem, a plugin has been made available that fixes said bug (through +monkey patching). + +The plugin is called "Updatefix 1.2.7" and can be found +[in the plugin repository](http://plugins.octoprint.org/plugins/updatefix127/) +and [on Github](https://github.com/OctoPrint/OctoPrint-Updatefix-1.2.7/). + +Before attempting to update your installation from version 1.2.7 to version 1.2.8, +please install the plugin via your plugin manager and restart your server. Note that +you will only see it in the Plugin Manager if you need it, since it's only compatible with +OctoPrint version 1.2.7. After you installed the plugin and restarted your server +you can update as usual. The plugin will self-uninstall once it detects that it's +running under OctoPrint 1.2.8. After the self-uninstall another restart of your server +will be triggered (if you have setup your server's restart command, defaults to +`sudo service octoprint restart` on OctoPi) in order to really get rid of any +left-overs, so don't be alarmed when that happens, it is intentional. + +**If you cannot or don't want to use the plugin**, alternatively you can switch +OctoPrint to "Commit" based tracking via the settings of the Software Update plugin, +update, then switch back to "Release" based tracking (see [this screenshot](https://i.imgur.com/wvkgiGJ.png)). + +#### Bed temperatures are now only displayed if printer profile has a heated bed configured + +This release fixes a [bug](https://github.com/foosel/OctoPrint/issues/1125) +that caused bed temperature display and controls to be available even if the +selected printer profile didn't have a heated bed configured. + +If your printer does have a heated bed but you are not seeing its temperature +in the "Temperature" tab after updating to 1.2.8, please make sure to check +the "Heated Bed" option in your printer profile (under Settings > Printer Profiles) +as shown [in this short GIF](http://i.imgur.com/wp1j9bs.gif). + +### Improvements + + * Version numbering now follows [PEP440](https://www.python.org/dev/peps/pep-0440/). + * Prepared some things for publishing OctoPrint on [PyPi](https://pypi.python.org/pypi) + in the future. + * [BlueprintPlugin mixin](http://docs.octoprint.org/en/master/plugins/mixins.html#blueprintplugin) + now has an `errorhandler` decorator that serves the same purpose as + [Flask's](http://flask.pocoo.org/docs/0.10/patterns/errorpages/#error-handlers) + ([#1059](https://github.com/foosel/OctoPrint/pull/1059)) + * Interpret `M25` in a GCODE file that is being streamed from OctoPrint as + indication to pause, like `M0` and `M1`. + * Cache rendered page and translation files indefinitely. That should + significantly improve performance on reloads of the web interface. + * Added the string "unknown command" to the list of ignored printer errors. + This should help with general firmware compatibility in case a firmware + lacks features. + * Added the strings "cannot open" and "cannot enter" to the list of ignored + printer errors. Those are errors that Marlin may report if there is an issue + with the printer's SD card. + * The "CuraEngine" plugin now makes it more obvious that it only targets + CuraEngine versions up to and including 15.04 and also links to the plugin's + homepage with more information right within the settings dialog. + * Browser tab visibility is now tracked by the web interface, disabling the + webcam and the GCODE viewer if the tab containing OctoPrint is not active. + That should reduce the amount of resource utilized by the web interface on + the client when it is not actively monitored. Might also help to mitigate + [#1065](https://github.com/foosel/OctoPrint/issues/1065), the final verdict + on that one is still out though. + * The printer log in the terminal tab will now be cut off after 3000 lines + even if autoscroll is disabled. If the limit is reached, no more log lines + will be added to the client's buffer. That ensures that the log will not + scroll and the current log excerpt will stay put while also not causing + the browser to run into memory errors due to trying to buffer an endless + amount of log lines. + * Increased timeout of "waiting for restart" after an update from 20 to 60sec + (20sec turned out to be too little for OctoPi for whatever reason). + * Added a couple of unit tests + +### Bug Fixes + + * [#1120](https://github.com/foosel/OctoPrint/issues/1120) - Made the watchdog + that monitors and handles the `watched` folder more resilient towards errors. + * [#1125](https://github.com/foosel/OctoPrint/issues/1125) - Fixed OctoPrint + displaying bed temperature and controls and allowing the sending of GCODE + commands targeting the bed (`M140`, `M190`) if the printer profile doesn't + have a heated bed configured. + * Fixed an issue that stopped the software updater working for OctoPrint. The + updater reports success updating, but no update has actually taken place. A + fix can be applied for this issue to OctoPrint version 1.2.7 via + [the Updatefix 1.2.7 plugin](https://github.com/OctoPrint/OctoPrint-Updatefix-1.2.7). + For more information please refer to the [Important information for people updating from version 1.2.7](#important-information-for-people-updating-from-version-127) + above. + * Fix: Current filename in job data should never be prefixed with `/` + * Only persist plugin settings that differ from the defaults. This way the + `config.yaml` won't be filled with lots of redundant data. It's the + responsibility of the plugin authors to responsibly handle changes in default + settings of their plugins and add data migration where necessary. + * Fixed a documentation bug ([#1067](https://github.com/foosel/OctoPrint/pull/1067)) + * Fixed a conflict with bootstrap-responsive, e.g. when using the + [ScreenSquish Plugin](http://plugins.octoprint.org/plugins/screensquish/) + ([#1103](https://github.com/foosel/OctoPrint/pull/1067)) + * Fixed OctoPrint still sending SD card related commands to the printer even + if SD card support is disabled (e.g. `M21`). + * Hidden files are no longer visible to the template engine, neither as (GCODE) + scripts nor as interface templates. + * The hostname and URL prefix via which the OctoPrint web interface is accessed + is now part of the cache key. Without that being the case the cache could + be created referring to something like `/octoprint/prefix/api/` for its API + endpoint (if accessed via `http://somehost:someport/octoprint/prefix/` first + time), which would then cause the interface to not work if accessed later + via another route (e.g. `http://someotherhost/`). + * Fixed a JavaScript error on finishing streaming of a file to SD. + * Fixed version reporting on detached HEADs (when the branch detection + reported "HEAD" instead of "(detached" + * Fixed some path checks for systems with symlinked paths + ([#1051](https://github.com/foosel/OctoPrint/pull/1051)) + * Fixed a bug causing the "Server Offline" overlay to pop _under_ the + "Please reload" overlay, which could lead to "Connection refused" browser + messages when clicking "Reload now" in the wrong moment. + +([Commits](https://github.com/foosel/OctoPrint/compare/1.2.7...1.2.8)) + ## 1.2.7 (2015-10-20) ### Improvements @@ -386,7 +509,7 @@ changed under "Temperatures" in the Settings ([#343](https://github.com/foosel/OctoPrint/issues/343)). * High-DPI support for the GCode viewer ([#837](https://github.com/foosel/OctoPrint/issues/837)). * Stop websocket connections from multiplying ([#888](https://github.com/foosel/OctoPrint/pull/888)). -* New setting to rotate webcam by 90° counter clockwise ([#895](https://github.com/foosel/OctoPrint/issues/895) and +* New setting to rotate webcam by 90° counter clockwise ([#895](https://github.com/foosel/OctoPrint/issues/895) and [#906](https://github.com/foosel/OctoPrint/pull/906)) * System commands now be set to a) run asynchronized by setting their `async` property to `true` and b) to ignore their result by setting their `ignore` property to `true`. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 24bc38902..68c09bcb4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,51 +1,264 @@ -Issues, Tickets, however you may call them ------------------------------------------- - -Read the following short instructions **fully** and **follow them** if you want your ticket to be taken care of and not closed again directly! They are linked on top of every new issue form, so don't say nobody warned you afterwards. - -- **Read the [FAQ](https://github.com/foosel/OctoPrint/wiki/FAQ)** -- Always create **one ticket for one purpose**. So don't mix two or more feature requests, support requests, bugs etc into one ticket. If you do, your ticket will be closed! -- If you want to report a bug, **READ AND FOLLOW [How to file a bug report](https://github.com/foosel/OctoPrint/wiki/How-to-file-a-bug-report)!** Tickets will be automatically checked if they comply with the requirements outlined in that wiki node! Other then what's written in there (**and really EVERYTHING that is written in there!**) you don't have to do anything special with your ticket. Listen to what GitIssueBot might have to say to you! -- If you want to post a **request** of any kind (feature request, documentation request, ...), **add [Request] to your issue's title!** -- If you need **support** with a problem of your installation (e.g. if you have problems getting the webcam to work) or have a general **question**, the issue tracker is not the right place. Consult the [Mailinglist](https://groups.google.com/group/octoprint) or the [Google+ Community](https://plus.google.com/communities/102771308349328485741) instead! -- If you are a developer that wants to brainstorm a pull request or possible changes to the plugin system, **add [Brainstorming] to your issue's title!** (see below). -- If you have another reason for creating a ticket that doesn't fit any of the above categories, it's something better suited for the [Mailinglist](https://groups.google.com/group/octoprint) or the [Google+ Community](https://plus.google.com/communities/102771308349328485741). - -Following these guidelines (**especially EVERYTHING mentioned in ["How to file a bug report"](https://github.com/foosel/OctoPrint/wiki/How-to-file-a-bug-report)**) is necessary so the tickets stay manageable - you are not the only one with an open issue, so please respect that you have to **play by the rules** so that your problem can be taken care of. Tickets not playing by the rules **will be closed without further investigation!**. - -Pull Requests -------------- - -1. If you want to add a new feature to OctoPrint, **please always first consider if it wouldn't be better suited for a - plugin.** As a general rule of thumb, any feature that is only of interest to a small sub group should be moved into a - plugin. If the current plugin system doesn't allow you to implement your feature as a plugin, create a "Brainstorming" - ticket to get the discussion going how best to solve *this* in OctoPrint's plugin system - maybe that's the actual PR - you have been waiting for to contribute :) -2. If you plan to make **any large changes to the code or appearance, please open a "Brainstorming" ticket first** so that - we can determine if it's a good time for your specific pull request. It might be that I'm currently in the process of - making heavy changes to the code locations you'd target as well, or your approach doesn't fit the general "project - vision", and that would just cause unnecessary work and frustration for everyone or possibly get the PR rejected. -3. When adding code to OctoPrint, make sure you **follow the current coding style**. That means tabs instead of spaces in the - python files (yes, I know that this goes against PEP-8, I don't care) and space instead of tabs in the Javascript sources, - english language (that means code, variables, comments!), comments where necessary (tell why the code does something like - it does it, structure your code), following the general architecture. If your PR needs to make changes to the Stylesheets, - change the ``.less`` files from which the CSS is compiled. PRs that contain direct changes to the compiled - CSS will be closed. -4. **Test your changes thoroughly**. That also means testing with usage scenarios you don't normally use, e.g. if you only - use access control, test without and vice versa. If you only test with your printer, test with the virtual printer and - vice versa. State in your pull request how your tested your changes. -5. Please create all pull requests **against the `devel` branch**. -6. Create **one pull request per feature/bug fix**. -7. Create a **custom branch** for your feature/bug fix and use that as base for your pull request. Pull requests directly - against your version of `devel` will be closed. -8. In your pull request's description, **state what your pull request is doing**, as in, what feature does it implement, what - bug does it fix. The more thoroughly you explain your intent behind the PR here, the higher the chances it will get merged - fast. -9. Don't forget to **add yourself to the [AUTHORS](../AUTHORS.md) file** :) - -History -------- - - * 2015-01-23: More guidelines for creating pull requests, support/questions redirected to Mailinglist/G+ community +# Contribution Guidelines + +This document outlines what you need to know before **[creating tickets](#issues-tickets-however-you-may-call-them)** +or **[creating pull requests](#pull-requests)**. + +## Contents + + * [Issues, Tickets, however you may call them](#issues-tickets-however-you-may-call-them) + * [How to file a bug report](#how-to-file-a-bug-report) + * [What should I do before submitting a bug report?](#what-should-i-do-before-submitting-a-bug-report) + * [What should I include in a bug report?](#what-should-i-include-in-a-bug-report) + * [Where can I find which version and branch I'm on?](#where-can-i-find-which-version-and-branch-im-on) + * [Where can I find those log files you keep talking about?](#where-can-i-find-those-log-files-you-keep-talking-about) + * [Where can I find my browser's error console?](#where-can-i-find-my-browsers-error-console) + * [Pull requests](#pull-requests) + * [History](#history) + * [Footnotes](#footnotes) + +## Issues, Tickets, however you may call them + +Please read the following short instructions fully and follow them. You can +help the project tremendously this way: not only do you help the maintainers +to **address problems in a timely manner** but also keep it possible for them +to **fix bugs, add new and improve on existing functionality** instead of doing +nothing but ticket management. + +![Ticket flow chart](http://i.imgur.com/qYSZyuw.png) + +- **[Read the FAQ](https://github.com/foosel/OctoPrint/wiki/FAQ)** +- If you want to report a **bug**, [read "How to file a bug report" below](#how-to-file-a-bug-report) + and *[use the provided template](#what-should-i-include-in-a-ticket)*. + You do not need to do anything else with your ticket. +- If you want to post a **request** of any kind (feature request, documentation + request, ...), add `[Request]` to your issue's title (e.g. `[Request] Awesome new feature`). +- If you are a **developer** that wants to brainstorm a pull request or possible + changes to the plugin system, add [Brainstorming] to your issue's title (e.g. + `[Brainstorming] New plugin hook for doing some cool stuff`). +- If you need **support**, have a **question** or some **other reason** that + doesn't fit any of the above categories, the issue tracker is not the right place. + Consult the [Mailinglist](https://groups.google.com/group/octoprint) or the + [Google+ Community](https://plus.google.com/communities/102771308349328485741) instead. + +No matter what kind of ticket you create, never mix two or more "ticket reasons" +into one ticket: One ticket per bug, request, brainstorming thread please. + +---- + +**Note**: A bot is in place that monitors new tickets, automatically +categorizes them and checks new bug reports for usage of the provided template. +That bot will only bother you if you open a ticket that appears to be a bug (no +`[Request]` or `[Brainstorming]` in the title) without the template, and it +will do that only to ensure that all information needed to solve the issue is +available for the maintainers to directly start tackling that problem. + +---- + +## How to file a bug report + +If you encounter an issue with OctoPrint, you are welcome to +[submit a bug report](https://goo.gl/GzkGv9). + +Before you do that for the first time though please take a moment to read the +following section *completely*. Thank you! :) + +### What should I do before submitting a bug report? + +1. **Make sure you are at the right location**. This is the Github repository + of the official version of OctoPrint, which is the 3D print server and + corresponding web interface itself. + + **This is not the Github respository of OctoPi**, which is the preconfigured + Raspberry Pi image including OctoPrint among other things - that one can be found + [here](https://github.com/guysoft/OctoPi). Please note that while we do have + some entries regarding OctoPi in the FAQ, any bugs should be reported in the + [proper bug tracker](https://github.com/guysoft/OctoPi/issues) which - again - + is not here. + + **This is also not the Github repository of any OctoPrint Plugins you + might have installed**. Report any issues with those in their corresponding + bug tracker (probably linked to from the plugin's homepage). + + Finally, **this is also not the right issue tracker if you are running an + forked version of OctoPrint**. Seek help for such unofficial versions from + the people maintaining them instead. + +2. Please make sure to **test out the current version** of OctoPrint to see + whether the problem you are encountering still exists. + + If you are feeling up to it you might also want to try the current development + version of OctoPrint (if you aren't already). Refer to the [FAQ](https://github.com/foosel/OctoPrint/wiki/FAQ) + for information on how to do this. + +3. The problem still exists? Then please **look through the + [existing tickets](https://github.com/foosel/OctoPrint/issues?state=open) + (use the [search](https://github.com/foosel/OctoPrint/search?q=&ref=cmdform&type=Issues))** + to check if there already exists a report of the issue you are encountering. + Sorting through duplicates of the same issue sometimes causes more work than + fixing it. Take the time to filter through possible duplicates and be really + sure that your problem definitely is a new one. Try more than one search query + (e.g. do not only search for "webcam" if you happen to run into an issue + with your webcam, also search for "timelapse" etc). + +### What should I include in a bug report? + +Always use the following template (you can remove what's within `[...]`, that's +only provided here as some additional information for you): + + #### What were you doing? + + [Please be as specific as possible here. The maintainers will need to reproduce + your issue in order to fix it and that is not possible if they don't know + what you did to get it to happen in the first place. If you encountered + a problem with specific files of any sorts, make sure to also include a link to a file + with which to reproduce the problem.] + + #### What did you expect to happen? + + #### What happened instead? + + #### Branch & Commit or Version of OctoPrint + + [Can be found in the lower left corner of the web interface.] + + #### Printer model & used firmware incl. version + + [If applicable, always include if unsure.] + + #### Browser and Version of Browser, Operating System running Browser + + [If applicable, always include if unsure.] + + #### Link to octoprint.log + + [On gist.github.com or pastebin.com. Always include and never truncate.] + + #### Link to contents of terminal tab or serial.log + + [On gist.github.com or pastebin.com. If applicable, always include if unsure or + reporting communication issues. Never truncate.] + + #### Link to contents of Javascript console in the browser + + [On gist.github.com or pastebin.com or alternatively a screenshot. If applicable - + always include if unsure or reporting UI issues.] + + #### Screenshot(s) showing the problem: + + [If applicable. Always include if unsure or reporting UI issues.] + + I have read the FAQ. + +### Where can I find which version and branch I'm on? + +You can find out all of them by taking a look into the lower left corner of the +OctoPrint UI: + +![Current version and git branch info in OctoPrint's UI](http://i.imgur.com/HyHMlY2.png) + +If you don't have access to the UI you can find out that information via the +command line as well. Either `octoprint --version` or `python setup.py version` +in OctoPrint's folder will tell you the version of OctoPrint you are running +(note: if it doesn't then you are running a version older than 1.1.0, +*upgrade now*). A `git branch` in your OctoPrint installation folder will mark +the branch you are on with a little *. `git rev-parse HEAD` will tell you the +current commit. + +### Where can I find those log files you keep talking about? + +OctoPrint by default provides two log outputs, a third one can be enabled if +more information is needed. + +One is contained in the **"Terminal" tab** within OctoPrint's UI and is a log +of the last 300 lines of communication with the printer. Please copy-paste +this somewhere (disable auto scroll to make copying the contents easier) - +e.g. http://pastebin.com or http://gist.github.com - and include a link in +your bug report. + +There is also **OctoPrint's application log file** or in short `octoprint.log`, +which is by default located at `~/.octoprint/logs/octoprint.log` on Linux, +`%APPDATA%\OctoPrint\logs\octoprint.log` on Windows and +`~/Library/Application Support/OctoPrint/logs/octoprint.log` on MacOS. Please +copy-paste this to pastebin or gist as well and include a link in your bug +report. + +It might happen that you are asked to provide a more **thorough log of the +communication with the printer** if you haven't already done so, the `serial.log`. +This is not written by default due to performance reasons, but you can enable +it in the settings dialog. After enabling that log, please reproduce the problem +again (connect to the printer, do whatever triggers it), then copy-paste +`~/.octoprint/logs/serial.log` (Windows: `%APPDATA%\OctoPrint\logs\serial.log`, +MacOS: `~/Library/Application Support/OctoPrint/logs/serial.log`) to pastebin +or gist and include the link in the bug report. + +You might also be asked to provide a log with an increased log level. You can +find information on how to do just that in the +[docs](http://docs.octoprint.org/en/master/configuration/logging_yaml.html). + +### Where can I find my browser's error console? + +See [How to open the Javascript Console in different browsers](https://webmasters.stackexchange.com/questions/8525/how-to-open-the-javascript-console-in-different-browsers) + +## Pull requests + +1. If you want to add a new feature to OctoPrint, **please always first + consider if it wouldn't be better suited for a plugin.** As a general rule + of thumb, any feature that is only of interest to a small sub group should + be moved into a plugin. If the current plugin system doesn't allow you to + implement your feature as a plugin, create a "Brainstorming" ticket to get + the discussion going on how best to solve *this* in OctoPrint's plugin + system - maybe that's the actual PR you have been waiting for to contribute :) +2. If you plan to make **any large changes to the code or appearance, please + open a "Brainstorming" ticket first** so that we can determine if it's a + good time for your specific pull request. It might be that we're currently + in the process of making heavy changes to the code locations you'd target + as well, or your approach doesn't fit the general "project vision", and + that would just cause unnecessary work and frustration for everyone or + possibly get the PR rejected. +3. Create your pull request **from a custom branch** on your end (e.g. + `dev/myNewFeature`)[1] **against the `devel` branch**. Create **one pull request + per feature/bug fix**. If your PR contains an important bug fix, we will + make sure to backport it to the `maintenance` branch to also include it in + the next release. +4. Make sure you **follow the current coding style**. This means: + * Tabs instead of spaces in the Python files[2] + * Spaces instead of tabs in the Javascript sources + * English language (code, variables, comments, ...) + * Comments where necessary: Tell why the code does something like it does + it, structure your code + * Following the general architecture + If your PR needs to make changes to the Stylesheets, change the ``.less`` files + from which the CSS is compiled. +5. **Test your changes thoroughly**. That also means testing with usage + scenarios you don't normally use, e.g. if you only use access control, test + without and vice versa. If you only test with your printer, test with the + virtual printer and vice versa. State in your pull request how your tested + your changes. Ideally **add unit tests** - OctoPrint severly lacks in that + department, but we are trying to change that, so any new code already covered + with a test suite helps a lot! +6. In your pull request's description, **state what your pull request is doing**, + as in, what feature does it implement, what bug does it fix. The more + thoroughly you explain your intent behind the PR here, the higher the + chances it will get merged fast. +7. Important: Don't forget to **add yourself to the [AUTHORS](./AUTHORS.md) + file** :) + +## History + + * 2015-01-23: More guidelines for creating pull requests, support/questions + redirected to Mailinglist/G+ community * 2015-01-27: Added another explicit link to the FAQ * 2015-07-07: Added step to add yourself to AUTHORS when creating a PR :) + * 2015-12-01: Heavily reworked to include examples, better structure and + all information in one document. + +## Footnotes + * [1] - If you are wondering why, the problem is that anything that you add + to your PR's branch will also become part of your PR, so if you create a + PR from your version of `devel` chances are high you'll add changes to the + PR that do not belong to the PR. + * [2] - Yes, we know that this goes against PEP-8. OctoPrint started out as + a fork of Cura and hence stuck to the coding style found therein. Changing + it now would make the history and especially `git blame` completely + unusable, so for now we'll have to deal with it (this decision might be + revisited in the future). diff --git a/docs/api/job.rst b/docs/api/job.rst index 3bcc1fde2..eeb3b0718 100644 --- a/docs/api/job.rst +++ b/docs/api/job.rst @@ -37,7 +37,7 @@ Issue a job command .. sourcecode:: http - POST /api/control/job HTTP/1.1 + POST /api/job HTTP/1.1 Host: example.com Content-Type: application/json X-Api-Key: abcdef... @@ -54,7 +54,7 @@ Issue a job command .. sourcecode:: http - POST /api/control/job HTTP/1.1 + POST /api/job HTTP/1.1 Host: example.com Content-Type: application/json X-Api-Key: abcdef... @@ -71,7 +71,7 @@ Issue a job command .. sourcecode:: http - POST /api/control/job HTTP/1.1 + POST /api/job HTTP/1.1 Host: example.com Content-Type: application/json X-Api-Key: abcdef... @@ -88,7 +88,7 @@ Issue a job command .. sourcecode:: http - POST /api/control/job HTTP/1.1 + POST /api/job HTTP/1.1 Host: example.com Content-Type: application/json X-Api-Key: abcdef... diff --git a/docs/api/printer.rst b/docs/api/printer.rst index 480722494..1184965f8 100644 --- a/docs/api/printer.rst +++ b/docs/api/printer.rst @@ -25,7 +25,8 @@ Tool See :ref:`sec-api-printer-toolcommand`. Bed Bed commands allow setting the temperature and temperature offset for the printer's heated bed. Querying the - corresponding resource returns temperature information including an optional history. + corresponding resource returns temperature information including an optional history. Note that Bed commands + are only available if the currently selected printer profile has a heated bed. See :ref:`sec-api-printer-bedcommand`. SD card SD commands allow initialization, refresh and release of the printer's SD card (if available). Querying the @@ -564,6 +565,9 @@ Issue a bed command Upon success, a status code of :http:statuscode:`204` and an empty body is returned. + If no heated bed is configured for the currently selected printer profile, the resource will return + an :http:statuscode:`409`. + **Example Target Temperature Request** Set the target temperature for the printer's heated bed to 75°C. @@ -610,7 +614,8 @@ Issue a bed command :statuscode 204: No error :statuscode 400: If ``target`` or ``offset`` is not a valid number or outside of the supported range, or if the request is otherwise invalid. - :statuscode 409: If the printer is not operational. + :statuscode 409: If the printer is not operational or the selected printer profile + does not have a heated bed. .. _sec-api-printer-bedstate: @@ -627,6 +632,9 @@ Retrieve the current bed state Returns a :http:statuscode:`200` with a Temperature Response in the body upon success. + If no heated bed is configured for the currently selected printer profile, the resource will return + an :http:statuscode:`409`. + .. note:: If you want both tool and bed temperature information at the same time, take a look at :ref:`Retrieve the current printer state `. @@ -675,7 +683,8 @@ Retrieve the current bed state :query limit: If set to an integer (``n``), only the last ``n`` data points from the printer's temperature history will be returned. Will be ignored if ``history`` is not enabled. :statuscode 200: No error - :statuscode 409: If the printer is not operational. + :statuscode 409: If the printer is not operational or the selected printer profile + does not have a heated bed. .. _sec-api-printer-sdcommand: @@ -856,7 +865,7 @@ Send an arbitrary command to the printer .. sourcecode:: http HTTP/1.1 204 No Content - + :json string command: Single command to send to the printer, mutually exclusive with ``commands``. :json string commands: List of commands to send to the printer, mutually exclusive with ``command``. :statuscode 204: No error @@ -913,7 +922,8 @@ Temperature State * - ``bed`` - 0..1 - :ref:`Temperature Data ` - - Current temperature stats for the printer's heated bed. Not included if querying only tool state. + - Current temperature stats for the printer's heated bed. Not included if querying only tool state or if + the currently selected printer profile does not have a heated bed. * - ``history`` - 0..1 - List of :ref:`Historic Temperature Datapoint ` diff --git a/docs/features/gcode_scripts.rst b/docs/features/gcode_scripts.rst index 011e15c36..d1b5fde80 100644 --- a/docs/features/gcode_scripts.rst +++ b/docs/features/gcode_scripts.rst @@ -86,7 +86,7 @@ Out of the box, OctoPrint defaults to the following script setup for ``afterPrin ;disable all heaters {% snippet 'disable_hotends' %} - M140 S0 + [% snippet 'disable_bed' %} ;disable fan M106 S0 @@ -100,8 +100,19 @@ The ``disable_hotends`` snippet is defined as follows: M104 T{{ tool }} S0 {% endfor %} -As you can see, the ``disable_hotends`` snippet utilizes the ``printer_profile`` context variable in order to -iterate through all available extruders and set their temperature to 0. +The ``disable_bed`` snippet is defined as follows: + +.. code-block:: jinja + :caption: Default ``disable_bed`` snippet + + {% if printer_profile.heatedBed %} + M140 S0 + {% endif %} + +As you can see, the ``disable_hotends`` and ``disable_bed`` snippets utilize the +``printer_profile`` context variable in order to iterate through all available +extruders and set their temperature to 0, and to also set the bed temperature +to 0 if a heated bed is configured. .. seealso:: diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 000000000..cbda2efbf --- /dev/null +++ b/setup.cfg @@ -0,0 +1,11 @@ +[metadata] +description-file = README.md + +[versioneer] +VCS = git +style = pep440-post +versionfile_source = src/octoprint/_version.py +versionfile_build = octoprint/_version.py +tag_prefix = +parentdir_prefix = +lookupfile = .versioneer-lookup diff --git a/setup.py b/setup.py index 80ed83c4b..86b7837f9 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,10 @@ # Documentation dependencies "sphinx>=1.3", "sphinxcontrib-httpdomain", - "sphinx_rtd_theme" + "sphinx_rtd_theme", + + # PyPi upload related + "pypandoc" ], # Dependencies for developing OctoPrint plugins @@ -56,17 +59,12 @@ ] ) +# Additional requirements for setup +SETUP_REQUIRES = [] + # Dependency links for any of the aforementioned dependencies DEPENDENCY_LINKS = [] -# Versioneer configuration -versioneer.VCS = 'git' -versioneer.versionfile_source = 'src/octoprint/_version.py' -versioneer.versionfile_build = 'octoprint/_version.py' -versioneer.tag_prefix = '' -versioneer.parentdir_prefix = '' -versioneer.lookupfile = '.versioneer-lookup' - #----------------------------------------------------------------------------------------------------------------------- # Anything below here is just command setup and general setup configuration @@ -90,8 +88,22 @@ def params(): version = versioneer.get_version() cmdclass = get_cmdclass() - description = "A responsive web interface for 3D printers" + description = "A snappy web interface for 3D printers" long_description = open("README.md").read() + + install_requires = INSTALL_REQUIRES + extras_require = EXTRA_REQUIRES + dependency_links = DEPENDENCY_LINKS + setup_requires = SETUP_REQUIRES + + try: + import pypandoc + setup_requires += ["setuptools-markdown"] + long_description_markdown_filename = "README.md" + del pypandoc + except: + pass + classifiers = [ "Development Status :: 4 - Beta", "Environment :: Web Environment", @@ -126,9 +138,6 @@ def params(): include_package_data = True zip_safe = False - install_requires = INSTALL_REQUIRES - extras_require = EXTRA_REQUIRES - dependency_links = DEPENDENCY_LINKS if os.environ.get('READTHEDOCS', None) == 'True': # we can't tell read the docs to please perform a pip install -e .[develop], so we help diff --git a/src/octoprint/_version.py b/src/octoprint/_version.py index 35090f5b8..60161f3c8 100644 --- a/src/octoprint/_version.py +++ b/src/octoprint/_version.py @@ -1,28 +1,81 @@ # This file helps to compute a version number in source trees obtained from # git-archive tarball (such as those provided by githubs download-from-tag -# feature). Distribution tarballs (build by setup.py sdist) and build +# feature). Distribution tarballs (built by setup.py sdist) and build # directories (produced by setup.py build) will contain a much shorter file # that just contains the computed version number. # This file is released into the public domain. Generated by -# versioneer-0.10 (https://github.com/warner/python-versioneer) - -# these strings will be replaced by git during git-archive -git_refnames = "$Format:%d$" -git_full = "$Format:%H$" +# versioneer-0.15+dev (https://github.com/warner/python-versioneer) +"""Git implementation of _version.py.""" +import errno +import os +import re import subprocess import sys -import errno + + +def get_keywords(): + """Get the keywords needed to look up the version information.""" + # these strings will be replaced by git during git-archive. + # setup.py/versioneer.py will grep for the variable names, so they must + # each be defined on a line of their own. _version.py will just call + # get_keywords(). + git_refnames = "$Format:%d$" + git_full = "$Format:%H$" + keywords = {"refnames": git_refnames, "full": git_full} + return keywords + + +class VersioneerConfig: + + """Container for Versioneer configuration parameters.""" + + +def get_config(): + """Create, populate and return the VersioneerConfig() object.""" + # these strings are filled in when 'setup.py versioneer' creates + # _version.py + cfg = VersioneerConfig() + cfg.VCS = "git" + cfg.style = "pep440" + cfg.tag_prefix = "" + cfg.parentdir_prefix = "" + cfg.versionfile_source = "src/octoprint/_version.py" + cfg.lookupfile = None + cfg.verbose = False + return cfg + + +class NotThisMethod(Exception): + + """Exception raised if a method is not valid for the current scenario.""" + + +LONG_VERSION_PY = {} +HANDLERS = {} + + +def register_vcs_handler(vcs, method): # decorator + """Decorator to mark a method as the handler for a particular VCS.""" + def decorate(f): + """Store f in HANDLERS[vcs][method].""" + if vcs not in HANDLERS: + HANDLERS[vcs] = {} + HANDLERS[vcs][method] = f + return f + return decorate def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False): + """Call the given command(s).""" assert isinstance(commands, list) p = None for c in commands: try: + dispcmd = str([c] + args) # remember shell=False, so use git.cmd on windows, not just git p = subprocess.Popen([c] + args, cwd=cwd, stdout=subprocess.PIPE, stderr=(subprocess.PIPE if hide_stderr @@ -33,7 +86,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False): if e.errno == errno.ENOENT: continue if verbose: - print("unable to run %s" % args[0]) + print("unable to run %s" % dispcmd) print(e) return None else: @@ -41,59 +94,67 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False): print("unable to find command, tried %s" % (commands,)) return None stdout = p.communicate()[0].strip() - if sys.version >= '3': + if sys.version_info[0] >= 3: stdout = stdout.decode() if p.returncode != 0: if verbose: - print("unable to run %s (error)" % args[0]) + print("unable to run %s (error)" % dispcmd) return None return stdout -import sys -import re -import os.path +def versions_from_parentdir(parentdir_prefix, root, verbose): + """Try to determine the version from the parent directory name. -def get_gits(root, verbose=False): - if not os.path.exists(os.path.join(root, ".git")): + Source tarballs conventionally unpack into a directory that includes + both the project name and a version string. + """ + dirname = os.path.basename(root) + if not dirname.startswith(parentdir_prefix): if verbose: - print("no .git in %s" % root) - return None - - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - return GITS + print("guessing rootdir is '%s', but '%s' doesn't start with " + "prefix '%s'" % (root, dirname, parentdir_prefix)) + raise NotThisMethod("rootdir doesn't start with parentdir_prefix") + return {"version": dirname[len(parentdir_prefix):], + "full-revisionid": None, + "dirty": False, "error": None} -def get_expanded_variables(versionfile_abs): +@register_vcs_handler("git", "get_keywords") +def git_get_keywords(versionfile_abs): + """Extract version information from the given file.""" # the code embedded in _version.py can just fetch the value of these - # variables. When used from setup.py, we don't want to import - # _version.py, so we do it with a regexp instead. This function is not - # used from _version.py. - variables = {} + # keywords. When used from setup.py, we don't want to import _version.py, + # so we do it with a regexp instead. This function is not used from + # _version.py. + keywords = {} try: - f = open(versionfile_abs,"r") + f = open(versionfile_abs, "r") for line in f.readlines(): if line.strip().startswith("git_refnames ="): mo = re.search(r'=\s*"(.*)"', line) if mo: - variables["refnames"] = mo.group(1) + keywords["refnames"] = mo.group(1) if line.strip().startswith("git_full ="): mo = re.search(r'=\s*"(.*)"', line) if mo: - variables["full"] = mo.group(1) + keywords["full"] = mo.group(1) f.close() except EnvironmentError: pass - return variables + return keywords -def versions_from_expanded_variables(variables, tag_prefix, verbose=False): - refnames = variables["refnames"].strip() + +@register_vcs_handler("git", "keywords") +def git_versions_from_keywords(keywords, tag_prefix, verbose): + """Get version information from git keywords.""" + if not keywords: + raise NotThisMethod("no keywords at all, weird") + refnames = keywords["refnames"].strip() if refnames.startswith("$Format"): if verbose: - print("variables are unexpanded, not using") - return {} # unexpanded, so not in an unpacked git-archive tarball + print("keywords are unexpanded, not using") + raise NotThisMethod("unexpanded keywords, not a git-archive tarball") refs = set([r.strip() for r in refnames.strip("()").split(",")]) # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of # just "foo-1.0". If we see a "tag: " prefix, prefer those. @@ -110,6 +171,15 @@ def versions_from_expanded_variables(variables, tag_prefix, verbose=False): tags = set([r for r in refs if re.search(r'\d', r)]) if verbose: print("discarding '%s', no digits" % ",".join(refs-tags)) + + branches = [r for r in refs if not r.startswith(TAG) + and r != "HEAD" and not r.startswith("refs/")] + if verbose: + print("likely branches: %s" % ",".join(sorted(branches))) + branch = None + if branches: + branch = branches[0] + if verbose: print("likely tags: %s" % ",".join(sorted(tags))) for ref in sorted(tags): @@ -118,161 +188,473 @@ def versions_from_expanded_variables(variables, tag_prefix, verbose=False): r = ref[len(tag_prefix):] if verbose: print("picking %s" % r) - return { "version": r, - "full": variables["full"].strip() } - # no suitable tags, so we use the full revision id + + result = {"version": r, + "full-revisionid": keywords["full"].strip(), + "dirty": False, "error": None} + if branch is not None: + result["branch"] = branch + return result + # no suitable tags, so version is "0+unknown", but full hex is still there if verbose: - print("no suitable tags, using full revision id") - return { "version": variables["full"].strip(), - "full": variables["full"].strip() } + print("no suitable tags, using unknown + full revision id") + return {"version": "0+unknown", + "full-revisionid": keywords["full"].strip(), + "dirty": False, "error": "no suitable tags"} + + +@register_vcs_handler("git", "pieces_from_vcs") +def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): + """Get version from 'git describe' in the root of the source tree. + + This only gets called if the git-archive 'subst' keywords were *not* + expanded, and _version.py hasn't already been rewritten with a short + version string, meaning we're inside a checked out source tree. + """ + if not os.path.exists(os.path.join(root, ".git")): + if verbose: + print("no .git in %s" % root) + raise NotThisMethod("no .git directory") + + GITS = ["git"] + if sys.platform == "win32": + GITS = ["git.cmd", "git.exe"] + # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] + # if there isn't one, this yields HEX[-dirty] (no NUM) + describe_out = run_command(GITS, ["describe", "--tags", "--dirty", + "--always", "--long", + "--match", "%s*" % tag_prefix], + cwd=root) + # --long was added in git-1.5.5 + if describe_out is None: + raise NotThisMethod("'git describe' failed") + describe_out = describe_out.strip() + full_out = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) + if full_out is None: + raise NotThisMethod("'git rev-parse' failed") + full_out = full_out.strip() + + pieces = {} + pieces["long"] = full_out + pieces["short"] = full_out[:7] # maybe improved later + pieces["error"] = None + + # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] + # TAG might have hyphens. + git_describe = describe_out + + # look for -dirty suffix + dirty = git_describe.endswith("-dirty") + pieces["dirty"] = dirty + if dirty: + git_describe = git_describe[:git_describe.rindex("-dirty")] + + # figure out our branch + abbrev_ref_out = run_command(GITS, + ["rev-parse", "--abbrev-ref", "HEAD"], + cwd=root) + if abbrev_ref_out is not None: + pieces["branch"] = abbrev_ref_out.strip() + + # now we have TAG-NUM-gHEX or HEX + + if "-" in git_describe: + # TAG-NUM-gHEX + mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) + if not mo: + # unparseable. Maybe git-describe is misbehaving? + pieces["error"] = ("unable to parse git-describe output: '%s'" + % describe_out) + return pieces + + # tag + full_tag = mo.group(1) + if not full_tag.startswith(tag_prefix): + if verbose: + fmt = "tag '%s' doesn't start with prefix '%s'" + print(fmt % (full_tag, tag_prefix)) + pieces["error"] = ("tag '%s' doesn't start with prefix '%s'" + % (full_tag, tag_prefix)) + return pieces + pieces["closest-tag"] = full_tag[len(tag_prefix):] + + # distance: number of commits since tag + pieces["distance"] = int(mo.group(2)) + + # commit: short hex revision ID + pieces["short"] = mo.group(3) + + else: + # HEX: no tags + pieces["closest-tag"] = None + count_out = run_command(GITS, ["rev-list", "HEAD", "--count"], + cwd=root) + pieces["distance"] = int(count_out) # total number of commits + + return pieces + + +@register_vcs_handler("git", "parse_lookup_file") +def git_parse_lookup_file(path): + """Parse a versioneer lookup file. + + This file allows definition of branch specific data like virtual tags or + custom styles to use for version rendering. + """ + if not os.path.exists(path): + return [] + + import re + lookup = [] + with open(path, "r") as f: + for line in f: + if '#' in line: + line = line[:line.rindex("#")] + line = line.strip() + if not line: + continue + + try: + split_line = map(lambda x: x.strip(), line.split()) + if not len(split_line): + continue + + matcher = re.compile(split_line[0]) + + if len(split_line) == 1: + entry = [matcher, None, None, None] + elif len(split_line) == 2: + render = split_line[1] + entry = [matcher, render, None, None] + elif len(split_line) == 3: + tag, ref_commit = split_line[1:] + entry = [matcher, None, tag, ref_commit] + elif len(split_line) == 4: + tag, ref_commit, render = split_line[1:] + entry = [matcher, render, tag, ref_commit] + else: + continue + + lookup.append(entry) + except: + break + return lookup -def versions_from_lookup(lookup, root, verbose=False): - GITS = get_gits(root, verbose=verbose) - if GITS is None: - return {} + +@register_vcs_handler("git", "pieces_from_lookup") +def git_pieces_from_lookup(lookup, root, verbose, run_command=run_command): + """Extract version information based on provided lookup data.""" + GITS = ["git"] + if sys.platform == "win32": + GITS = ["git.cmd", "git.exe"] stdout = run_command(GITS, ["rev-parse", "--abbrev-ref", "HEAD"], cwd=root) if stdout is None: - return {} + raise NotThisMethod("git rev-parse --abbrev-ref HEAD failed") current_branch = stdout.strip() - for matcher, tag, ref_commit in lookup: + for matcher, render, tag, ref_commit in lookup: if matcher.match(current_branch): if tag is None or ref_commit is None: - return {} + raise NotThisMethod("tag or ref_commit is unset for " + "this branch") - stdout = run_command(GITS, ["rev-list", "%s..HEAD" % ref_commit, "--count"], cwd=root) + stdout = run_command(GITS, + ["rev-list", "%s..HEAD" % ref_commit, + "--count"], + cwd=root) if stdout is None: - return {} - num_commits = stdout.strip() - - stdout =run_command(GITS, ["rev-parse", "--short", "HEAD"], cwd=root) + raise NotThisMethod("git rev-list %s..HEAD " + "--count failed" % ref_commit) + try: + num_commits = int(stdout.strip()) + except ValueError: + raise NotThisMethod("git rev-list %s..HEAD --count didn't " + "return a valid number" % ref_commit) + + stdout = run_command(GITS, + ["rev-parse", "--short", "HEAD"], + cwd=root) if stdout is None: - return {} + raise NotThisMethod("git describe rev-parse " + "--short HEAD failed") short_hash = stdout.strip() - stdout = run_command(GITS, ["describe", "--tags", "--dirty", "--always"], cwd=root) + stdout = run_command(GITS, + ["describe", "--tags", + "--dirty", "--always"], + cwd=root) if stdout is None: - return {} + raise NotThisMethod("git describe --tags --dirty " + "--always failed") dirty = stdout.strip().endswith("-dirty") stdout = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) if stdout is None: - return {} + raise NotThisMethod("git rev-parse HEAD failed") full = stdout.strip() - version = "%s-%s-g%s" % (tag, num_commits, short_hash) - if dirty: - version += "-dirty" - full += "-dirty" - return {"version": version, "full": full, "branch": current_branch} - - return {} + return { + "long": full, + "short": short_hash, + "dirty": dirty, + "branch": current_branch, + "closest-tag": tag, + "distance": num_commits, + "error": None, + "render": render + } + + raise NotThisMethod("no matching lookup definition found") + + +def plus_or_dot(pieces): + """Return a + if we don't already have one, else return a .""" + if "+" in pieces.get("closest-tag", ""): + return "." + return "+" + + +def render_pep440(pieces): + """Build up version string, with post-release "local version identifier". + + Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you + get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty + + Exceptions: + 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"] or pieces["dirty"]: + rendered += plus_or_dot(pieces) + rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) + if pieces["dirty"]: + rendered += ".dirty" + else: + # exception #1 + rendered = "0+untagged.%d.g%s" % (pieces["distance"], + pieces["short"]) + if pieces["dirty"]: + rendered += ".dirty" + return rendered + + +def render_pep440_pre(pieces): + """TAG[.post.devDISTANCE] -- No -dirty. + + Exceptions: + 1: no tags. 0.post.devDISTANCE + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"]: + rendered += ".post.dev%d" % pieces["distance"] + else: + # exception #1 + rendered = "0.post.dev%d" % pieces["distance"] + return rendered + + +def render_pep440_post(pieces): + """TAG[.postDISTANCE[.dev0]+gHEX] . + + The ".dev0" means dirty. Note that .dev0 sorts backwards + (a dirty tree will appear "older" than the corresponding clean one), + but you shouldn't be releasing software with -dirty anyways. + + Exceptions: + 1: no tags. 0.postDISTANCE[.dev0] + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"] or pieces["dirty"]: + rendered += ".post%d" % pieces["distance"] + if pieces["dirty"]: + rendered += ".dev0" + rendered += plus_or_dot(pieces) + rendered += "g%s" % pieces["short"] + else: + # exception #1 + rendered = "0.post%d" % pieces["distance"] + if pieces["dirty"]: + rendered += ".dev0" + rendered += "+g%s" % pieces["short"] + return rendered + + +def render_pep440_dev(pieces): + """TAG[.devDISTANCE]+gHEX[.dirty] . + + Exceptions: + 1: no tags. 0.devDISTANCE+gHEX[.dirty] + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"]: + rendered += ".dev%d" % pieces["distance"] + rendered += plus_or_dot(pieces) + else: + # exception #1 + rendered = "0.dev%d" % pieces["distance"] + rendered += "+" + rendered += "g%s" % pieces["short"] + if pieces["dirty"]: + rendered += ".dirty" + return rendered + + +def render_pep440_old(pieces): + """TAG[.postDISTANCE[.dev0]] . + + The ".dev0" means dirty. + + Eexceptions: + 1: no tags. 0.postDISTANCE[.dev0] + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"] or pieces["dirty"]: + rendered += ".post%d" % pieces["distance"] + if pieces["dirty"]: + rendered += ".dev0" + else: + # exception #1 + rendered = "0.post%d" % pieces["distance"] + if pieces["dirty"]: + rendered += ".dev0" + return rendered -def versions_from_vcs(tag_prefix, root, verbose=False): - # this runs 'git' from the root of the source tree. This only gets called - # if the git-archive 'subst' variables were *not* expanded, and - # _version.py hasn't already been rewritten with a short version string, - # meaning we're inside a checked out source tree. - GITS = get_gits(root, verbose=verbose) - if GITS is None: - return {} +def render_git_describe(pieces): + """TAG[-DISTANCE-gHEX][-dirty]. - stdout = run_command(GITS, ["describe", "--tags", "--dirty", "--always"], - cwd=root) - if stdout is None: - return {} - if not stdout.startswith(tag_prefix): - if verbose: - print("tag '%s' doesn't start with prefix '%s'" % (stdout, tag_prefix)) - return {} - tag = stdout[len(tag_prefix):] - stdout = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if stdout is None: - return {} - full = stdout.strip() - if tag.endswith("-dirty"): - full += "-dirty" + Like 'git describe --tags --dirty --always'. - stdout = run_command(GITS, ["rev-parse", "--abbrev-ref", "HEAD"], - cwd=root) - if stdout is None: - branch = None + Exceptions: + 1: no tags. HEX[-dirty] (note: no 'g' prefix) + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"]: + rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) else: - branch = stdout.strip() - return {"version": tag, "full": full, "branch": branch} + # exception #1 + rendered = pieces["short"] + if pieces["dirty"]: + rendered += "-dirty" + return rendered -def versions_from_parentdir(parentdir_prefix, root, verbose=False): - # Source tarballs conventionally unpack into a directory that includes - # both the project name and a version string. - dirname = os.path.basename(root) - if not dirname.startswith(parentdir_prefix): - if verbose: - print("guessing rootdir is '%s', but '%s' doesn't start with prefix '%s'" % - (root, dirname, parentdir_prefix)) - return None - return {"version": dirname[len(parentdir_prefix):], "full": "", "branch": ""} +def render_git_describe_long(pieces): + """TAG-DISTANCE-gHEX[-dirty]. -tag_prefix = "" -parentdir_prefix = "" -versionfile_source = "src/octoprint/_version.py" -lookupfile = ".versioneer-lookup" + Like 'git describe --tags --dirty --always -long'. + The distance/hash is unconditional. -def parse_lookup_file(root, lookup_path=None): - if not lookup_path: - lookup_path = lookupfile - if not lookup_path: - return [] + Exceptions: + 1: no tags. HEX[-dirty] (note: no 'g' prefix) + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) + else: + # exception #1 + rendered = pieces["short"] + if pieces["dirty"]: + rendered += "-dirty" + return rendered + + +def render(pieces, style): + """Render the given version pieces into the requested style.""" + if pieces["error"]: + return {"version": "unknown", + "full-revisionid": pieces.get("long"), + "dirty": None, + "error": pieces["error"]} + + if "render" in pieces and pieces["render"] is not None: + style = pieces["render"] + + if not style or style == "default": + style = "pep440" # the default + + if style == "pep440": + rendered = render_pep440(pieces) + elif style == "pep440-pre": + rendered = render_pep440_pre(pieces) + elif style == "pep440-post": + rendered = render_pep440_post(pieces) + elif style == "pep440-old": + rendered = render_pep440_old(pieces) + elif style == "pep440-dev": + rendered = render_pep440_dev(pieces) + elif style == "git-describe": + rendered = render_git_describe(pieces) + elif style == "git-describe-long": + rendered = render_git_describe_long(pieces) + else: + raise ValueError("unknown style '%s'" % style) - path = os.path.join(root, lookup_path) - if not os.path.exists(path): - return [] + result = {"version": rendered, "full-revisionid": pieces["long"], + "dirty": pieces["dirty"], "error": None} + if "branch" in pieces and pieces["branch"] is not None: + result["branch"] = pieces["branch"] + return result - import re - lookup = [] - with open(os.path.join(root, lookup_path), "r") as f: - for line in f: - if '#' in line: - line = line[:line.rindex('#')] - line = line.strip() - try: - split_line = line.split() - if len(split_line) == 3: - pattern, tag, ref_commit = split_line - lookup.append([re.compile(pattern), tag, ref_commit]) - elif len(split_line) >= 1: - lookup.append([re.compile(split_line[0]), None, None]) - except: - break - return lookup -def get_versions(default={"version": "unknown", "full": "", "branch": "unknown"}, lookup_path=None, verbose=False): +def get_versions(): + """Get version information or return default if unable to do so.""" # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have # __file__, we can work backwards from there to the root. Some # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which - # case we can only use expanded variables. + # case we can only use expanded keywords. - variables = { "refnames": git_refnames, "full": git_full } - ver = versions_from_expanded_variables(variables, tag_prefix, verbose) - if ver: - return ver + cfg = get_config() + verbose = cfg.verbose + + try: + return git_versions_from_keywords(get_keywords(), cfg.tag_prefix, + verbose) + except NotThisMethod: + pass try: - root = os.path.abspath(__file__) + root = os.path.realpath(__file__) # versionfile_source is the relative path from the top of the source # tree (where the .git directory might live) to this file. Invert # this to find the root from __file__. - for i in range(len(versionfile_source.split("/"))): + for i in cfg.versionfile_source.split('/'): root = os.path.dirname(root) except NameError: - return default + return {"version": "0+unknown", "full-revisionid": None, + "dirty": None, + "error": "unable to find root of source tree"} - lookup = parse_lookup_file(root, lookup_path=lookup_path) - return (versions_from_lookup(lookup, root, verbose) - or versions_from_vcs(tag_prefix, root, verbose) - or versions_from_parentdir(parentdir_prefix, root, verbose) - or default) + lookupfile = cfg.lookupfile if cfg.lookupfile is not None else ".versioneer-lookup" + lookuppath = os.path.join(root, lookupfile) + if os.path.exists(lookuppath): + try: + lookup_data = git_parse_lookup_file(lookuppath) + pieces = git_pieces_from_lookup(lookup_data, root, verbose) + return render(pieces, cfg.style) + except NotThisMethod: + pass + + try: + pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose) + return render(pieces, cfg.style) + except NotThisMethod: + pass + + try: + if cfg.parentdir_prefix: + return versions_from_parentdir(cfg.parentdir_prefix, root, verbose) + except NotThisMethod: + pass + return {"version": "0+unknown", "full-revisionid": None, + "dirty": None, + "error": "unable to compute version"} diff --git a/src/octoprint/filemanager/storage.py b/src/octoprint/filemanager/storage.py index 9f238cf93..6a2378dd6 100644 --- a/src/octoprint/filemanager/storage.py +++ b/src/octoprint/filemanager/storage.py @@ -13,6 +13,8 @@ import octoprint.filemanager +from octoprint.util import is_hidden_path + class StorageInterface(object): """ Interface of storage adapters for OctoPrint. @@ -357,7 +359,7 @@ def _analysis_backlog_generator(self, path=None): if not metadata: metadata = dict() for entry in os.listdir(path): - if entry.startswith(".") or not octoprint.filemanager.valid_file_type(entry): + if is_hidden_path(entry) or not octoprint.filemanager.valid_file_type(entry): continue absolute_path = os.path.join(path, entry) @@ -584,24 +586,6 @@ def sanitize(self, path): Note that for a ``path`` without a trailing slash the last part will be considered a file name and hence be returned at second position. If you only need to convert a folder path, be sure to include a trailing slash for a string ``path`` or an empty last element for a list ``path``. - - Examples:: - - >>> storage = LocalFileStorage("/some/base/folder") - >>> storage.sanitize("some/folder/and/some file.gco") - ("/some/base/folder/some/folder/and", "some_file.gco") - >>> storage.sanitize(("some", "folder", "and", "some file.gco")) - ("/some/base/folder/some/folder/and", "some_file.gco") - >>> storage.sanitize("some file.gco") - ("/some/base/folder", "some_file.gco") - >>> storage.sanitize(("some file.gco",)) - ("/some/base/folder", "some_file.gco") - >>> storage.sanitize("") - ("/some/base/folder", "") - >>> storage.sanitize("some/folder/with/trailing/slash/") - ("/some/base/folder/some/folder/with/trailing/slash", "") - >>> storage.sanitize("some", "folder", "") - ("/some/base/folder/some/folder", "") """ name = None if isinstance(path, (str, unicode, basestring)): @@ -628,24 +612,6 @@ def sanitize_name(self, name): Raises a :class:`ValueError` for a ``name`` containing ``/`` or ``\``. Otherwise strips any characters from the given ``name`` that are not any of the ASCII characters, digits, ``-``, ``_``, ``.``, ``(``, ``)`` or space and replaces and spaces with ``_``. - - Examples:: - - >>> storage = LocalFileStorage("/some/base/folder") - >>> storage.sanitize_name("some_file.gco") - "some_file.gco" - >>> storage.sanitize_name("some_file with (parentheses) and ümläuts and digits 123.gco") - "some_file_with_(parentheses)_and_mluts_and_digits_123.gco" - >>> storage.sanitize_name("pengüino pequeño.stl") - "pengino_pequeo.stl" - >>> storage.sanitize_name("some/folder/still/left.gco") - Traceback (most recent call last): - File "", line 1, in - ValueError: name must not contain / or \ - >>> storage.sanitize_name("also\\no\\backslashes.gco") - Traceback (most recent call last): - File "", line 1, in - ValueError: name must not contain / or \ """ if name is None: return None @@ -664,22 +630,6 @@ def sanitize_path(self, path): Ensures that the on disk representation of ``path`` is located under the configured basefolder. Resolves all relative path elements (e.g. ``..``) and sanitizes folder names using :func:`sanitize_name`. Final path is the absolute path including leading ``basefolder`` path. - - Examples:: - - >>> storage = LocalFileStorage("/some/base/folder") - >>> storage.sanitize_path("folder/with/subfolder") - "/some/base/folder/folder/with/subfolder" - >>> storage.sanitize_path("folder/with/subfolder/../other/folder") - "/some/base/folder/folder/with/other/folder" - >>> storage.sanitize_path("/folder/with/leading/slash") - "/some/base/folder/folder/with/leading/slash" - >>> storage.sanitize_path(".folder/with/leading/dot") - "/some/base/folder/folder/with/leading/dot - >>> storage.sanitize_path("../../folder/out/of/the/basefolder") - Traceback (most recent call last): - File "", line 1, in - ValueError: path not contained in base folder: /some/folder/out/of/the/basefolder """ if path[0] == "/" or path[0] == ".": path = path[1:] @@ -939,7 +889,7 @@ def _list_folder(self, path, filter=None, recursive=True): result = dict() for entry in os.listdir(path): - if entry.startswith("."): + if is_hidden_path(entry): # no hidden files and folders continue diff --git a/src/octoprint/plugin/__init__.py b/src/octoprint/plugin/__init__.py index 21976d08b..0cc587150 100644 --- a/src/octoprint/plugin/__init__.py +++ b/src/octoprint/plugin/__init__.py @@ -293,19 +293,16 @@ def __init__(self, settings, plugin_key, defaults=None, get_preprocessors=None, self.set_preprocessors = dict(plugins=dict()) self.set_preprocessors["plugins"][plugin_key] = set_preprocessors - def prefix_path(path): - return ['plugins', self.plugin_key] + path - def prefix_path_in_args(args, index=0): result = [] if index == 0: - result.append(prefix_path(args[0])) + result.append(self._prefix_path(args[0])) result.extend(args[1:]) else: args_before = args[:index - 1] args_after = args[index + 1:] result.extend(args_before) - result.append(prefix_path(args[index])) + result.append(self._prefix_path(args[index])) result.extend(args_after) return result @@ -324,6 +321,7 @@ def add_setter_kwargs(kwargs): return kwargs self.access_methods = dict( + has =("has", prefix_path_in_args, add_getter_kwargs), get =("get", prefix_path_in_args, add_getter_kwargs), get_int =("getInt", prefix_path_in_args, add_getter_kwargs), get_float =("getFloat", prefix_path_in_args, add_getter_kwargs), @@ -331,7 +329,8 @@ def add_setter_kwargs(kwargs): set =("set", prefix_path_in_args, add_setter_kwargs), set_int =("setInt", prefix_path_in_args, add_setter_kwargs), set_float =("setFloat", prefix_path_in_args, add_setter_kwargs), - set_boolean=("setBoolean", prefix_path_in_args, add_setter_kwargs) + set_boolean=("setBoolean", prefix_path_in_args, add_setter_kwargs), + remove =("remove", prefix_path_in_args) ) self.deprecated_access_methods = dict( getInt ="get_int", @@ -342,6 +341,17 @@ def add_setter_kwargs(kwargs): setBoolean="set_boolean" ) + def _prefix_path(self, path=None): + if path is None: + path = list() + return ['plugins', self.plugin_key] + path + + def global_has(self, path, **kwargs): + return self.settings.has(path, **kwargs) + + def global_remove(self, path, **kwargs): + return self.settings.remove(path, **kwargs) + def global_get(self, path, **kwargs): """ Getter for retrieving settings not managed by the plugin itself from the core settings structure. Use this @@ -435,6 +445,24 @@ def get_plugin_data_folder(self): os.makedirs(path) return path + def get_all_data(self, **kwargs): + merged = kwargs.get("merged", True) + asdict = kwargs.get("asdict", True) + defaults = kwargs.get("defaults", self.defaults) + preprocessors = kwargs.get("preprocessors", self.get_preprocessors) + + kwargs.update(dict( + merged=merged, + asdict=asdict, + defaults=defaults, + preprocessors=preprocessors + )) + + return self.settings.get(self._prefix_path(), **kwargs) + + def clean_all_data(self): + self.settings.remove(self._prefix_path()) + def __getattr__(self, item): all_access_methods = self.access_methods.keys() + self.deprecated_access_methods.keys() if item in all_access_methods: diff --git a/src/octoprint/plugin/types.py b/src/octoprint/plugin/types.py index bf702cb68..d1987ea6e 100644 --- a/src/octoprint/plugin/types.py +++ b/src/octoprint/plugin/types.py @@ -651,6 +651,24 @@ def decorator(f): return f return decorator + @staticmethod + def errorhandler(code_or_exception): + """ + A decorator to mark errorhandlings methods in your BlueprintPlugin subclass. Works just the same as Flask's + own ``errorhandler`` decorator available on blueprints. + + See `the documentation for flask.Blueprint.errorhandler `_ + and `the documentation for flask.Flask.errorhandler `_ for more + information. + """ + from collections import defaultdict + def decorator(f): + if not hasattr(f, "_blueprint_error_handler") or f._blueprint_error_handler is None: + f._blueprint_error_handler = defaultdict(list) + f._blueprint_error_handler[f.__name__].append(code_or_exception) + return f + return decorator + def get_blueprint(self): """ Creates and returns the blueprint for your plugin. Override this if you want to define and handle your blueprint yourself. @@ -660,15 +678,34 @@ def get_blueprint(self): :return: the blueprint ready to be registered with Flask """ + if hasattr(self, "_blueprint"): + # if we already constructed the blueprint and hence have it cached, + # return that instance - we don't want to instance it multiple times + return self._blueprint + import flask kwargs = self.get_blueprint_kwargs() blueprint = flask.Blueprint("plugin." + self._identifier, self._identifier, **kwargs) + + # we now iterate over all members of ourselves and look if we find an attribute + # that has data originating from one of our decorators - we ignore anything + # starting with a _ to only handle public stuff for member in [member for member in dir(self) if not member.startswith("_")]: f = getattr(self, member) + if hasattr(f, "_blueprint_rules") and member in f._blueprint_rules: + # this attribute was annotated with our @route decorator for blueprint_rule in f._blueprint_rules[member]: rule, options = blueprint_rule blueprint.add_url_rule(rule, options.pop("endpoint", f.__name__), view_func=f, **options) + + if hasattr(f, "_blueprint_error_handler") and member in f._blueprint_error_handler: + # this attribute was annotated with our @error_handler decorator + for code_or_exception in f._blueprint_error_handler[member]: + blueprint.errorhandler(code_or_exception)(f) + + # cache and return the blueprint object + self._blueprint = blueprint return blueprint def get_blueprint_kwargs(self): @@ -764,6 +801,9 @@ def on_after_startup(self): the plugin core system upon initialization of the implementation. """ + config_version_key = "_config_version" + """Key of the field in the settings that holds the configuration format version.""" + def on_settings_load(self): """ Loads the settings for the plugin, called by the Settings API view in order to retrieve all settings from @@ -781,9 +821,9 @@ def on_settings_load(self): :return: the current settings of the plugin, as a dictionary """ - data = self._settings.get([], asdict=True, merged=True) - if "_config_version" in data: - del data["_config_version"] + data = self._settings.get_all_data() + if self.config_version_key in data: + del data[self.config_version_key] return data def on_settings_save(self, data): @@ -795,7 +835,8 @@ def on_settings_save(self, data): .. note:: The default implementation will persist your plugin's settings as is, so just in the structure and in the - types that were received by the Settings API view. + types that were received by the Settings API view. Values identical to the default settings values + will *not* be persisted. If you need more granular control here, e.g. over the used data types, you'll need to override this method and iterate yourself over all your settings, retrieving them (if set) from the supplied received ``data`` @@ -803,15 +844,38 @@ def on_settings_save(self, data): Arguments: data (dict): The settings dictionary to be saved for the plugin + + Returns: + dict: The settings that differed from the defaults and were actually saved. """ import octoprint.util - if "_config_version" in data: - del data["_config_version"] + # get the current data + current = self._settings.get_all_data() + if current is None: + current = dict() + + # merge our new data on top of it + new_current = octoprint.util.dict_merge(current, data) + if self.config_version_key in new_current: + del new_current[self.config_version_key] + + # determine diff dict that contains minimal set of changes against the + # default settings - we only want to persist that, not everything + diff = octoprint.util.dict_minimal_mergediff(self.get_settings_defaults(), new_current) + + version = self.get_settings_version() + + to_persist = dict(diff) + if version: + to_persist[self.config_version_key] = version + + if to_persist: + self._settings.set([], to_persist) + else: + self._settings.clean_all_data() - current = self._settings.get([], asdict=True, merged=True) - merged = octoprint.util.dict_merge(current, data) - self._settings.set([], merged) + return diff def get_settings_defaults(self): """ @@ -894,6 +958,49 @@ def on_settings_migrate(self, target, current): """ pass + def on_settings_cleanup(self): + """ + Called after migration and initialization but before call to :func:`on_settings_initialized`. + + Plugins may overwrite this method to perform additional clean up tasks. + + The default implementation just minimizes the data persisted on disk to only contain + the differences to the defaults (in case the current data was persisted with an older + version of OctoPrint that still duplicated default data). + """ + import octoprint.util + from octoprint.settings import NoSuchSettingsPath + + try: + # let's fetch the current persisted config (so only the data on disk, + # without the defaults) + config = self._settings.get_all_data(merged=False, incl_defaults=False, error_on_path=True) + except NoSuchSettingsPath: + # no config persisted, nothing to do => get out of here + return + + if config is None: + # config is set to None, that doesn't make sense, kill it and leave + self._settings.clean_all_data() + return + + if self.config_version_key in config and config[self.config_version_key] is None: + # delete None entries for config version - it's the default, no need + del config[self.config_version_key] + + # calculate a minimal diff between the settings and the current config - + # anything already in the settings will be removed from the persisted + # config, no need to duplicate it + defaults = self.get_settings_defaults() + diff = octoprint.util.dict_minimal_mergediff(defaults, config) + + if not diff: + # no diff to defaults, no need to have anything persisted + self._settings.clean_all_data() + else: + # diff => persist only that + self._settings.set([], diff) + def on_settings_initialized(self): """ Called after the settings have been initialized and - if necessary - also been migrated through a call to diff --git a/src/octoprint/plugins/cura/__init__.py b/src/octoprint/plugins/cura/__init__.py index fd326a109..095a274b5 100644 --- a/src/octoprint/plugins/cura/__init__.py +++ b/src/octoprint/plugins/cura/__init__.py @@ -37,11 +37,10 @@ def __init__(self): ##~~ TemplatePlugin API - def get_template_configs(self): - from flask.ext.babel import gettext - return [ - dict(type="settings", name=gettext("CuraEngine")) - ] + def get_template_vars(self): + return dict( + homepage=__plugin_url__ + ) ##~~ StartupPlugin API @@ -413,9 +412,9 @@ def _sanitize_name(name): sanitized_name = sanitized_name.replace(" ", "_") return sanitized_name.lower() -__plugin_name__ = "CuraEngine" +__plugin_name__ = "CuraEngine (<= 15.04)" __plugin_author__ = "Gina Häußge" __plugin_url__ = "https://github.com/foosel/OctoPrint/wiki/Plugin:-Cura" -__plugin_description__ = "Adds support for slicing via CuraEngine from within OctoPrint" +__plugin_description__ = "Adds support for slicing via CuraEngine versions up to and including version 15.04 from within OctoPrint" __plugin_license__ = "AGPLv3" __plugin_implementation__ = CuraPlugin() diff --git a/src/octoprint/plugins/cura/templates/cura_settings.jinja2 b/src/octoprint/plugins/cura/templates/cura_settings.jinja2 index 6779f95c2..92cfe0ae0 100644 --- a/src/octoprint/plugins/cura/templates/cura_settings.jinja2 +++ b/src/octoprint/plugins/cura/templates/cura_settings.jinja2 @@ -1,5 +1,12 @@

{{ _('General') }}

+

{% trans %} + Specify the path to the CuraEngine binary. Note that only + versions up to and including 15.04 are supported. + CuraEngine version 15.06 or newer is not + compatible with this plugin. +{% endtrans %}

+
@@ -10,7 +17,7 @@
@@ -53,6 +60,10 @@ +
+ {% trans %}For more information on configuration and usage please see the Plugin's homepage.{% endtrans %} +
+ + + {% trans %} + You can import your existing profile .ini files from Cura (version up to and + including 15.04) here. Please be aware that neither the .json profile format + from Cura versions starting with 15.06 is supported, nor are the custom Cura profile formats + that third party tools like e.g. Repetier create. + {% endtrans %}
diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py index a3f7d2ef7..9fbfd1ca3 100644 --- a/src/octoprint/plugins/softwareupdate/__init__.py +++ b/src/octoprint/plugins/softwareupdate/__init__.py @@ -503,19 +503,28 @@ def perform_updates(self, check_targets=None, force=False): """ checks = self._get_configured_checks() + populated_checks = dict() + for target, check in checks.items(): + try: + populated_checks[target] = self._populated_check(target, check) + except exceptions.UnknownCheckType: + self._logger.debug("Ignoring unknown check type for target {}".format(target)) + except: + self._logger.exception("Error while populating check prior to update for target {}".format(target)) + if check_targets is None: - check_targets = checks.keys() - to_be_updated = sorted(set(check_targets) & set(checks.keys())) + check_targets = populated_checks.keys() + to_be_updated = sorted(set(check_targets) & set(populated_checks.keys())) if "octoprint" in to_be_updated: to_be_updated.remove("octoprint") tmp = ["octoprint"] + to_be_updated to_be_updated = tmp - updater_thread = threading.Thread(target=self._update_worker, args=(checks, to_be_updated, force)) + updater_thread = threading.Thread(target=self._update_worker, args=(populated_checks, to_be_updated, force)) updater_thread.daemon = False updater_thread.start() - return to_be_updated, dict((key, check["displayName"] if "displayName" in check else key) for key, check in checks.items() if key in to_be_updated) + return to_be_updated, dict((key, check["displayName"] if "displayName" in check else key) for key, check in populated_checks.items() if key in to_be_updated) def _update_worker(self, checks, check_targets, force): diff --git a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js index 8b75047b4..ac6a5ded3 100644 --- a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js +++ b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js @@ -387,7 +387,7 @@ $(function() { } }); self.waitingForRestart = false; - }, 20000); + }, 60000); break; } diff --git a/src/octoprint/printer/profile.py b/src/octoprint/printer/profile.py index 88bdfe3e1..6102f5234 100644 --- a/src/octoprint/printer/profile.py +++ b/src/octoprint/printer/profile.py @@ -12,7 +12,7 @@ import logging from octoprint.settings import settings -from octoprint.util import dict_merge, dict_clean, dict_contains_keys +from octoprint.util import dict_merge, dict_sanitize, dict_contains_keys, is_hidden_path class SaveError(Exception): pass @@ -151,7 +151,7 @@ class PrinterProfileManager(object): formFactor = BedTypes.RECTANGULAR, origin = BedOrigin.LOWERLEFT ), - heatedBed = False, + heatedBed = True, extruder=dict( count = 1, offsets = [ @@ -214,7 +214,7 @@ def save(self, profile, allow_overwrite=False, make_default=False): identifier = self._sanitize(identifier) profile["id"] = identifier - profile = dict_clean(profile, self.__class__.default) + profile = dict_sanitize(profile, self.__class__.default) if identifier == "_default": default_profile = dict_merge(self._load_default(), profile) @@ -289,7 +289,7 @@ def _load_all(self): def _load_all_identifiers(self): results = dict(_default=None) for entry in os.listdir(self._folder): - if entry.startswith(".") or not entry.endswith(".profile") or entry == "_default.profile": + if is_hidden_path(entry) or not entry.endswith(".profile") or entry == "_default.profile": continue path = os.path.join(self._folder, entry) @@ -408,7 +408,7 @@ def convert_value(profile, path, converter): for path in (("volume", "width"), ("volume", "depth"), ("volume", "height"), ("extruder", "nozzleDiameter")): try: convert_value(profile, path, float) - except: + except Exception as e: self._logger.warn("Profile has invalid value for path {path!r}: {msg}".format(path=".".join(path), msg=str(e))) return False @@ -416,7 +416,7 @@ def convert_value(profile, path, converter): for path in (("axes", "x", "inverted"), ("axes", "y", "inverted"), ("axes", "z", "inverted")): try: convert_value(profile, path, bool) - except: + except Exception as e: self._logger.warn("Profile has invalid value for path {path!r}: {msg}".format(path=".".join(path), msg=str(e))) return False diff --git a/src/octoprint/printer/standard.py b/src/octoprint/printer/standard.py index 8e11b6421..8b909705c 100644 --- a/src/octoprint/printer/standard.py +++ b/src/octoprint/printer/standard.py @@ -645,6 +645,8 @@ def _setJobData(self, filename, filesize, sd): if filename is not None: if sd: path_in_storage = filename + if path_in_storage.startswith("/"): + path_in_storage = path_in_storage[1:] path_on_disk = None else: path_in_storage = self._fileManager.path_in_storage(FileDestinations.LOCAL, filename) diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py index f76f9cb8c..643e32cce 100644 --- a/src/octoprint/server/__init__.py +++ b/src/octoprint/server/__init__.py @@ -213,7 +213,7 @@ def settings_plugin_inject_factory(name, implementation): set_preprocessors=set_preprocessors) return dict(settings=plugin_settings) - def settings_plugin_config_migration(name, implementation): + def settings_plugin_config_migration_and_cleanup(name, implementation): if not isinstance(implementation, octoprint.plugin.SettingsPlugin): return @@ -221,11 +221,13 @@ def settings_plugin_config_migration(name, implementation): settings_migrator = implementation.on_settings_migrate if settings_version is not None and settings_migrator is not None: - stored_version = implementation._settings.get_int(["_config_version"]) + stored_version = implementation._settings.get_int([octoprint.plugin.SettingsPlugin.config_version_key]) if stored_version is None or stored_version < settings_version: settings_migrator(settings_version, stored_version) - implementation._settings.set_int(["_config_version"], settings_version) - implementation._settings.save() + implementation._settings.set_int([octoprint.plugin.SettingsPlugin.config_version_key], settings_version) + + implementation.on_settings_cleanup() + implementation._settings.save() implementation.on_settings_initialized() @@ -235,11 +237,11 @@ def settings_plugin_config_migration(name, implementation): settingsPlugins = pluginManager.get_implementations(octoprint.plugin.SettingsPlugin) for implementation in settingsPlugins: try: - settings_plugin_config_migration(implementation._identifier, implementation) + settings_plugin_config_migration_and_cleanup(implementation._identifier, implementation) except: self._logger.exception("Error while trying to migrate settings for plugin {}, ignoring it".format(implementation._identifier)) - pluginManager.implementation_post_inits=[settings_plugin_config_migration] + pluginManager.implementation_post_inits=[settings_plugin_config_migration_and_cleanup] pluginManager.log_all_plugins() @@ -340,7 +342,7 @@ def mime_type_guesser(path): ) additional_mime_types=dict(mime_type_guesser=mime_type_guesser) admin_validator = dict(access_validation=util.tornado.access_validation_factory(app, loginManager, util.flask.user_validator)) - no_hidden_files_validator = dict(path_validation=util.tornado.path_validation_factory(lambda path: not os.path.basename(path).startswith("."), status_code=404)) + no_hidden_files_validator = dict(path_validation=util.tornado.path_validation_factory(lambda path: not octoprint.util.is_hidden_path(path), status_code=404)) def joined_dict(*dicts): if not len(dicts): @@ -647,7 +649,9 @@ def _setup_jinja2(self): # configure additional template folders for jinja2 import jinja2 - filesystem_loader = jinja2.FileSystemLoader([]) + import octoprint.util.jinja + filesystem_loader = octoprint.util.jinja.FilteredFileSystemLoader([], + path_filter=lambda x: not octoprint.util.is_hidden_path(x)) filesystem_loader.searchpath = self._template_searchpaths jinja_loader = jinja2.ChoiceLoader([ diff --git a/src/octoprint/server/api/printer.py b/src/octoprint/server/api/printer.py index f544b833d..d22aefff1 100644 --- a/src/octoprint/server/api/printer.py +++ b/src/octoprint/server/api/printer.py @@ -10,10 +10,9 @@ import re from octoprint.settings import settings, valid_boolean_trues -from octoprint.server import printer, NO_CONTENT +from octoprint.server import printer, printerProfileManager, NO_CONTENT from octoprint.server.api import api from octoprint.server.util.flask import restricted_access, get_json_command_from_request -import octoprint.util as util from octoprint.printer import UnknownScript @@ -34,9 +33,13 @@ def printerState(): result = {} + processor = lambda x: x + if not printerProfileManager.get_current_or_default()["heatedBed"]: + processor = _delete_bed + # add temperature information if not "temperature" in excludes: - result.update({"temperature": _getTemperatureData(lambda x: x)}) + result.update({"temperature": _get_temperature_data(processor)}) # add sd information if not "sd" in excludes and settings().getBoolean(["feature", "sdSupport"]): @@ -145,14 +148,7 @@ def printerToolState(): if not printer.is_operational(): return make_response("Printer is not operational", 409) - def deleteBed(x): - data = dict(x) - - if "bed" in data.keys(): - del data["bed"] - return data - - return jsonify(_getTemperatureData(deleteBed)) + return jsonify(_get_temperature_data(_delete_bed)) ##~~ Heated bed @@ -164,6 +160,9 @@ def printerBedCommand(): if not printer.is_operational(): return make_response("Printer is not operational", 409) + if not printerProfileManager.get_current_or_default()["heatedBed"]: + return make_response("Printer does not have a heated bed", 409) + valid_commands = { "target": ["target"], "offset": ["offset"] @@ -204,15 +203,10 @@ def printerBedState(): if not printer.is_operational(): return make_response("Printer is not operational", 409) - def deleteTools(x): - data = dict(x) - - for k in data.keys(): - if k.startswith("tool"): - del data[k] - return data + if not printerProfileManager.get_current_or_default()["heatedBed"]: + return make_response("Printer does not have a heated bed", 409) - data = _getTemperatureData(deleteTools) + data = _get_temperature_data(_delete_tools) if isinstance(data, Response): return data else: @@ -382,7 +376,7 @@ def getCustomControls(): return jsonify(controls=customControls) -def _getTemperatureData(filter): +def _get_temperature_data(preprocessor): if not printer.is_operational(): return make_response("Printer is not operational", 409) @@ -399,8 +393,23 @@ def _getTemperatureData(filter): limit = min(limit, len(history)) tempData.update({ - "history": map(lambda x: filter(x), history[-limit:]) + "history": map(lambda x: preprocessor(x), history[-limit:]) }) - return filter(tempData) + return preprocessor(tempData) + + +def _delete_tools(x): + return _delete_from_data(x, lambda k: k.startswith("tool")) + + +def _delete_bed(x): + return _delete_from_data(x, lambda k: k == "bed") + +def _delete_from_data(x, key_matcher): + data = dict(x) + for k in data.keys(): + if key_matcher(k): + del data[k] + return data diff --git a/src/octoprint/server/util/flask.py b/src/octoprint/server/util/flask.py index 7fe8ae34a..ce59f6d64 100644 --- a/src/octoprint/server/util/flask.py +++ b/src/octoprint/server/util/flask.py @@ -26,7 +26,7 @@ import octoprint.users import octoprint.plugin -from werkzeug.contrib.cache import SimpleCache +from werkzeug.contrib.cache import BaseCache #~~ monkey patching @@ -259,9 +259,61 @@ def passive_login(): #~~ cache decorator for cacheable views -_cache = SimpleCache() +class LessSimpleCache(BaseCache): + """ + Slightly improved version of :class:`SimpleCache`. + + Setting ``default_timeout`` or ``timeout`` to ``-1`` will have no timeout be applied at all. + """ + + def __init__(self, threshold=500, default_timeout=300): + BaseCache.__init__(self, default_timeout=default_timeout) + self._cache = {} + self.clear = self._cache.clear + self._threshold = threshold + + def _prune(self): + if self.over_threshold(): + now = time.time() + for idx, (key, (expires, _)) in enumerate(self._cache.items()): + if expires is not None and expires <= now or idx % 3 == 0: + self._cache.pop(key, None) + + def get(self, key): + import pickle + now = time.time() + expires, value = self._cache.get(key, (0, None)) + if expires is None or expires > now: + return pickle.loads(value) + + def set(self, key, value, timeout=None): + import pickle + self._prune() + self._cache[key] = (self.calculate_timeout(timeout=timeout), + pickle.dumps(value, pickle.HIGHEST_PROTOCOL)) + + def add(self, key, value, timeout=None): + self.set(key, value, timeout=None) + self._cache.setdefault(key, self._cache[key]) + + def delete(self, key): + self._cache.pop(key, None) + + def calculate_timeout(self, timeout=None): + if timeout is None: + timeout = self.default_timeout + if timeout is -1: + return None + return time.time() + timeout + + def over_threshold(self): + if self._threshold is None: + return False + return len(self._cache) > self._threshold + +_cache = LessSimpleCache() -def cached(timeout=5 * 60, key=lambda: "view/%s" % flask.request.path, unless=None, refreshif=None, unless_response=None): +def cached(timeout=5 * 60, key=lambda: "view:%s" % flask.request.path, unless=None, refreshif=None, unless_response=None): def decorator(f): @functools.wraps(f) def decorated_function(*args, **kwargs): @@ -287,7 +339,7 @@ def decorated_function(*args, **kwargs): return rv # get value from wrapped function - logger.debug("No cache entry or refreshing cache for {path}, calling wrapped function".format(path=flask.request.path)) + logger.debug("No cache entry or refreshing cache for {path} (key: {key}), calling wrapped function".format(path=flask.request.path, key=cache_key)) rv = f(*args, **kwargs) # do not store if the "unless_response" condition is true diff --git a/src/octoprint/server/util/watchdog.py b/src/octoprint/server/util/watchdog.py index 8bda659b6..79a1cef58 100644 --- a/src/octoprint/server/util/watchdog.py +++ b/src/octoprint/server/util/watchdog.py @@ -6,6 +6,7 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms of the AGPLv3 License" import logging +import os import watchdog.events import octoprint.filemanager @@ -14,6 +15,7 @@ class GcodeWatchdogHandler(watchdog.events.PatternMatchingEventHandler): + """ Takes care of automatically "uploading" files that get added to the watched folder. """ @@ -27,40 +29,42 @@ def __init__(self, file_manager, printer): self._printer = printer def _upload(self, path): - import os - file_wrapper = octoprint.filemanager.util.DiskFileWrapper(os.path.basename(path), path) - - # determine current job - currentFilename = None - currentOrigin = None - currentJob = self._printer.get_current_job() - if currentJob is not None and "file" in currentJob.keys(): - currentJobFile = currentJob["file"] - if "name" in currentJobFile.keys() and "origin" in currentJobFile.keys(): - currentFilename = currentJobFile["name"] - currentOrigin = currentJobFile["origin"] - - # determine future filename of file to be uploaded, abort if it can't be uploaded try: - futureFilename = self._file_manager.sanitize_name(octoprint.filemanager.FileDestinations.LOCAL, file_wrapper.filename) - except: - futureFilename = None - if futureFilename is None or (len(self._file_manager.registered_slicers) == 0 and not octoprint.filemanager.valid_file_type(futureFilename)): - return + file_wrapper = octoprint.filemanager.util.DiskFileWrapper(os.path.basename(path), path) - # prohibit overwriting currently selected file while it's being printed - if futureFilename == currentFilename and currentOrigin == octoprint.filemanager.FileDestinations.LOCAL and self._printer.is_printing() or self._printer.is_paused(): - return + # determine current job + currentFilename = None + currentOrigin = None + currentJob = self._printer.get_current_job() + if currentJob is not None and "file" in currentJob.keys(): + currentJobFile = currentJob["file"] + if "name" in currentJobFile.keys() and "origin" in currentJobFile.keys(): + currentFilename = currentJobFile["name"] + currentOrigin = currentJobFile["origin"] - self._file_manager.add_file(octoprint.filemanager.FileDestinations.LOCAL, - file_wrapper.filename, - file_wrapper, - allow_overwrite=True) - if os.path.exists(path): + # determine future filename of file to be uploaded, abort if it can't be uploaded try: - os.remove(path) + futureFilename = self._file_manager.sanitize_name(octoprint.filemanager.FileDestinations.LOCAL, file_wrapper.filename) except: - self._logger.exception("Error while trying to clear a file from the watched folder") + futureFilename = None + if futureFilename is None or (len(self._file_manager.registered_slicers) == 0 and not octoprint.filemanager.valid_file_type(futureFilename)): + return + + # prohibit overwriting currently selected file while it's being printed + if futureFilename == currentFilename and currentOrigin == octoprint.filemanager.FileDestinations.LOCAL and self._printer.is_printing() or self._printer.is_paused(): + return + + self._file_manager.add_file(octoprint.filemanager.FileDestinations.LOCAL, + file_wrapper.filename, + file_wrapper, + allow_overwrite=True) + if os.path.exists(path): + try: + os.remove(path) + except: + self._logger.exception("Error while trying to clear a file from the watched folder") + except: + self._logger.exception("There was an error while processing the file {} in the watched folder".format(path)) def on_created(self, event): self._upload(event.src_path) diff --git a/src/octoprint/server/views.py b/src/octoprint/server/views.py index f89bd9dad..3399a7408 100644 --- a/src/octoprint/server/views.py +++ b/src/octoprint/server/views.py @@ -27,8 +27,9 @@ _valid_div_re = re.compile("[a-zA-Z_-]+") @app.route("/") -@util.flask.cached(refreshif=lambda: util.flask.cache_check_headers() or "_refresh" in request.values, - key=lambda: "view/%s/%s" % (request.path, g.locale), +@util.flask.cached(timeout=-1, + refreshif=lambda: util.flask.cache_check_headers() or "_refresh" in request.values, + key=lambda: "view:{}:{}".format(request.base_url, g.locale), unless_response=util.flask.cache_check_response_headers) def index(): @@ -401,7 +402,9 @@ def robotsTxt(): @app.route("/i18n//.js") -@util.flask.cached(refreshif=lambda: util.flask.cache_check_headers() or "_refresh" in request.values, key=lambda: "view/%s/%s" % (request.path, g.locale)) +@util.flask.cached(timeout=-1, + refreshif=lambda: util.flask.cache_check_headers() or "_refresh" in request.values, + key=lambda: "view:{}:{}".format(request.base_url, g.locale)) def localeJs(locale, domain): messages = dict() plural_expr = None diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py index 733d24b8d..fe608ad7a 100644 --- a/src/octoprint/settings.py +++ b/src/octoprint/settings.py @@ -30,7 +30,7 @@ import re import uuid -from octoprint.util import atomic_write +from octoprint.util import atomic_write, is_hidden_path _APPNAME = "OctoPrint" @@ -253,9 +253,10 @@ def settings(init=False, basedir=None, configfile=None): }, "scripts": { "gcode": { - "afterPrintCancelled": "; disable motors\nM84\n\n;disable all heaters\n{% snippet 'disable_hotends' %}\nM140 S0\n\n;disable fan\nM106 S0", + "afterPrintCancelled": "; disable motors\nM84\n\n;disable all heaters\n{% snippet 'disable_hotends' %}\n{% snippet 'disable_bed' %}\n;disable fan\nM106 S0", "snippets": { - "disable_hotends": "{% for tool in range(printer_profile.extruder.count) %}M104 T{{ tool }} S0\n{% endfor %}" + "disable_hotends": "{% for tool in range(printer_profile.extruder.count) %}M104 T{{ tool }} S0\n{% endfor %}", + "disable_bed": "{% if printer_profile.heatedBed %}M140 S0\n{% endif %}" } } }, @@ -304,6 +305,11 @@ def settings(init=False, basedir=None, configfile=None): valid_boolean_trues = [True, "true", "yes", "y", "1"] """ Values that are considered to be equivalent to the boolean ``True`` value, used for type conversion in various places.""" + +class NoSuchSettingsPath(BaseException): + pass + + class Settings(object): """ The :class:`Settings` class allows managing all of OctoPrint's settings. It takes care of initializing the settings @@ -400,10 +406,12 @@ def _get_default_folder(self, type): return folder def _init_script_templating(self): - from jinja2 import Environment, BaseLoader, FileSystemLoader, ChoiceLoader, TemplateNotFound - from jinja2.nodes import Include, Const + from jinja2 import Environment, BaseLoader, ChoiceLoader, TemplateNotFound + from jinja2.nodes import Include from jinja2.ext import Extension + from octoprint.util.jinja import FilteredFileSystemLoader + class SnippetExtension(Extension): tags = {"snippet"} fields = Include.fields @@ -492,10 +500,14 @@ def _join_prefix(self, prefix, template): else: return template - file_system_loader = FileSystemLoader(self.getBaseFolder("scripts")) + path_filter = lambda path: not is_hidden_path(path) + file_system_loader = FilteredFileSystemLoader(self.getBaseFolder("scripts"), + path_filter=path_filter) settings_loader = SettingsScriptLoader(self) choice_loader = ChoiceLoader([file_system_loader, settings_loader]) - select_loader = SelectLoader(choice_loader, dict(bundled=settings_loader, file=file_system_loader)) + select_loader = SelectLoader(choice_loader, + dict(bundled=settings_loader, + file=file_system_loader)) return RelEnvironment(loader=select_loader, extensions=[SnippetExtension]) def _get_script_template(self, script_type, name, source=False): @@ -810,13 +822,13 @@ def last_modified(self): stat = os.stat(self._configfile) return stat.st_mtime - #~~ getter + ##~~ Internal getter - def get(self, path, asdict=False, config=None, defaults=None, preprocessors=None, merged=False, incl_defaults=True): + def _get_value(self, path, asdict=False, config=None, defaults=None, preprocessors=None, merged=False, incl_defaults=True): import octoprint.util as util if len(path) == 0: - return None + raise NoSuchSettingsPath() if config is None: config = self._config @@ -834,7 +846,7 @@ def get(self, path, asdict=False, config=None, defaults=None, preprocessors=None config = {} defaults = defaults[key] else: - return None + raise NoSuchSettingsPath() if preprocessors and isinstance(preprocessors, dict) and key in preprocessors: preprocessors = preprocessors[key] @@ -858,7 +870,7 @@ def get(self, path, asdict=False, config=None, defaults=None, preprocessors=None elif incl_defaults and key in defaults: value = defaults[key] else: - value = None + raise NoSuchSettingsPath() if preprocessors and isinstance(preprocessors, dict) and key in preprocessors and callable(preprocessors[key]): value = preprocessors[key](value) @@ -876,8 +888,34 @@ def get(self, path, asdict=False, config=None, defaults=None, preprocessors=None else: return results - def getInt(self, path, config=None, defaults=None, preprocessors=None, incl_defaults=True): - value = self.get(path, config=config, defaults=defaults, preprocessors=preprocessors, incl_defaults=incl_defaults) + #~~ has + + def has(self, path, **kwargs): + try: + self._get_value(path, **kwargs) + except NoSuchSettingsPath: + return False + else: + return True + + #~~ getter + + def get(self, path, **kwargs): + error_on_path = kwargs.get("error_on_path", False) + new_kwargs = dict(kwargs) + if "error_on_path" in new_kwargs: + del new_kwargs["error_on_path"] + + try: + return self._get_value(path, **new_kwargs) + except NoSuchSettingsPath: + if error_on_path: + raise + else: + return None + + def getInt(self, path, **kwargs): + value = self.get(path, **kwargs) if value is None: return None @@ -887,8 +925,8 @@ def getInt(self, path, config=None, defaults=None, preprocessors=None, incl_defa self._logger.warn("Could not convert %r to a valid integer when getting option %r" % (value, path)) return None - def getFloat(self, path, config=None, defaults=None, preprocessors=None, incl_defaults=True): - value = self.get(path, config=config, defaults=defaults, preprocessors=preprocessors, incl_defaults=incl_defaults) + def getFloat(self, path, **kwargs): + value = self.get(path, **kwargs) if value is None: return None @@ -898,8 +936,8 @@ def getFloat(self, path, config=None, defaults=None, preprocessors=None, incl_de self._logger.warn("Could not convert %r to a valid integer when getting option %r" % (value, path)) return None - def getBoolean(self, path, config=None, defaults=None, preprocessors=None, incl_defaults=True): - value = self.get(path, config=config, defaults=defaults, preprocessors=preprocessors, incl_defaults=incl_defaults) + def getBoolean(self, path, **kwargs): + value = self.get(path, **kwargs) if value is None: return None if isinstance(value, bool): @@ -952,6 +990,23 @@ def loadScript(self, script_type, name, context=None, source=False): return script + #~~ remove + + def remove(self, path, config=None): + if config is None: + config = self._config + + while len(path) > 1: + key = path.pop(0) + if not isinstance(config, dict) or key not in config: + return + config = config[key] + + key = path.pop(0) + if isinstance(config, dict) and key in config: + del config[key] + self._dirty = True + #~~ setter def set(self, path, value, force=False, defaults=None, config=None, preprocessors=None): @@ -998,9 +1053,9 @@ def set(self, path, value, force=False, defaults=None, config=None, preprocessor config[key] = value self._dirty = True - def setInt(self, path, value, force=False, defaults=None, config=None, preprocessors=None): + def setInt(self, path, value, **kwargs): if value is None: - self.set(path, None, config=config, force=force, defaults=defaults, preprocessors=preprocessors) + self.set(path, None, **kwargs) return try: @@ -1009,11 +1064,11 @@ def setInt(self, path, value, force=False, defaults=None, config=None, preproces self._logger.warn("Could not convert %r to a valid integer when setting option %r" % (value, path)) return - self.set(path, intValue, config=config, force=force, defaults=defaults, preprocessors=preprocessors) + self.set(path, intValue, **kwargs) - def setFloat(self, path, value, force=False, defaults=None, config=None, preprocessors=None): + def setFloat(self, path, value, **kwargs): if value is None: - self.set(path, None, config=config, force=force, defaults=defaults, preprocessors=preprocessors) + self.set(path, None, **kwargs) return try: @@ -1022,15 +1077,15 @@ def setFloat(self, path, value, force=False, defaults=None, config=None, preproc self._logger.warn("Could not convert %r to a valid integer when setting option %r" % (value, path)) return - self.set(path, floatValue, config=config, force=force, defaults=defaults, preprocessors=preprocessors) + self.set(path, floatValue, **kwargs) - def setBoolean(self, path, value, force=False, defaults=None, config=None, preprocessors=None): + def setBoolean(self, path, value, **kwargs): if value is None or isinstance(value, bool): - self.set(path, value, config=config, force=force, defaults=defaults, preprocessors=preprocessors) + self.set(path, value, **kwargs) elif value.lower() in valid_boolean_trues: - self.set(path, True, config=config, force=force, defaults=defaults, preprocessors=preprocessors) + self.set(path, True, **kwargs) else: - self.set(path, False, config=config, force=force, defaults=defaults, preprocessors=preprocessors) + self.set(path, False, **kwargs) def setBaseFolder(self, type, path, force=False): if type not in default_settings["folder"].keys(): @@ -1052,7 +1107,7 @@ def setBaseFolder(self, type, path, force=False): def saveScript(self, script_type, name, script): script_folder = self.getBaseFolder("scripts") filename = os.path.realpath(os.path.join(script_folder, script_type, name)) - if not filename.startswith(script_folder): + if not filename.startswith(os.path.realpath(script_folder)): # oops, jail break, that shouldn't happen raise ValueError("Invalid script path to save to: {filename} (from {script_type}:{name})".format(**locals())) diff --git a/src/octoprint/slicing/__init__.py b/src/octoprint/slicing/__init__.py index 84e2a6c5e..448624b9e 100644 --- a/src/octoprint/slicing/__init__.py +++ b/src/octoprint/slicing/__init__.py @@ -22,6 +22,7 @@ import os import octoprint.plugin import octoprint.events +import octoprint.util from octoprint.settings import settings import logging @@ -478,7 +479,7 @@ def all_profiles(self, slicer, require_configured=False): profiles = dict() slicer_profile_path = self.get_slicer_profile_path(slicer) for entry in os.listdir(slicer_profile_path): - if not entry.endswith(".profile") or entry.startswith("."): + if not entry.endswith(".profile") or octoprint.util.is_hidden_path(entry): # we are only interested in profiles and no hidden files continue @@ -539,7 +540,7 @@ def get_profile_path(self, slicer, name, must_exist=False): name = self._sanitize(name) path = os.path.join(self.get_slicer_profile_path(slicer), "{name}.profile".format(name=name)) - if not os.path.realpath(path).startswith(self._profile_path): + if not os.path.realpath(path).startswith(os.path.realpath(self._profile_path)): raise IOError("Path to profile {name} tried to break out of allows sub path".format(**locals())) if must_exist and not (os.path.exists(path) and os.path.isfile(path)): raise UnknownProfile(slicer, name) diff --git a/src/octoprint/static/css/octoprint.css b/src/octoprint/static/css/octoprint.css index aaaeddf59..b125076a4 100644 --- a/src/octoprint/static/css/octoprint.css +++ b/src/octoprint/static/css/octoprint.css @@ -1 +1 @@ -.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;margin-bottom:0;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #ccc;*border:0;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05)}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover,.btn:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05)}.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px}.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0}.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px}.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-block{display:block;width:100%;padding-left:0;padding-right:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#04c;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#f89406;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#bd362f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#51a351;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;background-image:-moz-linear-gradient(top,#444,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{border-color:transparent;cursor:pointer;color:#08c;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover,.btn-link:focus{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333;text-decoration:none}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.nowrap{white-space:nowrap}.actioncol{text-align:center;white-space:nowrap}.actioncol a{text-decoration:none;color:#000}.actioncol a.disabled{color:#ccc;cursor:default}#navbar .navbar-inner{background-color:#ebebeb;background-image:-moz-linear-gradient(top,#fff,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#ccc));background-image:-webkit-linear-gradient(top,#fff,#ccc);background-image:-o-linear-gradient(top,#fff,#ccc);background-image:linear-gradient(to bottom,#fff,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffcccccc',GradientType=0)}#navbar .navbar-inner .brand,#navbar .navbar-inner .nav>li>a{text-shadow:0 1px 0 #fff;color:#333}#navbar .navbar-inner .brand .caret,#navbar .navbar-inner .nav>li>a .caret{border-bottom-color:#939393;border-top-color:#939393}#navbar .navbar-inner .brand:hover .caret,#navbar .navbar-inner .nav>li>a:hover .caret,#navbar .navbar-inner .brand:focus .caret,#navbar .navbar-inner .nav>li>a:focus .caret{border-bottom-color:#636363;border-top-color:#636363}#navbar .navbar-inner .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner .nav li.dropdown.open.active>.dropdown-toggle{background-color:#e0e0e0;background-image:-moz-linear-gradient(top,#ccc,#fff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ccc),to(#fff));background-image:-webkit-linear-gradient(top,#ccc,#fff);background-image:-o-linear-gradient(top,#ccc,#fff);background-image:linear-gradient(to bottom,#ccc,#fff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffcccccc',endColorstr='#ffffffff',GradientType=0)}#navbar .navbar-inner.transparent{background-color:rgba(235,235,235,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(255,255,255,0.6),rgba(204,204,204,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,0.6)),to(rgba(204,204,204,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(255,255,255,0.6),rgba(204,204,204,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(255,255,255,0.6),rgba(204,204,204,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(255,255,255,0.6),rgba(204,204,204,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99ffffff',endColorstr='#99cccccc',GradientType=0)}#navbar .navbar-inner.transparent .brand,#navbar .navbar-inner.transparent .nav>li>a{text-shadow:0 1px 0 #fff;color:#333}#navbar .navbar-inner.transparent .brand .caret,#navbar .navbar-inner.transparent .nav>li>a .caret{border-bottom-color:#939393;border-top-color:#939393}#navbar .navbar-inner.transparent .brand:hover .caret,#navbar .navbar-inner.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.transparent .brand:focus .caret,#navbar .navbar-inner.transparent .nav>li>a:focus .caret{border-bottom-color:#636363;border-top-color:#636363}#navbar .navbar-inner.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(224,224,224,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(204,204,204,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(204,204,204,0.6)),to(rgba(255,255,255,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(204,204,204,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(204,204,204,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(204,204,204,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99cccccc',endColorstr='#99ffffff',GradientType=0)}#navbar .navbar-inner.red{background-color:#bb645f;background-image:-moz-linear-gradient(top,#e28e8a,#802420);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e28e8a),to(#802420));background-image:-webkit-linear-gradient(top,#e28e8a,#802420);background-image:-o-linear-gradient(top,#e28e8a,#802420);background-image:linear-gradient(to bottom,#e28e8a,#802420);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe28e8a',endColorstr='#ff802420',GradientType=0)}#navbar .navbar-inner.red .brand,#navbar .navbar-inner.red .nav>li>a{text-shadow:0 1px 0 #802420;color:#f2f2f2}#navbar .navbar-inner.red .brand .caret,#navbar .navbar-inner.red .nav>li>a .caret{border-bottom-color:#d89491;border-top-color:#d89491}#navbar .navbar-inner.red .brand:hover .caret,#navbar .navbar-inner.red .nav>li>a:hover .caret,#navbar .navbar-inner.red .brand:focus .caret,#navbar .navbar-inner.red .nav>li>a:focus .caret{border-bottom-color:#e5c3c1;border-top-color:#e5c3c1}#navbar .navbar-inner.red .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.red .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.red .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.red .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.red .nav li.dropdown.open.active>.dropdown-toggle{background-color:#a74f4a;background-image:-moz-linear-gradient(top,#802420,#e28e8a);background-image:-webkit-gradient(linear,0 0,0 100%,from(#802420),to(#e28e8a));background-image:-webkit-linear-gradient(top,#802420,#e28e8a);background-image:-o-linear-gradient(top,#802420,#e28e8a);background-image:linear-gradient(to bottom,#802420,#e28e8a);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff802420',endColorstr='#ffe28e8a',GradientType=0)}#navbar .navbar-inner.red.transparent{background-color:rgba(187,100,95,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(226,142,138,0.6),rgba(128,36,32,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(226,142,138,0.6)),to(rgba(128,36,32,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(226,142,138,0.6),rgba(128,36,32,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(226,142,138,0.6),rgba(128,36,32,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(226,142,138,0.6),rgba(128,36,32,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99e28e8a',endColorstr='#99802420',GradientType=0)}#navbar .navbar-inner.red.transparent .brand,#navbar .navbar-inner.red.transparent .nav>li>a{text-shadow:0 1px 0 #802420;color:#f2f2f2}#navbar .navbar-inner.red.transparent .brand .caret,#navbar .navbar-inner.red.transparent .nav>li>a .caret{border-bottom-color:#d89491;border-top-color:#d89491}#navbar .navbar-inner.red.transparent .brand:hover .caret,#navbar .navbar-inner.red.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.red.transparent .brand:focus .caret,#navbar .navbar-inner.red.transparent .nav>li>a:focus .caret{border-bottom-color:#e5c3c1;border-top-color:#e5c3c1}#navbar .navbar-inner.red.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.red.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.red.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.red.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.red.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(167,79,74,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(128,36,32,0.6),rgba(226,142,138,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(128,36,32,0.6)),to(rgba(226,142,138,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(128,36,32,0.6),rgba(226,142,138,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(128,36,32,0.6),rgba(226,142,138,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(128,36,32,0.6),rgba(226,142,138,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99802420',endColorstr='#99e28e8a',GradientType=0)}#navbar .navbar-inner.orange{background-color:#e39665;background-image:-moz-linear-gradient(top,#f9c3a0,#c2530c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f9c3a0),to(#c2530c));background-image:-webkit-linear-gradient(top,#f9c3a0,#c2530c);background-image:-o-linear-gradient(top,#f9c3a0,#c2530c);background-image:linear-gradient(to bottom,#f9c3a0,#c2530c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9c3a0',endColorstr='#ffc2530c',GradientType=0)}#navbar .navbar-inner.orange .brand,#navbar .navbar-inner.orange .nav>li>a{text-shadow:0 1px 0 #f6a570;color:#f2f2f2}#navbar .navbar-inner.orange .brand .caret,#navbar .navbar-inner.orange .nav>li>a .caret{border-bottom-color:#f2b58d;border-top-color:#f2b58d}#navbar .navbar-inner.orange .brand:hover .caret,#navbar .navbar-inner.orange .nav>li>a:hover .caret,#navbar .navbar-inner.orange .brand:focus .caret,#navbar .navbar-inner.orange .nav>li>a:focus .caret{border-bottom-color:#f2d3c0;border-top-color:#f2d3c0}#navbar .navbar-inner.orange .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.orange .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.orange .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.orange .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.orange .nav li.dropdown.open.active>.dropdown-toggle{background-color:#d88047;background-image:-moz-linear-gradient(top,#c2530c,#f9c3a0);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c2530c),to(#f9c3a0));background-image:-webkit-linear-gradient(top,#c2530c,#f9c3a0);background-image:-o-linear-gradient(top,#c2530c,#f9c3a0);background-image:linear-gradient(to bottom,#c2530c,#f9c3a0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc2530c',endColorstr='#fff9c3a0',GradientType=0)}#navbar .navbar-inner.orange.transparent{background-color:rgba(227,150,101,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(249,195,160,0.6),rgba(194,83,12,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(249,195,160,0.6)),to(rgba(194,83,12,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(249,195,160,0.6),rgba(194,83,12,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(249,195,160,0.6),rgba(194,83,12,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(249,195,160,0.6),rgba(194,83,12,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99f9c3a0',endColorstr='#99c2530c',GradientType=0)}#navbar .navbar-inner.orange.transparent .brand,#navbar .navbar-inner.orange.transparent .nav>li>a{text-shadow:0 1px 0 #f6a570;color:#f2f2f2}#navbar .navbar-inner.orange.transparent .brand .caret,#navbar .navbar-inner.orange.transparent .nav>li>a .caret{border-bottom-color:#f2b58d;border-top-color:#f2b58d}#navbar .navbar-inner.orange.transparent .brand:hover .caret,#navbar .navbar-inner.orange.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.orange.transparent .brand:focus .caret,#navbar .navbar-inner.orange.transparent .nav>li>a:focus .caret{border-bottom-color:#f2d3c0;border-top-color:#f2d3c0}#navbar .navbar-inner.orange.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.orange.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.orange.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.orange.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.orange.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(216,128,71,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(194,83,12,0.6),rgba(249,195,160,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(194,83,12,0.6)),to(rgba(249,195,160,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(194,83,12,0.6),rgba(249,195,160,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(194,83,12,0.6),rgba(249,195,160,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(194,83,12,0.6),rgba(249,195,160,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c2530c',endColorstr='#99f9c3a0',GradientType=0)}#navbar .navbar-inner.yellow{background-color:#e3d765;background-image:-moz-linear-gradient(top,#f9f0a0,#c2b00c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f9f0a0),to(#c2b00c));background-image:-webkit-linear-gradient(top,#f9f0a0,#c2b00c);background-image:-o-linear-gradient(top,#f9f0a0,#c2b00c);background-image:linear-gradient(to bottom,#f9f0a0,#c2b00c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9f0a0',endColorstr='#ffc2b00c',GradientType=0)}#navbar .navbar-inner.yellow .brand,#navbar .navbar-inner.yellow .nav>li>a{text-shadow:0 1px 0 #f6e970;color:#333}#navbar .navbar-inner.yellow .brand .caret,#navbar .navbar-inner.yellow .nav>li>a .caret{border-bottom-color:#93892e;border-top-color:#93892e}#navbar .navbar-inner.yellow .brand:hover .caret,#navbar .navbar-inner.yellow .nav>li>a:hover .caret,#navbar .navbar-inner.yellow .brand:focus .caret,#navbar .navbar-inner.yellow .nav>li>a:focus .caret{border-bottom-color:#635e30;border-top-color:#635e30}#navbar .navbar-inner.yellow .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.yellow .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.yellow .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.yellow .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.yellow .nav li.dropdown.open.active>.dropdown-toggle{background-color:#d8ca47;background-image:-moz-linear-gradient(top,#c2b00c,#f9f0a0);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c2b00c),to(#f9f0a0));background-image:-webkit-linear-gradient(top,#c2b00c,#f9f0a0);background-image:-o-linear-gradient(top,#c2b00c,#f9f0a0);background-image:linear-gradient(to bottom,#c2b00c,#f9f0a0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc2b00c',endColorstr='#fff9f0a0',GradientType=0)}#navbar .navbar-inner.yellow.transparent{background-color:rgba(227,215,101,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(249,240,160,0.6),rgba(194,176,12,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(249,240,160,0.6)),to(rgba(194,176,12,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(249,240,160,0.6),rgba(194,176,12,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(249,240,160,0.6),rgba(194,176,12,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(249,240,160,0.6),rgba(194,176,12,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99f9f0a0',endColorstr='#99c2b00c',GradientType=0)}#navbar .navbar-inner.yellow.transparent .brand,#navbar .navbar-inner.yellow.transparent .nav>li>a{text-shadow:0 1px 0 #f6e970;color:#333}#navbar .navbar-inner.yellow.transparent .brand .caret,#navbar .navbar-inner.yellow.transparent .nav>li>a .caret{border-bottom-color:#93892e;border-top-color:#93892e}#navbar .navbar-inner.yellow.transparent .brand:hover .caret,#navbar .navbar-inner.yellow.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.yellow.transparent .brand:focus .caret,#navbar .navbar-inner.yellow.transparent .nav>li>a:focus .caret{border-bottom-color:#635e30;border-top-color:#635e30}#navbar .navbar-inner.yellow.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.yellow.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.yellow.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.yellow.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.yellow.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(216,202,71,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(194,176,12,0.6),rgba(249,240,160,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(194,176,12,0.6)),to(rgba(249,240,160,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(194,176,12,0.6),rgba(249,240,160,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(194,176,12,0.6),rgba(249,240,160,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(194,176,12,0.6),rgba(249,240,160,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c2b00c',endColorstr='#99f9f0a0',GradientType=0)}#navbar .navbar-inner.green{background-color:#98f064;background-image:-moz-linear-gradient(top,#c8ffa7,#50da00);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c8ffa7),to(#50da00));background-image:-webkit-linear-gradient(top,#c8ffa7,#50da00);background-image:-o-linear-gradient(top,#c8ffa7,#50da00);background-image:linear-gradient(to bottom,#c8ffa7,#50da00);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc8ffa7',endColorstr='#ff50da00',GradientType=0)}#navbar .navbar-inner.green .brand,#navbar .navbar-inner.green .nav>li>a{text-shadow:0 1px 0 #a7ff74;color:#333}#navbar .navbar-inner.green .brand .caret,#navbar .navbar-inner.green .nav>li>a .caret{border-bottom-color:#55992e;border-top-color:#55992e}#navbar .navbar-inner.green .brand:hover .caret,#navbar .navbar-inner.green .nav>li>a:hover .caret,#navbar .navbar-inner.green .brand:focus .caret,#navbar .navbar-inner.green .nav>li>a:focus .caret{border-bottom-color:#446630;border-top-color:#446630}#navbar .navbar-inner.green .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.green .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.green .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.green .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.green .nav li.dropdown.open.active>.dropdown-toggle{background-color:#80e943;background-image:-moz-linear-gradient(top,#50da00,#c8ffa7);background-image:-webkit-gradient(linear,0 0,0 100%,from(#50da00),to(#c8ffa7));background-image:-webkit-linear-gradient(top,#50da00,#c8ffa7);background-image:-o-linear-gradient(top,#50da00,#c8ffa7);background-image:linear-gradient(to bottom,#50da00,#c8ffa7);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff50da00',endColorstr='#ffc8ffa7',GradientType=0)}#navbar .navbar-inner.green.transparent{background-color:rgba(152,240,100,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(200,255,167,0.6),rgba(80,218,0,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(200,255,167,0.6)),to(rgba(80,218,0,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(200,255,167,0.6),rgba(80,218,0,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(200,255,167,0.6),rgba(80,218,0,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(200,255,167,0.6),rgba(80,218,0,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c8ffa7',endColorstr='#9950da00',GradientType=0)}#navbar .navbar-inner.green.transparent .brand,#navbar .navbar-inner.green.transparent .nav>li>a{text-shadow:0 1px 0 #a7ff74;color:#333}#navbar .navbar-inner.green.transparent .brand .caret,#navbar .navbar-inner.green.transparent .nav>li>a .caret{border-bottom-color:#55992e;border-top-color:#55992e}#navbar .navbar-inner.green.transparent .brand:hover .caret,#navbar .navbar-inner.green.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.green.transparent .brand:focus .caret,#navbar .navbar-inner.green.transparent .nav>li>a:focus .caret{border-bottom-color:#446630;border-top-color:#446630}#navbar .navbar-inner.green.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.green.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.green.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.green.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.green.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(128,233,67,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(80,218,0,0.6),rgba(200,255,167,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(80,218,0,0.6)),to(rgba(200,255,167,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(80,218,0,0.6),rgba(200,255,167,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(80,218,0,0.6),rgba(200,255,167,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(80,218,0,0.6),rgba(200,255,167,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#9950da00',endColorstr='#99c8ffa7',GradientType=0)}#navbar .navbar-inner.blue{background-color:#2e63cc;background-image:-moz-linear-gradient(top,#4d88ff,#002b80);background-image:-webkit-gradient(linear,0 0,0 100%,from(#4d88ff),to(#002b80));background-image:-webkit-linear-gradient(top,#4d88ff,#002b80);background-image:-o-linear-gradient(top,#4d88ff,#002b80);background-image:linear-gradient(to bottom,#4d88ff,#002b80);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4d88ff',endColorstr='#ff002b80',GradientType=0)}#navbar .navbar-inner.blue .brand,#navbar .navbar-inner.blue .nav>li>a{text-shadow:0 1px 0 #002b80;color:#f2f2f2}#navbar .navbar-inner.blue .brand .caret,#navbar .navbar-inner.blue .nav>li>a .caret{border-bottom-color:#799bdf;border-top-color:#799bdf}#navbar .navbar-inner.blue .brand:hover .caret,#navbar .navbar-inner.blue .nav>li>a:hover .caret,#navbar .navbar-inner.blue .brand:focus .caret,#navbar .navbar-inner.blue .nav>li>a:focus .caret{border-bottom-color:#b6c7e9;border-top-color:#b6c7e9}#navbar .navbar-inner.blue .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.blue .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.blue .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.blue .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.blue .nav li.dropdown.open.active>.dropdown-toggle{background-color:#1f50b3;background-image:-moz-linear-gradient(top,#002b80,#4d88ff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#002b80),to(#4d88ff));background-image:-webkit-linear-gradient(top,#002b80,#4d88ff);background-image:-o-linear-gradient(top,#002b80,#4d88ff);background-image:linear-gradient(to bottom,#002b80,#4d88ff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff002b80',endColorstr='#ff4d88ff',GradientType=0)}#navbar .navbar-inner.blue.transparent{background-color:rgba(46,99,204,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(77,136,255,0.6),rgba(0,43,128,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(77,136,255,0.6)),to(rgba(0,43,128,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(77,136,255,0.6),rgba(0,43,128,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(77,136,255,0.6),rgba(0,43,128,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(77,136,255,0.6),rgba(0,43,128,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#994d88ff',endColorstr='#99002b80',GradientType=0)}#navbar .navbar-inner.blue.transparent .brand,#navbar .navbar-inner.blue.transparent .nav>li>a{text-shadow:0 1px 0 #002b80;color:#f2f2f2}#navbar .navbar-inner.blue.transparent .brand .caret,#navbar .navbar-inner.blue.transparent .nav>li>a .caret{border-bottom-color:#799bdf;border-top-color:#799bdf}#navbar .navbar-inner.blue.transparent .brand:hover .caret,#navbar .navbar-inner.blue.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.blue.transparent .brand:focus .caret,#navbar .navbar-inner.blue.transparent .nav>li>a:focus .caret{border-bottom-color:#b6c7e9;border-top-color:#b6c7e9}#navbar .navbar-inner.blue.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.blue.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.blue.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.blue.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.blue.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(31,80,179,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(0,43,128,0.6),rgba(77,136,255,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(0,43,128,0.6)),to(rgba(77,136,255,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(0,43,128,0.6),rgba(77,136,255,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(0,43,128,0.6),rgba(77,136,255,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(0,43,128,0.6),rgba(77,136,255,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99002b80',endColorstr='#994d88ff',GradientType=0)}#navbar .navbar-inner.violet{background-color:#9864f0;background-image:-moz-linear-gradient(top,#c8a7ff,#5000da);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c8a7ff),to(#5000da));background-image:-webkit-linear-gradient(top,#c8a7ff,#5000da);background-image:-o-linear-gradient(top,#c8a7ff,#5000da);background-image:linear-gradient(to bottom,#c8a7ff,#5000da);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc8a7ff',endColorstr='#ff5000da',GradientType=0)}#navbar .navbar-inner.violet .brand,#navbar .navbar-inner.violet .nav>li>a{text-shadow:0 1px 0 #5000da;color:#f2f2f2}#navbar .navbar-inner.violet .brand .caret,#navbar .navbar-inner.violet .nav>li>a .caret{border-bottom-color:#b58df9;border-top-color:#b58df9}#navbar .navbar-inner.violet .brand:hover .caret,#navbar .navbar-inner.violet .nav>li>a:hover .caret,#navbar .navbar-inner.violet .brand:focus .caret,#navbar .navbar-inner.violet .nav>li>a:focus .caret{border-bottom-color:#d3c0f5;border-top-color:#d3c0f5}#navbar .navbar-inner.violet .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.violet .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.violet .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.violet .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.violet .nav li.dropdown.open.active>.dropdown-toggle{background-color:#8043e9;background-image:-moz-linear-gradient(top,#5000da,#c8a7ff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5000da),to(#c8a7ff));background-image:-webkit-linear-gradient(top,#5000da,#c8a7ff);background-image:-o-linear-gradient(top,#5000da,#c8a7ff);background-image:linear-gradient(to bottom,#5000da,#c8a7ff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5000da',endColorstr='#ffc8a7ff',GradientType=0)}#navbar .navbar-inner.violet.transparent{background-color:rgba(152,100,240,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(200,167,255,0.6),rgba(80,0,218,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(200,167,255,0.6)),to(rgba(80,0,218,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(200,167,255,0.6),rgba(80,0,218,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(200,167,255,0.6),rgba(80,0,218,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(200,167,255,0.6),rgba(80,0,218,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c8a7ff',endColorstr='#995000da',GradientType=0)}#navbar .navbar-inner.violet.transparent .brand,#navbar .navbar-inner.violet.transparent .nav>li>a{text-shadow:0 1px 0 #5000da;color:#f2f2f2}#navbar .navbar-inner.violet.transparent .brand .caret,#navbar .navbar-inner.violet.transparent .nav>li>a .caret{border-bottom-color:#b58df9;border-top-color:#b58df9}#navbar .navbar-inner.violet.transparent .brand:hover .caret,#navbar .navbar-inner.violet.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.violet.transparent .brand:focus .caret,#navbar .navbar-inner.violet.transparent .nav>li>a:focus .caret{border-bottom-color:#d3c0f5;border-top-color:#d3c0f5}#navbar .navbar-inner.violet.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.violet.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.violet.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.violet.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.violet.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(128,67,233,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(80,0,218,0.6),rgba(200,167,255,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(80,0,218,0.6)),to(rgba(200,167,255,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(80,0,218,0.6),rgba(200,167,255,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(80,0,218,0.6),rgba(200,167,255,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(80,0,218,0.6),rgba(200,167,255,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#995000da',endColorstr='#99c8a7ff',GradientType=0)}#navbar .navbar-inner.black{background-color:#4f4f4f;background-image:-moz-linear-gradient(top,#787878,#121212);background-image:-webkit-gradient(linear,0 0,0 100%,from(#787878),to(#121212));background-image:-webkit-linear-gradient(top,#787878,#121212);background-image:-o-linear-gradient(top,#787878,#121212);background-image:linear-gradient(to bottom,#787878,#121212);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff787878',endColorstr='#ff121212',GradientType=0)}#navbar .navbar-inner.black .brand,#navbar .navbar-inner.black .nav>li>a{text-shadow:0 1px 0 #121212;color:#f2f2f2}#navbar .navbar-inner.black .brand .caret,#navbar .navbar-inner.black .nav>li>a .caret{border-bottom-color:#959595;border-top-color:#959595}#navbar .navbar-inner.black .brand:hover .caret,#navbar .navbar-inner.black .nav>li>a:hover .caret,#navbar .navbar-inner.black .brand:focus .caret,#navbar .navbar-inner.black .nav>li>a:focus .caret{border-bottom-color:#c4c4c4;border-top-color:#c4c4c4}#navbar .navbar-inner.black .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.black .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.black .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.black .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.black .nav li.dropdown.open.active>.dropdown-toggle{background-color:#3b3b3b;background-image:-moz-linear-gradient(top,#121212,#787878);background-image:-webkit-gradient(linear,0 0,0 100%,from(#121212),to(#787878));background-image:-webkit-linear-gradient(top,#121212,#787878);background-image:-o-linear-gradient(top,#121212,#787878);background-image:linear-gradient(to bottom,#121212,#787878);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff121212',endColorstr='#ff787878',GradientType=0)}#navbar .navbar-inner.black.transparent{background-color:rgba(79,79,79,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(120,120,120,0.6),rgba(18,18,18,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(120,120,120,0.6)),to(rgba(18,18,18,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(120,120,120,0.6),rgba(18,18,18,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(120,120,120,0.6),rgba(18,18,18,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(120,120,120,0.6),rgba(18,18,18,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99787878',endColorstr='#99121212',GradientType=0)}#navbar .navbar-inner.black.transparent .brand,#navbar .navbar-inner.black.transparent .nav>li>a{text-shadow:0 1px 0 #121212;color:#f2f2f2}#navbar .navbar-inner.black.transparent .brand .caret,#navbar .navbar-inner.black.transparent .nav>li>a .caret{border-bottom-color:#959595;border-top-color:#959595}#navbar .navbar-inner.black.transparent .brand:hover .caret,#navbar .navbar-inner.black.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.black.transparent .brand:focus .caret,#navbar .navbar-inner.black.transparent .nav>li>a:focus .caret{border-bottom-color:#c4c4c4;border-top-color:#c4c4c4}#navbar .navbar-inner.black.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.black.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.black.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.black.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.black.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(59,59,59,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(18,18,18,0.6),rgba(120,120,120,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(18,18,18,0.6)),to(rgba(120,120,120,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(18,18,18,0.6),rgba(120,120,120,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(18,18,18,0.6),rgba(120,120,120,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(18,18,18,0.6),rgba(120,120,120,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99121212',endColorstr='#99787878',GradientType=0)}#navbar .navbar-inner.white{background-color:#e9e9e9;background-image:-moz-linear-gradient(top,#fff,#c8c8c8);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#c8c8c8));background-image:-webkit-linear-gradient(top,#fff,#c8c8c8);background-image:-o-linear-gradient(top,#fff,#c8c8c8);background-image:linear-gradient(to bottom,#fff,#c8c8c8);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffc8c8c8',GradientType=0)}#navbar .navbar-inner.white .brand,#navbar .navbar-inner.white .nav>li>a{text-shadow:0 1px 0 #fff;color:#333}#navbar .navbar-inner.white .brand .caret,#navbar .navbar-inner.white .nav>li>a .caret{border-bottom-color:#919191;border-top-color:#919191}#navbar .navbar-inner.white .brand:hover .caret,#navbar .navbar-inner.white .nav>li>a:hover .caret,#navbar .navbar-inner.white .brand:focus .caret,#navbar .navbar-inner.white .nav>li>a:focus .caret{border-bottom-color:#626262;border-top-color:#626262}#navbar .navbar-inner.white .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.white .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.white .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.white .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.white .nav li.dropdown.open.active>.dropdown-toggle{background-color:#dedede;background-image:-moz-linear-gradient(top,#c8c8c8,#fff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c8c8c8),to(#fff));background-image:-webkit-linear-gradient(top,#c8c8c8,#fff);background-image:-o-linear-gradient(top,#c8c8c8,#fff);background-image:linear-gradient(to bottom,#c8c8c8,#fff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc8c8c8',endColorstr='#ffffffff',GradientType=0)}#navbar .navbar-inner.white.transparent{background-color:rgba(233,233,233,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(255,255,255,0.6),rgba(200,200,200,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,0.6)),to(rgba(200,200,200,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(255,255,255,0.6),rgba(200,200,200,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(255,255,255,0.6),rgba(200,200,200,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(255,255,255,0.6),rgba(200,200,200,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99ffffff',endColorstr='#99c8c8c8',GradientType=0)}#navbar .navbar-inner.white.transparent .brand,#navbar .navbar-inner.white.transparent .nav>li>a{text-shadow:0 1px 0 #fff;color:#333}#navbar .navbar-inner.white.transparent .brand .caret,#navbar .navbar-inner.white.transparent .nav>li>a .caret{border-bottom-color:#919191;border-top-color:#919191}#navbar .navbar-inner.white.transparent .brand:hover .caret,#navbar .navbar-inner.white.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.white.transparent .brand:focus .caret,#navbar .navbar-inner.white.transparent .nav>li>a:focus .caret{border-bottom-color:#626262;border-top-color:#626262}#navbar .navbar-inner.white.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.white.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.white.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.white.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.white.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(222,222,222,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(200,200,200,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(200,200,200,0.6)),to(rgba(255,255,255,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(200,200,200,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(200,200,200,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(200,200,200,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c8c8c8',endColorstr='#99ffffff',GradientType=0)}#navbar .navbar-inner .brand span{background-size:20px 20px;background-position:left center;padding-left:24px;background-repeat:no-repeat}.octoprint-container{margin-top:20px}.octoprint-container .tab-content{padding:9px 15px;border-left:1px solid #DDD;border-right:1px solid #DDD;border-bottom:1px solid #DDD;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px}.octoprint-container .nav{margin-bottom:0}.octoprint-container .tab-content h1{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5;font-weight:normal}.octoprint-container .accordion-heading .accordion-heading-button{float:right}.octoprint-container .accordion-heading .accordion-heading-button a{display:inline-block;padding:8px 15px;font-size:14px;line-height:20px;color:#000;text-decoration:none;background:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.octoprint-container .accordion-heading a.accordion-toggle{display:inline-block}.octoprint-container .accordion-heading [class^="icon-"],.octoprint-container .accordion-heading [class*=" icon-"]{color:#000}.print-control .btn{padding-left:4px;padding-right:4px}.upload-buttons .btn{margin-right:0}table{table-layout:fixed}table .popover-title{text-overflow:ellipsis;word-break:break-all}table th,table td{overflow:hidden}table th.gcode_files_name,table td.gcode_files_name{text-overflow:ellipsis;text-align:left;white-space:nowrap}table th.gcode_files_action,table td.gcode_files_action{width:90px;text-align:center;white-space:nowrap}table th.gcode_files_action a,table td.gcode_files_action a{text-decoration:none;color:#000}table th.gcode_files_action a.disabled,table td.gcode_files_action a.disabled{color:#ccc;cursor:default}table th.timelapse_files_name,table td.timelapse_files_name{text-overflow:ellipsis;text-align:left}table th.timelapse_files_size,table td.timelapse_files_size{text-align:right;width:55px}table th.timelapse_files_action,table td.timelapse_files_action{width:45px;text-align:center;white-space:nowrap}table th.timelapse_files_action a,table td.timelapse_files_action a{text-decoration:none;color:#000}table th.timelapse_files_action a.disabled,table td.timelapse_files_action a.disabled{color:#ccc;cursor:default}table th.settings_users_name,table td.settings_users_name{text-overflow:ellipsis;text-align:left}table th.settings_users_active,table td.settings_users_active,table th.settings_users_admin,table td.settings_users_admin{text-align:center;width:55px}table th.settings_users_actions,table td.settings_users_actions{width:60px;text-align:center;white-space:nowrap}table th.settings_users_actions a,table td.settings_users_actions a{text-decoration:none;color:#000}table th.settings_users_actions a.disabled,table td.settings_users_actions a.disabled{color:#ccc;cursor:default}table th.settings_logs_name,table td.settings_logs_name{text-overflow:ellipsis;text-align:left}table th.settings_logs_size,table td.settings_logs_size{text-align:right;width:70px}table th.settings_logs_date,table td.settings_logs_date{text-align:left;width:130px}table th.settings_logs_action,table td.settings_logs_action{width:70px;text-align:center;white-space:nowrap}table th.settings_logs_action a,table td.settings_logs_action a{text-decoration:none;color:#000}table th.settings_logs_action a.disabled,table td.settings_logs_action a.disabled{color:#ccc;cursor:default}table th.settings_printerProfiles_profiles_name,table td.settings_printerProfiles_profiles_name{text-overflow:ellipsis;text-align:left}table th.settings_printerProfiles_profiles_model,table td.settings_printerProfiles_profiles_model{text-align:left;width:250px}table th.settings_printerProfiles_profiles_action,table td.settings_printerProfiles_profiles_action{width:80px;text-align:center;white-space:nowrap}table th.settings_printerProfiles_profiles_action a,table td.settings_printerProfiles_profiles_action a{text-decoration:none;color:#000}table th.settings_printerProfiles_profiles_action a.disabled,table td.settings_printerProfiles_profiles_action a.disabled{color:#ccc;cursor:default}#temperature-graph{height:350px;width:100%;background-image:url("../img/graph-background.png");background-position:center;background-repeat:no-repeat}.tab-content,.tab-pane{overflow:visible}.tempInput{width:50px}#temp_newTemp,#temp_newBedTemp,#speed_innerWall,#speed_outerWall,#speed_fill,#speed_support,#webcam_timelapse_interval,#webcam_timelapse_postRoll,#webcam_timelapse_fps{text-align:right}ul.dropdown-menu li a{cursor:pointer}#connection_ports,#connection_baudrates,#connection_printers{width:100%}#offline_overlay,#reloadui_overlay{position:fixed;top:0;left:0;width:100%;height:100%;z-index:10001;display:none}#offline_overlay_background,#reloadui_overlay_background{position:fixed;top:0;left:0;width:100%;height:100%;background-color:#000;filter:alpha(opacity=50);-moz-opacity:.5;-khtml-opacity:.5;opacity:.5}#offline_overlay_wrapper,#reloadui_overlay_wrapper{position:absolute;top:0;bottom:0;left:0;right:0;padding-top:60px}#offline_overlay_wrapper .container,#reloadui_overlay_wrapper .container{margin:auto}#webcam_container{width:100%;position:relative;outline:0}#webcam_container .flipH{-webkit-transform:scaleX(-1);-moz-transform:scaleX(-1);-ms-transform:scaleX(-1)}#webcam_container .flipV{-webkit-transform:scaleY(-1);-moz-transform:scaleY(-1);-ms-transform:scaleY(-1)}#webcam_container .flipH.flipV{-webkit-transform:scaleX(-1) scaleY(-1);-moz-transform:scaleX(-1) scaleY(-1);-ms-transform:scaleX(-1) scaleY(-1)}#webcam_container .rotate90{transform:rotate(-90deg)}#webcam_container .keycontrol_overlay{position:absolute;left:10px;right:10px;bottom:10px;background:rgba(0,0,0,0.5);font-size:85%;color:white;padding:0}#webcam_container .keycontrol_overlay kbd{border:1px solid #eee;border-radius:3px;margin-left:2px;margin-right:2px;font-size:90%;padding:2px;min-width:1em}#webcam_container .keycontrol_overlay .keycontrol_overlay_heading{position:relative;padding:10px;font-weight:bold}#webcam_container .keycontrol_overlay .keycontrol_overlay_column{position:relative;width:45%;padding:10px;float:left}#files .gcode_files{padding-right:7px}#files .gcode_files .entry{padding:5px;line-height:20px;border-bottom:1px solid #ddd;position:relative}#files .gcode_files .entry:hover{background-color:#f5f5f5}#files .gcode_files .entry .title{text-overflow:ellipsis;word-break:break-all}#files .gcode_files .entry .uploaded,#files .gcode_files .entry .size,#files .gcode_files .entry .additionalInfo{font-size:85%;color:#999}#files .gcode_files .entry .action-buttons{position:absolute;bottom:5px;right:5px}#files .gcode_files .entry .additionalInfo{padding-bottom:22px}#files .upload-buttons{margin-top:10px}#files .form-search{text-align:center;margin-bottom:5px!important}#control{overflow:hidden}#control .jog-panel{float:left;margin-right:19px}#control h1{text-align:left}#control .jog-panel>div{text-align:center}#control .jog-panel>div.distance{text-align:left}#control .jog-panel .slider{margin-bottom:10px}#control .box{width:30px;height:30px;margin-right:10px;margin-bottom:10px;padding-left:8px}#control .control-box{display:block;height:30px;margin-bottom:10px}#control .btn-group{margin-bottom:10px}#control .btn-group.distance>.btn{width:43px;padding:3px 0;height:30px}#control .slider-handle{width:14px;height:14px;margin-left:-7px;margin-top:-3px}#control .custom_section h1{cursor:pointer}#control .custom_section_horizontal>.custom_control{display:inline-block}#control .custom_section_vertical>.custom_control{display:block}#control .custom_control .slider{margin-left:10px;margin-right:10px;margin-bottom:2px}#gcode .progress{width:582px}#gcode .progress .bar{-webkit-transition:width 0s linear;-moz-transition:width 0s linear;-o-transition:width 0s linear;transition:width 0s linear}#gcode .canvas_container{position:relative}#gcode #gcode_layer_slider{position:absolute;right:0;top:0;height:568px;float:right}#gcode #gcode_layer_slider .slider-handle{width:14px;height:14px;margin-left:-3px;margin-top:-7px}#gcode #gcode_command_slider .slider-handle{width:14px;height:14px;margin-left:-7px;margin-top:-3px}#term .terminal{margin-bottom:30px}#term .terminal #terminal-output{min-height:340px;margin-bottom:5px}#term #terminal-sendpanel{text-align:right}#settings_dialog .modal-body #settings_dialog_menu{margin-left:0}#settings_appearance_managelanguagesdialog_emptylist{overflow:hidden;width:100%;height:300px;text-align:center;display:table}#settings_appearance_managelanguagesdialog_emptylist div{display:table-cell;vertical-align:middle}.footer ul{margin:0}.footer ul li{display:inline;margin-left:1em;font-size:85%}.footer ul li:first-child{margin-left:0}.footer ul li a{color:#555}.ui-pnotify .alert a{color:#c09853}.ui-pnotify .alert-error a,.ui-pnotify .alert-danger a{color:#b94a48}.ui-pnotify .alert-success a{color:#468847}.ui-pnotify .alert-info a{color:#3a87ad}.pnotify_additional_info .pnotify_more{font-size:85%}.text-right{text-align:right}.overflow_visible{overflow:visible!important}.border_box{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.hidden{display:none}textarea.block{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%}#drop_overlay{position:fixed;top:0;left:0;width:100%;height:100%;z-index:10000;display:none}#drop_overlay.in{display:block}#drop_overlay #drop_overlay_background{position:fixed;top:0;left:0;width:100%;height:100%;background-color:#000;filter:alpha(opacity=50);-moz-opacity:.5;-khtml-opacity:.5;opacity:.5}#drop_overlay #drop_overlay_wrapper{position:absolute;top:0;bottom:0;left:0;right:0;padding-top:60px}#drop_overlay #drop_overlay_wrapper #drop,#drop_overlay #drop_overlay_wrapper #drop_background{position:absolute;top:0;left:0;margin-left:0;width:100%}#drop_overlay #drop_overlay_wrapper #drop_locally,#drop_overlay #drop_overlay_wrapper #drop_locally_background{position:absolute;top:0;left:50%;margin-left:-50%;width:50%;border-right:2px dashed #ccc}#drop_overlay #drop_overlay_wrapper #drop_sd,#drop_overlay #drop_overlay_wrapper #drop_sd_background{position:absolute;top:0;left:50%;margin-left:0;width:50%;border-left:2px dashed #ccc}#drop_overlay #drop_overlay_wrapper .dropzone{height:100%;z-index:10001;color:#fff;font-size:30px}#drop_overlay #drop_overlay_wrapper .dropzone i{font-size:50px}#drop_overlay #drop_overlay_wrapper .dropzone .text{display:block;text-align:center;line-height:40px;position:absolute;width:100%;bottom:5%;filter:alpha(opacity=100);-moz-opacity:1.0;-khtml-opacity:1.0;opacity:1.0}#drop_overlay #drop_overlay_wrapper .dropzone_background{width:50%;height:100%;background-color:#000;filter:alpha(opacity=25);-moz-opacity:.25;-khtml-opacity:.25;opacity:.25}#drop_overlay #drop_overlay_wrapper .dropzone_background.hover{background-color:#000;filter:alpha(opacity=50);-moz-opacity:.5;-khtml-opacity:.5;opacity:.5}#drop_overlay #drop_overlay_wrapper .dropzone_background.fade{-webkit-transition:all .3s ease-out;-moz-transition:all .3s ease-out;-ms-transition:all .3s ease-out;-o-transition:all .3s ease-out;transition:all .3s ease-out;opacity:1}.icon-sd-black-14{background:url("../img/icon-sd-black-14.png") 0 3px no-repeat;width:11px;height:17px;display:inline-block!important}.center{float:none;margin-left:auto;margin-right:auto}.slider .slider-selection{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#04c;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.slider .slider-selection:hover,.slider .slider-selection:focus,.slider .slider-selection:active,.slider .slider-selection.active,.slider .slider-selection.disabled,.slider .slider-selection[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.slider .slider-selection:active,.slider .slider-selection.active{background-color:#039 \9}.slider.slider-disabled .slider-selection{background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.slider .slider-track{background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.slider.slider-disabled .slider-track{background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.slider .slider-handle{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #ccc;*border:0;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);padding:0;margin-bottom:0;opacity:1;filter:alpha(opacity=100)}.slider .slider-handle:hover,.slider .slider-handle:focus,.slider .slider-handle:active,.slider .slider-handle.active,.slider .slider-handle.disabled,.slider .slider-handle[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.slider .slider-handle:active,.slider .slider-handle.active{background-color:#ccc \9}.slider .slider-handle:first-child{*margin-left:0}.slider .slider-handle:hover,.slider .slider-handle:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.slider .slider-handle:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.slider .slider-handle.active,.slider .slider-handle:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05)}.slider .slider-handle.disabled,.slider .slider-handle[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.slider .slider-handle.hide{display:none}.slider .slider-handle.round{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%}.modal.large{width:975px;margin-left:-487px}.full-sized-box{position:absolute;bottom:0;left:0;right:0;top:0;padding:15px}.full-sized-box .row-fluid{height:100%}@media(max-width:979px){.full-sized-box{position:static}}_::-webkit-full-page-media,_:future,:root .full-sized-box{position:static}.scrollable{height:100%;overflow:auto;-webkit-overflow-scrolling:touch}.input-append .add-on.add-on-limited,.input-prepend .add-on.add-on-limited{overflow-x:hidden;text-overflow:ellipsis;width:inherit}.control-group.error .input-prepend .fileinput-button,.control-group.error .input-append .fileinput-button{border-color:#b94a48}input[type=number]{text-align:right} \ No newline at end of file +.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;margin-bottom:0;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #ccc;*border:0;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05)}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover,.btn:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05)}.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px}.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0}.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px}.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-block{display:block;width:100%;padding-left:0;padding-right:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#04c;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#f89406;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#bd362f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#51a351;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;background-image:-moz-linear-gradient(top,#444,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{border-color:transparent;cursor:pointer;color:#08c;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover,.btn-link:focus{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333;text-decoration:none}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.nowrap{white-space:nowrap}.actioncol{text-align:center;white-space:nowrap}.actioncol a{text-decoration:none;color:#000}.actioncol a.disabled{color:#ccc;cursor:default}#navbar .navbar-inner{background-color:#ebebeb;background-image:-moz-linear-gradient(top,#fff,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#ccc));background-image:-webkit-linear-gradient(top,#fff,#ccc);background-image:-o-linear-gradient(top,#fff,#ccc);background-image:linear-gradient(to bottom,#fff,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffcccccc',GradientType=0)}#navbar .navbar-inner .brand,#navbar .navbar-inner .nav>li>a{text-shadow:0 1px 0 #fff;color:#333}#navbar .navbar-inner .brand .caret,#navbar .navbar-inner .nav>li>a .caret{border-bottom-color:#939393;border-top-color:#939393}#navbar .navbar-inner .brand:hover .caret,#navbar .navbar-inner .nav>li>a:hover .caret,#navbar .navbar-inner .brand:focus .caret,#navbar .navbar-inner .nav>li>a:focus .caret{border-bottom-color:#636363;border-top-color:#636363}#navbar .navbar-inner .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner .nav li.dropdown.open.active>.dropdown-toggle{background-color:#e0e0e0;background-image:-moz-linear-gradient(top,#ccc,#fff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ccc),to(#fff));background-image:-webkit-linear-gradient(top,#ccc,#fff);background-image:-o-linear-gradient(top,#ccc,#fff);background-image:linear-gradient(to bottom,#ccc,#fff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffcccccc',endColorstr='#ffffffff',GradientType=0)}#navbar .navbar-inner.transparent{background-color:rgba(235,235,235,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(255,255,255,0.6),rgba(204,204,204,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,0.6)),to(rgba(204,204,204,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(255,255,255,0.6),rgba(204,204,204,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(255,255,255,0.6),rgba(204,204,204,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(255,255,255,0.6),rgba(204,204,204,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99ffffff',endColorstr='#99cccccc',GradientType=0)}#navbar .navbar-inner.transparent .brand,#navbar .navbar-inner.transparent .nav>li>a{text-shadow:0 1px 0 #fff;color:#333}#navbar .navbar-inner.transparent .brand .caret,#navbar .navbar-inner.transparent .nav>li>a .caret{border-bottom-color:#939393;border-top-color:#939393}#navbar .navbar-inner.transparent .brand:hover .caret,#navbar .navbar-inner.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.transparent .brand:focus .caret,#navbar .navbar-inner.transparent .nav>li>a:focus .caret{border-bottom-color:#636363;border-top-color:#636363}#navbar .navbar-inner.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(224,224,224,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(204,204,204,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(204,204,204,0.6)),to(rgba(255,255,255,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(204,204,204,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(204,204,204,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(204,204,204,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99cccccc',endColorstr='#99ffffff',GradientType=0)}#navbar .navbar-inner.red{background-color:#bb645f;background-image:-moz-linear-gradient(top,#e28e8a,#802420);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e28e8a),to(#802420));background-image:-webkit-linear-gradient(top,#e28e8a,#802420);background-image:-o-linear-gradient(top,#e28e8a,#802420);background-image:linear-gradient(to bottom,#e28e8a,#802420);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe28e8a',endColorstr='#ff802420',GradientType=0)}#navbar .navbar-inner.red .brand,#navbar .navbar-inner.red .nav>li>a{text-shadow:0 1px 0 #802420;color:#f2f2f2}#navbar .navbar-inner.red .brand .caret,#navbar .navbar-inner.red .nav>li>a .caret{border-bottom-color:#d89491;border-top-color:#d89491}#navbar .navbar-inner.red .brand:hover .caret,#navbar .navbar-inner.red .nav>li>a:hover .caret,#navbar .navbar-inner.red .brand:focus .caret,#navbar .navbar-inner.red .nav>li>a:focus .caret{border-bottom-color:#e5c3c1;border-top-color:#e5c3c1}#navbar .navbar-inner.red .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.red .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.red .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.red .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.red .nav li.dropdown.open.active>.dropdown-toggle{background-color:#a74f4a;background-image:-moz-linear-gradient(top,#802420,#e28e8a);background-image:-webkit-gradient(linear,0 0,0 100%,from(#802420),to(#e28e8a));background-image:-webkit-linear-gradient(top,#802420,#e28e8a);background-image:-o-linear-gradient(top,#802420,#e28e8a);background-image:linear-gradient(to bottom,#802420,#e28e8a);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff802420',endColorstr='#ffe28e8a',GradientType=0)}#navbar .navbar-inner.red.transparent{background-color:rgba(187,100,95,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(226,142,138,0.6),rgba(128,36,32,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(226,142,138,0.6)),to(rgba(128,36,32,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(226,142,138,0.6),rgba(128,36,32,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(226,142,138,0.6),rgba(128,36,32,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(226,142,138,0.6),rgba(128,36,32,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99e28e8a',endColorstr='#99802420',GradientType=0)}#navbar .navbar-inner.red.transparent .brand,#navbar .navbar-inner.red.transparent .nav>li>a{text-shadow:0 1px 0 #802420;color:#f2f2f2}#navbar .navbar-inner.red.transparent .brand .caret,#navbar .navbar-inner.red.transparent .nav>li>a .caret{border-bottom-color:#d89491;border-top-color:#d89491}#navbar .navbar-inner.red.transparent .brand:hover .caret,#navbar .navbar-inner.red.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.red.transparent .brand:focus .caret,#navbar .navbar-inner.red.transparent .nav>li>a:focus .caret{border-bottom-color:#e5c3c1;border-top-color:#e5c3c1}#navbar .navbar-inner.red.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.red.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.red.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.red.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.red.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(167,79,74,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(128,36,32,0.6),rgba(226,142,138,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(128,36,32,0.6)),to(rgba(226,142,138,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(128,36,32,0.6),rgba(226,142,138,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(128,36,32,0.6),rgba(226,142,138,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(128,36,32,0.6),rgba(226,142,138,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99802420',endColorstr='#99e28e8a',GradientType=0)}#navbar .navbar-inner.orange{background-color:#e39665;background-image:-moz-linear-gradient(top,#f9c3a0,#c2530c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f9c3a0),to(#c2530c));background-image:-webkit-linear-gradient(top,#f9c3a0,#c2530c);background-image:-o-linear-gradient(top,#f9c3a0,#c2530c);background-image:linear-gradient(to bottom,#f9c3a0,#c2530c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9c3a0',endColorstr='#ffc2530c',GradientType=0)}#navbar .navbar-inner.orange .brand,#navbar .navbar-inner.orange .nav>li>a{text-shadow:0 1px 0 #f6a570;color:#f2f2f2}#navbar .navbar-inner.orange .brand .caret,#navbar .navbar-inner.orange .nav>li>a .caret{border-bottom-color:#f2b58d;border-top-color:#f2b58d}#navbar .navbar-inner.orange .brand:hover .caret,#navbar .navbar-inner.orange .nav>li>a:hover .caret,#navbar .navbar-inner.orange .brand:focus .caret,#navbar .navbar-inner.orange .nav>li>a:focus .caret{border-bottom-color:#f2d3c0;border-top-color:#f2d3c0}#navbar .navbar-inner.orange .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.orange .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.orange .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.orange .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.orange .nav li.dropdown.open.active>.dropdown-toggle{background-color:#d88047;background-image:-moz-linear-gradient(top,#c2530c,#f9c3a0);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c2530c),to(#f9c3a0));background-image:-webkit-linear-gradient(top,#c2530c,#f9c3a0);background-image:-o-linear-gradient(top,#c2530c,#f9c3a0);background-image:linear-gradient(to bottom,#c2530c,#f9c3a0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc2530c',endColorstr='#fff9c3a0',GradientType=0)}#navbar .navbar-inner.orange.transparent{background-color:rgba(227,150,101,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(249,195,160,0.6),rgba(194,83,12,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(249,195,160,0.6)),to(rgba(194,83,12,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(249,195,160,0.6),rgba(194,83,12,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(249,195,160,0.6),rgba(194,83,12,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(249,195,160,0.6),rgba(194,83,12,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99f9c3a0',endColorstr='#99c2530c',GradientType=0)}#navbar .navbar-inner.orange.transparent .brand,#navbar .navbar-inner.orange.transparent .nav>li>a{text-shadow:0 1px 0 #f6a570;color:#f2f2f2}#navbar .navbar-inner.orange.transparent .brand .caret,#navbar .navbar-inner.orange.transparent .nav>li>a .caret{border-bottom-color:#f2b58d;border-top-color:#f2b58d}#navbar .navbar-inner.orange.transparent .brand:hover .caret,#navbar .navbar-inner.orange.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.orange.transparent .brand:focus .caret,#navbar .navbar-inner.orange.transparent .nav>li>a:focus .caret{border-bottom-color:#f2d3c0;border-top-color:#f2d3c0}#navbar .navbar-inner.orange.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.orange.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.orange.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.orange.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.orange.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(216,128,71,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(194,83,12,0.6),rgba(249,195,160,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(194,83,12,0.6)),to(rgba(249,195,160,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(194,83,12,0.6),rgba(249,195,160,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(194,83,12,0.6),rgba(249,195,160,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(194,83,12,0.6),rgba(249,195,160,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c2530c',endColorstr='#99f9c3a0',GradientType=0)}#navbar .navbar-inner.yellow{background-color:#e3d765;background-image:-moz-linear-gradient(top,#f9f0a0,#c2b00c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f9f0a0),to(#c2b00c));background-image:-webkit-linear-gradient(top,#f9f0a0,#c2b00c);background-image:-o-linear-gradient(top,#f9f0a0,#c2b00c);background-image:linear-gradient(to bottom,#f9f0a0,#c2b00c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff9f0a0',endColorstr='#ffc2b00c',GradientType=0)}#navbar .navbar-inner.yellow .brand,#navbar .navbar-inner.yellow .nav>li>a{text-shadow:0 1px 0 #f6e970;color:#333}#navbar .navbar-inner.yellow .brand .caret,#navbar .navbar-inner.yellow .nav>li>a .caret{border-bottom-color:#93892e;border-top-color:#93892e}#navbar .navbar-inner.yellow .brand:hover .caret,#navbar .navbar-inner.yellow .nav>li>a:hover .caret,#navbar .navbar-inner.yellow .brand:focus .caret,#navbar .navbar-inner.yellow .nav>li>a:focus .caret{border-bottom-color:#635e30;border-top-color:#635e30}#navbar .navbar-inner.yellow .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.yellow .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.yellow .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.yellow .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.yellow .nav li.dropdown.open.active>.dropdown-toggle{background-color:#d8ca47;background-image:-moz-linear-gradient(top,#c2b00c,#f9f0a0);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c2b00c),to(#f9f0a0));background-image:-webkit-linear-gradient(top,#c2b00c,#f9f0a0);background-image:-o-linear-gradient(top,#c2b00c,#f9f0a0);background-image:linear-gradient(to bottom,#c2b00c,#f9f0a0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc2b00c',endColorstr='#fff9f0a0',GradientType=0)}#navbar .navbar-inner.yellow.transparent{background-color:rgba(227,215,101,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(249,240,160,0.6),rgba(194,176,12,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(249,240,160,0.6)),to(rgba(194,176,12,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(249,240,160,0.6),rgba(194,176,12,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(249,240,160,0.6),rgba(194,176,12,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(249,240,160,0.6),rgba(194,176,12,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99f9f0a0',endColorstr='#99c2b00c',GradientType=0)}#navbar .navbar-inner.yellow.transparent .brand,#navbar .navbar-inner.yellow.transparent .nav>li>a{text-shadow:0 1px 0 #f6e970;color:#333}#navbar .navbar-inner.yellow.transparent .brand .caret,#navbar .navbar-inner.yellow.transparent .nav>li>a .caret{border-bottom-color:#93892e;border-top-color:#93892e}#navbar .navbar-inner.yellow.transparent .brand:hover .caret,#navbar .navbar-inner.yellow.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.yellow.transparent .brand:focus .caret,#navbar .navbar-inner.yellow.transparent .nav>li>a:focus .caret{border-bottom-color:#635e30;border-top-color:#635e30}#navbar .navbar-inner.yellow.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.yellow.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.yellow.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.yellow.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.yellow.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(216,202,71,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(194,176,12,0.6),rgba(249,240,160,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(194,176,12,0.6)),to(rgba(249,240,160,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(194,176,12,0.6),rgba(249,240,160,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(194,176,12,0.6),rgba(249,240,160,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(194,176,12,0.6),rgba(249,240,160,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c2b00c',endColorstr='#99f9f0a0',GradientType=0)}#navbar .navbar-inner.green{background-color:#98f064;background-image:-moz-linear-gradient(top,#c8ffa7,#50da00);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c8ffa7),to(#50da00));background-image:-webkit-linear-gradient(top,#c8ffa7,#50da00);background-image:-o-linear-gradient(top,#c8ffa7,#50da00);background-image:linear-gradient(to bottom,#c8ffa7,#50da00);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc8ffa7',endColorstr='#ff50da00',GradientType=0)}#navbar .navbar-inner.green .brand,#navbar .navbar-inner.green .nav>li>a{text-shadow:0 1px 0 #a7ff74;color:#333}#navbar .navbar-inner.green .brand .caret,#navbar .navbar-inner.green .nav>li>a .caret{border-bottom-color:#55992e;border-top-color:#55992e}#navbar .navbar-inner.green .brand:hover .caret,#navbar .navbar-inner.green .nav>li>a:hover .caret,#navbar .navbar-inner.green .brand:focus .caret,#navbar .navbar-inner.green .nav>li>a:focus .caret{border-bottom-color:#446630;border-top-color:#446630}#navbar .navbar-inner.green .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.green .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.green .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.green .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.green .nav li.dropdown.open.active>.dropdown-toggle{background-color:#80e943;background-image:-moz-linear-gradient(top,#50da00,#c8ffa7);background-image:-webkit-gradient(linear,0 0,0 100%,from(#50da00),to(#c8ffa7));background-image:-webkit-linear-gradient(top,#50da00,#c8ffa7);background-image:-o-linear-gradient(top,#50da00,#c8ffa7);background-image:linear-gradient(to bottom,#50da00,#c8ffa7);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff50da00',endColorstr='#ffc8ffa7',GradientType=0)}#navbar .navbar-inner.green.transparent{background-color:rgba(152,240,100,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(200,255,167,0.6),rgba(80,218,0,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(200,255,167,0.6)),to(rgba(80,218,0,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(200,255,167,0.6),rgba(80,218,0,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(200,255,167,0.6),rgba(80,218,0,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(200,255,167,0.6),rgba(80,218,0,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c8ffa7',endColorstr='#9950da00',GradientType=0)}#navbar .navbar-inner.green.transparent .brand,#navbar .navbar-inner.green.transparent .nav>li>a{text-shadow:0 1px 0 #a7ff74;color:#333}#navbar .navbar-inner.green.transparent .brand .caret,#navbar .navbar-inner.green.transparent .nav>li>a .caret{border-bottom-color:#55992e;border-top-color:#55992e}#navbar .navbar-inner.green.transparent .brand:hover .caret,#navbar .navbar-inner.green.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.green.transparent .brand:focus .caret,#navbar .navbar-inner.green.transparent .nav>li>a:focus .caret{border-bottom-color:#446630;border-top-color:#446630}#navbar .navbar-inner.green.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.green.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.green.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.green.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.green.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(128,233,67,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(80,218,0,0.6),rgba(200,255,167,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(80,218,0,0.6)),to(rgba(200,255,167,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(80,218,0,0.6),rgba(200,255,167,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(80,218,0,0.6),rgba(200,255,167,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(80,218,0,0.6),rgba(200,255,167,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#9950da00',endColorstr='#99c8ffa7',GradientType=0)}#navbar .navbar-inner.blue{background-color:#2e63cc;background-image:-moz-linear-gradient(top,#4d88ff,#002b80);background-image:-webkit-gradient(linear,0 0,0 100%,from(#4d88ff),to(#002b80));background-image:-webkit-linear-gradient(top,#4d88ff,#002b80);background-image:-o-linear-gradient(top,#4d88ff,#002b80);background-image:linear-gradient(to bottom,#4d88ff,#002b80);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff4d88ff',endColorstr='#ff002b80',GradientType=0)}#navbar .navbar-inner.blue .brand,#navbar .navbar-inner.blue .nav>li>a{text-shadow:0 1px 0 #002b80;color:#f2f2f2}#navbar .navbar-inner.blue .brand .caret,#navbar .navbar-inner.blue .nav>li>a .caret{border-bottom-color:#799bdf;border-top-color:#799bdf}#navbar .navbar-inner.blue .brand:hover .caret,#navbar .navbar-inner.blue .nav>li>a:hover .caret,#navbar .navbar-inner.blue .brand:focus .caret,#navbar .navbar-inner.blue .nav>li>a:focus .caret{border-bottom-color:#b6c7e9;border-top-color:#b6c7e9}#navbar .navbar-inner.blue .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.blue .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.blue .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.blue .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.blue .nav li.dropdown.open.active>.dropdown-toggle{background-color:#1f50b3;background-image:-moz-linear-gradient(top,#002b80,#4d88ff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#002b80),to(#4d88ff));background-image:-webkit-linear-gradient(top,#002b80,#4d88ff);background-image:-o-linear-gradient(top,#002b80,#4d88ff);background-image:linear-gradient(to bottom,#002b80,#4d88ff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff002b80',endColorstr='#ff4d88ff',GradientType=0)}#navbar .navbar-inner.blue.transparent{background-color:rgba(46,99,204,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(77,136,255,0.6),rgba(0,43,128,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(77,136,255,0.6)),to(rgba(0,43,128,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(77,136,255,0.6),rgba(0,43,128,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(77,136,255,0.6),rgba(0,43,128,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(77,136,255,0.6),rgba(0,43,128,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#994d88ff',endColorstr='#99002b80',GradientType=0)}#navbar .navbar-inner.blue.transparent .brand,#navbar .navbar-inner.blue.transparent .nav>li>a{text-shadow:0 1px 0 #002b80;color:#f2f2f2}#navbar .navbar-inner.blue.transparent .brand .caret,#navbar .navbar-inner.blue.transparent .nav>li>a .caret{border-bottom-color:#799bdf;border-top-color:#799bdf}#navbar .navbar-inner.blue.transparent .brand:hover .caret,#navbar .navbar-inner.blue.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.blue.transparent .brand:focus .caret,#navbar .navbar-inner.blue.transparent .nav>li>a:focus .caret{border-bottom-color:#b6c7e9;border-top-color:#b6c7e9}#navbar .navbar-inner.blue.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.blue.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.blue.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.blue.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.blue.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(31,80,179,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(0,43,128,0.6),rgba(77,136,255,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(0,43,128,0.6)),to(rgba(77,136,255,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(0,43,128,0.6),rgba(77,136,255,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(0,43,128,0.6),rgba(77,136,255,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(0,43,128,0.6),rgba(77,136,255,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99002b80',endColorstr='#994d88ff',GradientType=0)}#navbar .navbar-inner.violet{background-color:#9864f0;background-image:-moz-linear-gradient(top,#c8a7ff,#5000da);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c8a7ff),to(#5000da));background-image:-webkit-linear-gradient(top,#c8a7ff,#5000da);background-image:-o-linear-gradient(top,#c8a7ff,#5000da);background-image:linear-gradient(to bottom,#c8a7ff,#5000da);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc8a7ff',endColorstr='#ff5000da',GradientType=0)}#navbar .navbar-inner.violet .brand,#navbar .navbar-inner.violet .nav>li>a{text-shadow:0 1px 0 #5000da;color:#f2f2f2}#navbar .navbar-inner.violet .brand .caret,#navbar .navbar-inner.violet .nav>li>a .caret{border-bottom-color:#b58df9;border-top-color:#b58df9}#navbar .navbar-inner.violet .brand:hover .caret,#navbar .navbar-inner.violet .nav>li>a:hover .caret,#navbar .navbar-inner.violet .brand:focus .caret,#navbar .navbar-inner.violet .nav>li>a:focus .caret{border-bottom-color:#d3c0f5;border-top-color:#d3c0f5}#navbar .navbar-inner.violet .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.violet .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.violet .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.violet .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.violet .nav li.dropdown.open.active>.dropdown-toggle{background-color:#8043e9;background-image:-moz-linear-gradient(top,#5000da,#c8a7ff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5000da),to(#c8a7ff));background-image:-webkit-linear-gradient(top,#5000da,#c8a7ff);background-image:-o-linear-gradient(top,#5000da,#c8a7ff);background-image:linear-gradient(to bottom,#5000da,#c8a7ff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5000da',endColorstr='#ffc8a7ff',GradientType=0)}#navbar .navbar-inner.violet.transparent{background-color:rgba(152,100,240,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(200,167,255,0.6),rgba(80,0,218,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(200,167,255,0.6)),to(rgba(80,0,218,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(200,167,255,0.6),rgba(80,0,218,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(200,167,255,0.6),rgba(80,0,218,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(200,167,255,0.6),rgba(80,0,218,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c8a7ff',endColorstr='#995000da',GradientType=0)}#navbar .navbar-inner.violet.transparent .brand,#navbar .navbar-inner.violet.transparent .nav>li>a{text-shadow:0 1px 0 #5000da;color:#f2f2f2}#navbar .navbar-inner.violet.transparent .brand .caret,#navbar .navbar-inner.violet.transparent .nav>li>a .caret{border-bottom-color:#b58df9;border-top-color:#b58df9}#navbar .navbar-inner.violet.transparent .brand:hover .caret,#navbar .navbar-inner.violet.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.violet.transparent .brand:focus .caret,#navbar .navbar-inner.violet.transparent .nav>li>a:focus .caret{border-bottom-color:#d3c0f5;border-top-color:#d3c0f5}#navbar .navbar-inner.violet.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.violet.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.violet.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.violet.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.violet.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(128,67,233,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(80,0,218,0.6),rgba(200,167,255,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(80,0,218,0.6)),to(rgba(200,167,255,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(80,0,218,0.6),rgba(200,167,255,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(80,0,218,0.6),rgba(200,167,255,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(80,0,218,0.6),rgba(200,167,255,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#995000da',endColorstr='#99c8a7ff',GradientType=0)}#navbar .navbar-inner.black{background-color:#4f4f4f;background-image:-moz-linear-gradient(top,#787878,#121212);background-image:-webkit-gradient(linear,0 0,0 100%,from(#787878),to(#121212));background-image:-webkit-linear-gradient(top,#787878,#121212);background-image:-o-linear-gradient(top,#787878,#121212);background-image:linear-gradient(to bottom,#787878,#121212);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff787878',endColorstr='#ff121212',GradientType=0)}#navbar .navbar-inner.black .brand,#navbar .navbar-inner.black .nav>li>a{text-shadow:0 1px 0 #121212;color:#f2f2f2}#navbar .navbar-inner.black .brand .caret,#navbar .navbar-inner.black .nav>li>a .caret{border-bottom-color:#959595;border-top-color:#959595}#navbar .navbar-inner.black .brand:hover .caret,#navbar .navbar-inner.black .nav>li>a:hover .caret,#navbar .navbar-inner.black .brand:focus .caret,#navbar .navbar-inner.black .nav>li>a:focus .caret{border-bottom-color:#c4c4c4;border-top-color:#c4c4c4}#navbar .navbar-inner.black .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.black .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.black .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.black .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.black .nav li.dropdown.open.active>.dropdown-toggle{background-color:#3b3b3b;background-image:-moz-linear-gradient(top,#121212,#787878);background-image:-webkit-gradient(linear,0 0,0 100%,from(#121212),to(#787878));background-image:-webkit-linear-gradient(top,#121212,#787878);background-image:-o-linear-gradient(top,#121212,#787878);background-image:linear-gradient(to bottom,#121212,#787878);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff121212',endColorstr='#ff787878',GradientType=0)}#navbar .navbar-inner.black.transparent{background-color:rgba(79,79,79,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(120,120,120,0.6),rgba(18,18,18,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(120,120,120,0.6)),to(rgba(18,18,18,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(120,120,120,0.6),rgba(18,18,18,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(120,120,120,0.6),rgba(18,18,18,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(120,120,120,0.6),rgba(18,18,18,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99787878',endColorstr='#99121212',GradientType=0)}#navbar .navbar-inner.black.transparent .brand,#navbar .navbar-inner.black.transparent .nav>li>a{text-shadow:0 1px 0 #121212;color:#f2f2f2}#navbar .navbar-inner.black.transparent .brand .caret,#navbar .navbar-inner.black.transparent .nav>li>a .caret{border-bottom-color:#959595;border-top-color:#959595}#navbar .navbar-inner.black.transparent .brand:hover .caret,#navbar .navbar-inner.black.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.black.transparent .brand:focus .caret,#navbar .navbar-inner.black.transparent .nav>li>a:focus .caret{border-bottom-color:#c4c4c4;border-top-color:#c4c4c4}#navbar .navbar-inner.black.transparent .brand span{background-image:url(../img/tentacle-20x20-light.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.black.transparent .brand span{background-image:url(../img/tentacle-20x20-light@2x.png)}}#navbar .navbar-inner.black.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.black.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.black.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(59,59,59,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(18,18,18,0.6),rgba(120,120,120,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(18,18,18,0.6)),to(rgba(120,120,120,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(18,18,18,0.6),rgba(120,120,120,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(18,18,18,0.6),rgba(120,120,120,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(18,18,18,0.6),rgba(120,120,120,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99121212',endColorstr='#99787878',GradientType=0)}#navbar .navbar-inner.white{background-color:#e9e9e9;background-image:-moz-linear-gradient(top,#fff,#c8c8c8);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#c8c8c8));background-image:-webkit-linear-gradient(top,#fff,#c8c8c8);background-image:-o-linear-gradient(top,#fff,#c8c8c8);background-image:linear-gradient(to bottom,#fff,#c8c8c8);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffc8c8c8',GradientType=0)}#navbar .navbar-inner.white .brand,#navbar .navbar-inner.white .nav>li>a{text-shadow:0 1px 0 #fff;color:#333}#navbar .navbar-inner.white .brand .caret,#navbar .navbar-inner.white .nav>li>a .caret{border-bottom-color:#919191;border-top-color:#919191}#navbar .navbar-inner.white .brand:hover .caret,#navbar .navbar-inner.white .nav>li>a:hover .caret,#navbar .navbar-inner.white .brand:focus .caret,#navbar .navbar-inner.white .nav>li>a:focus .caret{border-bottom-color:#626262;border-top-color:#626262}#navbar .navbar-inner.white .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.white .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.white .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.white .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.white .nav li.dropdown.open.active>.dropdown-toggle{background-color:#dedede;background-image:-moz-linear-gradient(top,#c8c8c8,#fff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#c8c8c8),to(#fff));background-image:-webkit-linear-gradient(top,#c8c8c8,#fff);background-image:-o-linear-gradient(top,#c8c8c8,#fff);background-image:linear-gradient(to bottom,#c8c8c8,#fff);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffc8c8c8',endColorstr='#ffffffff',GradientType=0)}#navbar .navbar-inner.white.transparent{background-color:rgba(233,233,233,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(255,255,255,0.6),rgba(200,200,200,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,0.6)),to(rgba(200,200,200,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(255,255,255,0.6),rgba(200,200,200,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(255,255,255,0.6),rgba(200,200,200,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(255,255,255,0.6),rgba(200,200,200,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99ffffff',endColorstr='#99c8c8c8',GradientType=0)}#navbar .navbar-inner.white.transparent .brand,#navbar .navbar-inner.white.transparent .nav>li>a{text-shadow:0 1px 0 #fff;color:#333}#navbar .navbar-inner.white.transparent .brand .caret,#navbar .navbar-inner.white.transparent .nav>li>a .caret{border-bottom-color:#919191;border-top-color:#919191}#navbar .navbar-inner.white.transparent .brand:hover .caret,#navbar .navbar-inner.white.transparent .nav>li>a:hover .caret,#navbar .navbar-inner.white.transparent .brand:focus .caret,#navbar .navbar-inner.white.transparent .nav>li>a:focus .caret{border-bottom-color:#626262;border-top-color:#626262}#navbar .navbar-inner.white.transparent .brand span{background-image:url(../img/tentacle-20x20.png)}@media(-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){#navbar .navbar-inner.white.transparent .brand span{background-image:url(../img/tentacle-20x20@2x.png)}}#navbar .navbar-inner.white.transparent .nav li.dropdown.open>.dropdown-toggle,#navbar .navbar-inner.white.transparent .nav li.dropdown.active>.dropdown-toggle,#navbar .navbar-inner.white.transparent .nav li.dropdown.open.active>.dropdown-toggle{background-color:rgba(222,222,222,0.6);background-image:"../img/trans-background.png";background-image:-moz-linear-gradient(top,rgba(200,200,200,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(200,200,200,0.6)),to(rgba(255,255,255,0.6))),url("../img/trans-background.png");background-image:-webkit-linear-gradient(top,rgba(200,200,200,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:-o-linear-gradient(top,rgba(200,200,200,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-image:linear-gradient(to bottom,rgba(200,200,200,0.6),rgba(255,255,255,0.6)),url("../img/trans-background.png");background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#99c8c8c8',endColorstr='#99ffffff',GradientType=0)}#navbar .navbar-inner .brand span{background-size:20px 20px;background-position:left center;padding-left:24px;background-repeat:no-repeat}.octoprint-container{margin-top:20px}.octoprint-container .tab-content{padding:9px 15px;border-left:1px solid #DDD;border-right:1px solid #DDD;border-bottom:1px solid #DDD;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px}.octoprint-container .nav{margin-bottom:0}.octoprint-container .tab-content h1{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5;font-weight:normal}.octoprint-container .accordion-heading .accordion-heading-button{float:right}.octoprint-container .accordion-heading .accordion-heading-button a{display:inline-block;padding:8px 15px;font-size:14px;line-height:20px;color:#000;text-decoration:none;background:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.octoprint-container .accordion-heading a.accordion-toggle{display:inline-block}.octoprint-container .accordion-heading [class^="icon-"],.octoprint-container .accordion-heading [class*=" icon-"]{color:#000}.print-control .btn{padding-left:4px;padding-right:4px}.upload-buttons .btn{margin-right:0}table{table-layout:fixed}table .popover-title{text-overflow:ellipsis;word-break:break-all}table th,table td{overflow:hidden}table th.gcode_files_name,table td.gcode_files_name{text-overflow:ellipsis;text-align:left;white-space:nowrap}table th.gcode_files_action,table td.gcode_files_action{width:90px;text-align:center;white-space:nowrap}table th.gcode_files_action a,table td.gcode_files_action a{text-decoration:none;color:#000}table th.gcode_files_action a.disabled,table td.gcode_files_action a.disabled{color:#ccc;cursor:default}table th.timelapse_files_name,table td.timelapse_files_name{text-overflow:ellipsis;text-align:left}table th.timelapse_files_size,table td.timelapse_files_size{text-align:right;width:55px}table th.timelapse_files_action,table td.timelapse_files_action{width:45px;text-align:center;white-space:nowrap}table th.timelapse_files_action a,table td.timelapse_files_action a{text-decoration:none;color:#000}table th.timelapse_files_action a.disabled,table td.timelapse_files_action a.disabled{color:#ccc;cursor:default}table th.settings_users_name,table td.settings_users_name{text-overflow:ellipsis;text-align:left}table th.settings_users_active,table td.settings_users_active,table th.settings_users_admin,table td.settings_users_admin{text-align:center;width:55px}table th.settings_users_actions,table td.settings_users_actions{width:60px;text-align:center;white-space:nowrap}table th.settings_users_actions a,table td.settings_users_actions a{text-decoration:none;color:#000}table th.settings_users_actions a.disabled,table td.settings_users_actions a.disabled{color:#ccc;cursor:default}table th.settings_logs_name,table td.settings_logs_name{text-overflow:ellipsis;text-align:left}table th.settings_logs_size,table td.settings_logs_size{text-align:right;width:70px}table th.settings_logs_date,table td.settings_logs_date{text-align:left;width:130px}table th.settings_logs_action,table td.settings_logs_action{width:70px;text-align:center;white-space:nowrap}table th.settings_logs_action a,table td.settings_logs_action a{text-decoration:none;color:#000}table th.settings_logs_action a.disabled,table td.settings_logs_action a.disabled{color:#ccc;cursor:default}table th.settings_printerProfiles_profiles_name,table td.settings_printerProfiles_profiles_name{text-overflow:ellipsis;text-align:left}table th.settings_printerProfiles_profiles_model,table td.settings_printerProfiles_profiles_model{text-align:left;width:250px}table th.settings_printerProfiles_profiles_action,table td.settings_printerProfiles_profiles_action{width:80px;text-align:center;white-space:nowrap}table th.settings_printerProfiles_profiles_action a,table td.settings_printerProfiles_profiles_action a{text-decoration:none;color:#000}table th.settings_printerProfiles_profiles_action a.disabled,table td.settings_printerProfiles_profiles_action a.disabled{color:#ccc;cursor:default}#temperature-graph{height:350px;width:100%;background-image:url("../img/graph-background.png");background-position:center;background-repeat:no-repeat}.tab-content,.tab-pane{overflow:visible}.tempInput{width:50px}#temp_newTemp,#temp_newBedTemp,#speed_innerWall,#speed_outerWall,#speed_fill,#speed_support,#webcam_timelapse_interval,#webcam_timelapse_postRoll,#webcam_timelapse_fps{text-align:right}ul.dropdown-menu li a{cursor:pointer}#connection_ports,#connection_baudrates,#connection_printers{width:100%}#offline_overlay,#reloadui_overlay{position:fixed;top:0;left:0;width:100%;height:100%;display:none}#offline_overlay{z-index:10002}#reloadui_overlay{z-index:10001}#offline_overlay_background,#reloadui_overlay_background{position:fixed;top:0;left:0;width:100%;height:100%;background-color:#000;filter:alpha(opacity=50);-moz-opacity:.5;-khtml-opacity:.5;opacity:.5}#offline_overlay_wrapper,#reloadui_overlay_wrapper{position:absolute;top:0;bottom:0;left:0;right:0;padding-top:60px}#offline_overlay_wrapper .container,#reloadui_overlay_wrapper .container{margin:auto}#webcam_container{width:100%;position:relative;outline:0}#webcam_container .flipH{-webkit-transform:scaleX(-1);-moz-transform:scaleX(-1);-ms-transform:scaleX(-1)}#webcam_container .flipV{-webkit-transform:scaleY(-1);-moz-transform:scaleY(-1);-ms-transform:scaleY(-1)}#webcam_container .flipH.flipV{-webkit-transform:scaleX(-1) scaleY(-1);-moz-transform:scaleX(-1) scaleY(-1);-ms-transform:scaleX(-1) scaleY(-1)}#webcam_container .rotate90{transform:rotate(-90deg)}#webcam_container .keycontrol_overlay{position:absolute;left:10px;right:10px;bottom:10px;background:rgba(0,0,0,0.5);font-size:85%;color:white;padding:0}#webcam_container .keycontrol_overlay kbd{border:1px solid #eee;border-radius:3px;margin-left:2px;margin-right:2px;font-size:90%;padding:2px;min-width:1em}#webcam_container .keycontrol_overlay .keycontrol_overlay_heading{position:relative;padding:10px;font-weight:bold}#webcam_container .keycontrol_overlay .keycontrol_overlay_column{position:relative;width:45%;padding:10px;float:left}#files .gcode_files{padding-right:7px}#files .gcode_files .entry{padding:5px;line-height:20px;border-bottom:1px solid #ddd;position:relative}#files .gcode_files .entry:hover{background-color:#f5f5f5}#files .gcode_files .entry .title{text-overflow:ellipsis;word-break:break-all}#files .gcode_files .entry .uploaded,#files .gcode_files .entry .size,#files .gcode_files .entry .additionalInfo{font-size:85%;color:#999}#files .gcode_files .entry .action-buttons{position:absolute;bottom:5px;right:5px}#files .gcode_files .entry .additionalInfo{padding-bottom:22px}#files .upload-buttons{margin-top:10px}#files .form-search{text-align:center;margin-bottom:5px!important}#control{overflow:hidden}#control .jog-panel{float:left;margin-right:19px}#control h1{text-align:left}#control .jog-panel>div{text-align:center}#control .jog-panel>div.distance{text-align:left}#control .jog-panel .slider{margin-bottom:10px}#control .box{width:30px;height:30px;margin-right:10px;margin-bottom:10px;padding-left:8px}#control .control-box{display:block;height:30px;margin-bottom:10px}#control .btn-group{margin-bottom:10px}#control .btn-group.distance>.btn{width:43px;padding:3px 0;height:30px}#control .slider-handle{width:14px;height:14px;margin-left:-7px;margin-top:-3px}#control .custom_section h1{cursor:pointer}#control .custom_section_horizontal>.custom_control{display:inline-block}#control .custom_section_vertical>.custom_control{display:block}#control .custom_control .slider{margin-left:10px;margin-right:10px;margin-bottom:2px}#gcode .progress{width:582px}#gcode .progress .bar{-webkit-transition:width 0s linear;-moz-transition:width 0s linear;-o-transition:width 0s linear;transition:width 0s linear}#gcode .canvas_container{position:relative}#gcode #gcode_layer_slider{position:absolute;right:0;top:0;height:568px;float:right}#gcode #gcode_layer_slider .slider-handle{width:14px;height:14px;margin-left:-3px;margin-top:-7px}#gcode #gcode_command_slider .slider-handle{width:14px;height:14px;margin-left:-7px;margin-top:-3px}#term .terminal{margin-bottom:30px}#term .terminal #terminal-output{min-height:340px;margin-bottom:5px}#term #terminal-sendpanel{text-align:right}#settings_dialog .modal-body #settings_dialog_menu{margin-left:0}#settings_appearance_managelanguagesdialog_emptylist{overflow:hidden;width:100%;height:300px;text-align:center;display:table}#settings_appearance_managelanguagesdialog_emptylist div{display:table-cell;vertical-align:middle}.footer ul{margin:0}.footer ul li{display:inline;margin-left:1em;font-size:85%}.footer ul li:first-child{margin-left:0}.footer ul li a{color:#555}.ui-pnotify .alert a{color:#c09853}.ui-pnotify .alert-error a,.ui-pnotify .alert-danger a{color:#b94a48}.ui-pnotify .alert-success a{color:#468847}.ui-pnotify .alert-info a{color:#3a87ad}.pnotify_additional_info .pnotify_more{font-size:85%}.text-right{text-align:right}.overflow_visible{overflow:visible!important}.border_box{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.hidden{display:none}textarea.block{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%}#drop_overlay{position:fixed;top:0;left:0;width:100%;height:100%;z-index:10000;display:none}#drop_overlay.in{display:block}#drop_overlay #drop_overlay_background{position:fixed;top:0;left:0;width:100%;height:100%;background-color:#000;filter:alpha(opacity=50);-moz-opacity:.5;-khtml-opacity:.5;opacity:.5}#drop_overlay #drop_overlay_wrapper{position:absolute;top:0;bottom:0;left:0;right:0;padding-top:60px}#drop_overlay #drop_overlay_wrapper #drop,#drop_overlay #drop_overlay_wrapper #drop_background{position:absolute;top:0;left:0;margin-left:0;width:100%}#drop_overlay #drop_overlay_wrapper #drop_locally,#drop_overlay #drop_overlay_wrapper #drop_locally_background{position:absolute;top:0;left:50%;margin-left:-50%;width:50%;border-right:2px dashed #ccc}#drop_overlay #drop_overlay_wrapper #drop_sd,#drop_overlay #drop_overlay_wrapper #drop_sd_background{position:absolute;top:0;left:50%;margin-left:0;width:50%;border-left:2px dashed #ccc}#drop_overlay #drop_overlay_wrapper .dropzone{height:100%;z-index:10001;color:#fff;font-size:30px}#drop_overlay #drop_overlay_wrapper .dropzone i{font-size:50px}#drop_overlay #drop_overlay_wrapper .dropzone .text{display:block;text-align:center;line-height:40px;position:absolute;width:100%;bottom:5%;filter:alpha(opacity=100);-moz-opacity:1.0;-khtml-opacity:1.0;opacity:1.0}#drop_overlay #drop_overlay_wrapper .dropzone_background{width:50%;height:100%;background-color:#000;filter:alpha(opacity=25);-moz-opacity:.25;-khtml-opacity:.25;opacity:.25}#drop_overlay #drop_overlay_wrapper .dropzone_background.hover{background-color:#000;filter:alpha(opacity=50);-moz-opacity:.5;-khtml-opacity:.5;opacity:.5}#drop_overlay #drop_overlay_wrapper .dropzone_background.fade{-webkit-transition:all .3s ease-out;-moz-transition:all .3s ease-out;-ms-transition:all .3s ease-out;-o-transition:all .3s ease-out;transition:all .3s ease-out;opacity:1}.icon-sd-black-14{background:url("../img/icon-sd-black-14.png") 0 3px no-repeat;width:11px;height:17px;display:inline-block!important}.center{float:none;margin-left:auto;margin-right:auto}.slider .slider-selection{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#04c;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.slider .slider-selection:hover,.slider .slider-selection:focus,.slider .slider-selection:active,.slider .slider-selection.active,.slider .slider-selection.disabled,.slider .slider-selection[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.slider .slider-selection:active,.slider .slider-selection.active{background-color:#039 \9}.slider.slider-disabled .slider-selection{background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.slider .slider-track{background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.slider.slider-disabled .slider-track{background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.slider .slider-handle{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333;text-shadow:0 1px 1px rgba(255,255,255,0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #ccc;*border:0;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05);padding:0;margin-bottom:0;opacity:1;filter:alpha(opacity=100)}.slider .slider-handle:hover,.slider .slider-handle:focus,.slider .slider-handle:active,.slider .slider-handle.active,.slider .slider-handle.disabled,.slider .slider-handle[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.slider .slider-handle:active,.slider .slider-handle.active{background-color:#ccc \9}.slider .slider-handle:first-child{*margin-left:0}.slider .slider-handle:hover,.slider .slider-handle:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.slider .slider-handle:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.slider .slider-handle.active,.slider .slider-handle:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05)}.slider .slider-handle.disabled,.slider .slider-handle[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.slider .slider-handle.hide{display:none}.slider .slider-handle.round{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%}.modal.large{width:975px;margin-left:-487px}.full-sized-box{position:absolute;bottom:0;left:0;right:0;top:0;padding:15px}.full-sized-box .row-fluid{height:100%}@media(max-width:979px){.full-sized-box{position:static}}_::-webkit-full-page-media,_:future,:root .full-sized-box{position:static}.scrollable{height:100%;overflow:auto;-webkit-overflow-scrolling:touch}.input-append .add-on.add-on-limited,.input-prepend .add-on.add-on-limited{overflow-x:hidden;text-overflow:ellipsis;width:inherit}.control-group.error .input-prepend .fileinput-button,.control-group.error .input-append .fileinput-button{border-color:#b94a48}input[type=number]{text-align:right} \ No newline at end of file diff --git a/src/octoprint/static/gcodeviewer/js/renderer.js b/src/octoprint/static/gcodeviewer/js/renderer.js index 2f046d905..32f2195ae 100644 --- a/src/octoprint/static/gcodeviewer/js/renderer.js +++ b/src/octoprint/static/gcodeviewer/js/renderer.js @@ -379,7 +379,7 @@ GCODE.renderer = (function(){ }; var drawLayer = function(layerNum, fromProgress, toProgress, isNotCurrentLayer){ - console.log("Drawing layer " + layerNum + " from " + fromProgress + " to " + toProgress + " (current: " + !isNotCurrentLayer + ")"); + log.trace("Drawing layer " + layerNum + " from " + fromProgress + " to " + toProgress + " (current: " + !isNotCurrentLayer + ")"); var i; diff --git a/src/octoprint/static/js/app/dataupdater.js b/src/octoprint/static/js/app/dataupdater.js index 26bd5f7e5..55eb281e8 100644 --- a/src/octoprint/static/js/app/dataupdater.js +++ b/src/octoprint/static/js/app/dataupdater.js @@ -250,7 +250,6 @@ function DataUpdater(allViewModels) { text: _.sprintf(gettext("Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds"), payload), type: "success" }); - gcodeFilesViewModel.requestData(payload.remote, "sdcard"); } var legacyEventHandlers = { diff --git a/src/octoprint/static/js/app/main.js b/src/octoprint/static/js/app/main.js index bab804bb9..02930e082 100644 --- a/src/octoprint/static/js/app/main.js +++ b/src/octoprint/static/js/app/main.js @@ -7,6 +7,72 @@ $(function() { log.setLevel(CONFIG_DEBUG ? "debug" : "info"); + //~~ setup browser and internal tab tracking (in 1.3.0 that will be + // much nicer with the global OctoPrint object...) + + var tabTracking = (function() { + var exports = { + browserTabVisibility: undefined, + selectedTab: undefined + }; + + var browserVisibilityCallbacks = []; + + var getHiddenProp = function() { + var prefixes = ["webkit", "moz", "ms", "o"]; + + // if "hidden" is natively supported just return it + if ("hidden" in document) { + return "hidden" + } + + // otherwise loop over all the known prefixes until we find one + var vendorPrefix = _.find(prefixes, function(prefix) { + return (prefix + "Hidden" in document); + }); + if (vendorPrefix !== undefined) { + return vendorPrefix + "Hidden"; + } + + // nothing found + return undefined; + }; + + var isHidden = function() { + var prop = getHiddenProp(); + if (!prop) return false; + + return document[prop]; + }; + + var updateBrowserVisibility = function() { + var visible = !isHidden(); + exports.browserTabVisible = visible; + _.each(browserVisibilityCallbacks, function(callback) { + callback(visible); + }) + }; + + // register for browser visibility tracking + + var prop = getHiddenProp(); + if (!prop) return undefined; + + var eventName = prop.replace(/[H|h]idden/, "") + "visibilitychange"; + document.addEventListener(eventName, updateBrowserVisibility); + + updateBrowserVisibility(); + + // exports + + exports.isVisible = function() { return !isHidden() }; + exports.onBrowserVisibilityChange = function(callback) { + browserVisibilityCallbacks.push(callback); + }; + + return exports; + })(); + //~~ AJAX setup // work around a stupid iOS6 bug where ajax requests get cached and only work once, as described at @@ -67,6 +133,18 @@ $(function() { // the view model map is our basic look up table for dependencies that may be injected into other view models var viewModelMap = {}; + // We put our tabTracking into the viewModelMap as a workaround until + // our global OctoPrint object becomes available in 1.3.0. This way + // we'll still be able to access it in our view models. + // + // NOTE TO DEVELOPERS: Do NOT depend on this dependency in your custom + // view models. It is ONLY provided for the core application to be able + // to backport a fix from the 1.3.0 development branch and WILL BE + // REMOVED once 1.3.0 gets released without any fallback! + // + // TODO: Remove with release of 1.3.0 + viewModelMap.tabTracking = tabTracking; + // Fix Function#name on browsers that do not support it (IE): // see: http://stackoverflow.com/questions/6903762/function-name-not-supported-in-ie if (!(function f() {}).name) { @@ -371,16 +449,22 @@ $(function() { $('.nav-pills, .nav-tabs').tabdrop(); // Allow components to react to tab change - var tabs = $('#tabs a[data-toggle="tab"]'); - tabs.on('show', function (e) { - var current = e.target.hash; - var previous = e.relatedTarget.hash; + var onTabChange = function(current, previous) { + log.debug("Selected OctoPrint tab changed: previous = " + previous + ", current = " + current); + tabTracking.selectedTab = current; _.each(allViewModels, function(viewModel) { if (viewModel.hasOwnProperty("onTabChange")) { viewModel.onTabChange(current, previous); } }); + }; + + var tabs = $('#tabs a[data-toggle="tab"]'); + tabs.on('show', function (e) { + var current = e.target.hash; + var previous = e.relatedTarget.hash; + onTabChange(current, previous); }); tabs.on('shown', function (e) { @@ -394,6 +478,8 @@ $(function() { }); }); + onTabChange(OCTOPRINT_INITIAL_TAB); + // Fix input element click problems on dropdowns $(".dropdown input, .dropdown label").click(function(e) { e.stopPropagation(); @@ -485,11 +571,22 @@ $(function() { }); log.info("... binding done"); + // startup complete _.each(allViewModels, function(viewModel) { if (viewModel.hasOwnProperty("onStartupComplete")) { viewModel.onStartupComplete(); } }); + + // make sure we can track the browser tab visibility + tabTracking.onBrowserVisibilityChange(function(status) { + log.debug("Browser tab is now " + (status ? "visible" : "hidden")); + _.each(allViewModels, function(viewModel) { + if (viewModel.hasOwnProperty("onBrowserTabVisibilityChange")) { + viewModel.onBrowserTabVisibilityChange(status); + } + }); + }); }; if (!_.has(viewModelMap, "settingsViewModel")) { diff --git a/src/octoprint/static/js/app/viewmodels/control.js b/src/octoprint/static/js/app/viewmodels/control.js index 7b76895f7..e1a503442 100644 --- a/src/octoprint/static/js/app/viewmodels/control.js +++ b/src/octoprint/static/js/app/viewmodels/control.js @@ -5,6 +5,9 @@ $(function() { self.loginState = parameters[0]; self.settings = parameters[1]; + // TODO remove with release of 1.3.0 and switch to OctoPrint.coreui usage + self.tabTracking = parameters[2]; + self._createToolEntry = function () { return { name: ko.observable(), @@ -415,31 +418,51 @@ $(function() { self.onSettingsBeforeSave = self.updateRotatorWidth; - self.onTabChange = function (current, previous) { - if (current == "#control") { - if (self.webcamDisableTimeout != undefined) { - clearTimeout(self.webcamDisableTimeout); - } - var webcamImage = $("#webcam_image"); - var currentSrc = webcamImage.attr("src"); - if (currentSrc === undefined || currentSrc.trim() == "") { - var newSrc = CONFIG_WEBCAM_STREAM; - if (CONFIG_WEBCAM_STREAM.lastIndexOf("?") > -1) { - newSrc += "&"; - } else { - newSrc += "?"; - } - newSrc += new Date().getTime(); + self._disableWebcam = function() { + // only disable webcam stream if tab is out of focus for more than 5s, otherwise we might cause + // more load by the constant connection creation than by the actual webcam stream + self.webcamDisableTimeout = setTimeout(function () { + $("#webcam_image").attr("src", ""); + }, 5000); + }; + + self._enableWebcam = function() { + if (self.tabTracking.selectedTab != "#control" || !self.tabTracking.browserTabVisible) { + return; + } - self.updateRotatorWidth(); - webcamImage.attr("src", newSrc); + if (self.webcamDisableTimeout != undefined) { + clearTimeout(self.webcamDisableTimeout); + } + var webcamImage = $("#webcam_image"); + var currentSrc = webcamImage.attr("src"); + if (currentSrc === undefined || currentSrc.trim() == "") { + var newSrc = CONFIG_WEBCAM_STREAM; + if (CONFIG_WEBCAM_STREAM.lastIndexOf("?") > -1) { + newSrc += "&"; + } else { + newSrc += "?"; } + newSrc += new Date().getTime(); + + self.updateRotatorWidth(); + webcamImage.attr("src", newSrc); + } + }; + + self.onTabChange = function (current, previous) { + if (current == "#control") { + self._enableWebcam(); } else if (previous == "#control") { - // only disable webcam stream if tab is out of focus for more than 5s, otherwise we might cause - // more load by the constant connection creation than by the actual webcam stream - self.webcamDisableTimeout = setTimeout(function () { - $("#webcam_image").attr("src", ""); - }, 5000); + self._disableWebcam(); + } + }; + + self.onBrowserTabVisibilityChange = function(status) { + if (status) { + self._enableWebcam(); + } else { + self._disableWebcam(); } }; @@ -565,7 +588,7 @@ $(function() { OCTOPRINT_VIEWMODELS.push([ ControlViewModel, - ["loginStateViewModel", "settingsViewModel"], + ["loginStateViewModel", "settingsViewModel", "tabTracking"], "#control" ]); }); diff --git a/src/octoprint/static/js/app/viewmodels/files.js b/src/octoprint/static/js/app/viewmodels/files.js index 885f5a406..ae510fee4 100644 --- a/src/octoprint/static/js/app/viewmodels/files.js +++ b/src/octoprint/static/js/app/viewmodels/files.js @@ -600,6 +600,10 @@ $(function() { self.onEventMetadataStatisticsUpdated = function(payload) { self.requestData(); }; + + self.onEventTransferDone = function(payload) { + self.requestData(payload.remote, "sdcard"); + }; } OCTOPRINT_VIEWMODELS.push([ diff --git a/src/octoprint/static/js/app/viewmodels/gcode.js b/src/octoprint/static/js/app/viewmodels/gcode.js index eb8c358dc..4f82f6f57 100644 --- a/src/octoprint/static/js/app/viewmodels/gcode.js +++ b/src/octoprint/static/js/app/viewmodels/gcode.js @@ -5,6 +5,9 @@ $(function() { self.loginState = parameters[0]; self.settings = parameters[1]; + // TODO remove with release of 1.3.0 and switch to OctoPrint.coreui usage + self.tabTracking = parameters[2]; + self.ui_progress_percentage = ko.observable(); self.ui_progress_type = ko.observable(); self.ui_progress_text = ko.computed(function() { @@ -339,6 +342,21 @@ $(function() { self._processData(data); }; + self._renderPercentage = function(percentage) { + var cmdIndex = GCODE.gCodeReader.getCmdIndexForPercentage(percentage); + if (!cmdIndex) return; + + GCODE.renderer.render(cmdIndex.layer, 0, cmdIndex.cmd); + GCODE.ui.updateLayerInfo(cmdIndex.layer); + + if (self.layerSlider != undefined) { + self.layerSlider.slider("setValue", cmdIndex.layer); + } + if (self.layerCommandSlider != undefined) { + self.layerCommandSlider.slider("setValue", [0, cmdIndex.cmd]); + } + }; + self._processData = function(data) { if (!data.job.file || !data.job.file.name && (self.loadedFilename || self.loadedFileDate)) { self.waitForApproval(false); @@ -358,19 +376,8 @@ $(function() { if(self.loadedFilename && self.loadedFilename == data.job.file.name && self.loadedFileDate == data.job.file.date) { - if (self.currentlyPrinting && self.renderer_syncProgress() && !self.waitForApproval()) { - var cmdIndex = GCODE.gCodeReader.getCmdIndexForPercentage(data.progress.completion); - if(cmdIndex){ - GCODE.renderer.render(cmdIndex.layer, 0, cmdIndex.cmd); - GCODE.ui.updateLayerInfo(cmdIndex.layer); - - if (self.layerSlider != undefined) { - self.layerSlider.slider("setValue", cmdIndex.layer); - } - if (self.layerCommandSlider != undefined) { - self.layerCommandSlider.slider("setValue", [0, cmdIndex.cmd]); - } - } + if (self.tabTracking.browserTabVisible && self.tabActive && self.currentlyPrinting && self.renderer_syncProgress() && !self.waitForApproval()) { + self._renderPercentage(data.progress.completion); } self.errorCount = 0 } else { @@ -394,6 +401,12 @@ $(function() { } }; + self.onEventPrintDone = function() { + if (self.renderer_syncProgress() && !self.waitForApproval()) { + self._renderPercentage(100.0); + } + }; + self.approveLargeFile = function() { self.waitForApproval(false); self.loadFile(self.selectedFile.name(), self.selectedFile.date()); @@ -504,13 +517,16 @@ $(function() { self.onBeforeBinding = function() { self.initialize(); - } + }; + self.onTabChange = function(current, previous) { + self.tabActive = current == "#gcode"; + }; } OCTOPRINT_VIEWMODELS.push([ GcodeViewModel, - ["loginStateViewModel", "settingsViewModel"], + ["loginStateViewModel", "settingsViewModel", "tabTracking"], "#gcode" ]); }); diff --git a/src/octoprint/static/js/app/viewmodels/printerprofiles.js b/src/octoprint/static/js/app/viewmodels/printerprofiles.js index 796124659..a3f6aa25b 100644 --- a/src/octoprint/static/js/app/viewmodels/printerprofiles.js +++ b/src/octoprint/static/js/app/viewmodels/printerprofiles.js @@ -15,7 +15,7 @@ $(function() { height: 200, origin: "lowerleft" }, - heatedBed: false, + heatedBed: true, axes: { x: {speed: 6000, inverted: false}, y: {speed: 6000, inverted: false}, diff --git a/src/octoprint/static/js/app/viewmodels/temperature.js b/src/octoprint/static/js/app/viewmodels/temperature.js index 9b58d2ecb..e05cfd6a9 100644 --- a/src/octoprint/static/js/app/viewmodels/temperature.js +++ b/src/octoprint/static/js/app/viewmodels/temperature.js @@ -36,7 +36,7 @@ $(function() { self.heaterOptions = ko.observable({}); - self._numExtrudersUpdated = function() { + self._printerProfileUpdated = function() { var graphColors = ["red", "orange", "green", "brown", "purple"]; var heaterOptions = {}; var tools = self.tools(); @@ -69,15 +69,21 @@ $(function() { } // print bed - heaterOptions["bed"] = {name: gettext("Bed"), color: "blue"}; + if (self.settingsViewModel.printerProfiles.currentProfileData().heatedBed()) { + self.hasBed(true); + heaterOptions["bed"] = {name: gettext("Bed"), color: "blue"}; + } else { + self.hasBed(false); + } // write back self.heaterOptions(heaterOptions); self.tools(tools); }; self.settingsViewModel.printerProfiles.currentProfileData.subscribe(function() { - self._numExtrudersUpdated(); - self.settingsViewModel.printerProfiles.currentProfileData().extruder.count.subscribe(self._numExtrudersUpdated); + self._printerProfileUpdated(); + self.settingsViewModel.printerProfiles.currentProfileData().extruder.count.subscribe(self._printerProfileUpdated); + self.settingsViewModel.printerProfiles.currentProfileData().heatedBed.subscribe(self._printerProfileUpdated()); }); self.temperatures = []; @@ -152,11 +158,8 @@ $(function() { } if (lastData.hasOwnProperty("bed")) { - self.hasBed(true); self.bedTemp["actual"](lastData.bed.actual); self.bedTemp["target"](lastData.bed.target); - } else { - self.hasBed(false); } if (!CONFIG_TEMPERATURE_GRAPH) return; @@ -208,8 +211,6 @@ $(function() { if (!d[type]) return; result[type].actual.push([time, d[type].actual]); result[type].target.push([time, d[type].target]); - - self.hasBed(self.hasBed() || (type == "bed")); }) }); @@ -375,4 +376,4 @@ $(function() { ["loginStateViewModel", "settingsViewModel"], "#temp" ]); -}); \ No newline at end of file +}); diff --git a/src/octoprint/static/js/app/viewmodels/terminal.js b/src/octoprint/static/js/app/viewmodels/terminal.js index d7ec494df..ba7b04363 100644 --- a/src/octoprint/static/js/app/viewmodels/terminal.js +++ b/src/octoprint/static/js/app/viewmodels/terminal.js @@ -7,6 +7,7 @@ $(function() { self.log = ko.observableArray([]); self.buffer = ko.observable(300); + self.upperLimit = ko.observable(3000); self.command = ko.observable(undefined); @@ -34,7 +35,8 @@ $(function() { var filtered = false; var result = []; - _.each(self.log(), function(entry) { + var lines = self.log(); + _.each(lines, function(entry) { if (lineVisible(entry)) { result.push(entry); filtered = false; @@ -46,19 +48,30 @@ $(function() { return result; }); - self.displayedLines.subscribe(function() { - self.updateOutput(); - }); self.lineCount = ko.computed(function() { - var total = self.log().length; - var displayed = _.filter(self.displayedLines(), function(entry) { return entry.type == "line" }).length; + var regex = self.filterRegex(); + var lineVisible = function(entry) { + return regex == undefined || !entry.line.match(regex); + }; + + var lines = self.log(); + var total = lines.length; + var displayed = _.filter(lines, lineVisible).length; var filtered = total - displayed; - if (total == displayed) { - return _.sprintf(gettext("showing %(displayed)d lines"), {displayed: displayed}); + if (filtered > 0) { + if (total > self.upperLimit()) { + return _.sprintf(gettext("showing %(displayed)d lines (%(filtered)d of %(total)d total lines filtered, buffer full)"), {displayed: displayed, total: total, filtered: filtered}); + } else { + return _.sprintf(gettext("showing %(displayed)d lines (%(filtered)d of %(total)d total lines filtered)"), {displayed: displayed, total: total, filtered: filtered}); + } } else { - return _.sprintf(gettext("showing %(displayed)d lines (%(filtered)d of %(total)d total lines filtered)"), {displayed: displayed, total: total, filtered: filtered}); + if (total > self.upperLimit()) { + return _.sprintf(gettext("showing %(displayed)d lines (buffer full)"), {displayed: displayed}); + } else { + return _.sprintf(gettext("showing %(displayed)d lines"), {displayed: displayed}); + } } }); @@ -84,14 +97,31 @@ $(function() { }; self._processCurrentLogData = function(data) { - self.log(self.log().concat(_.map(data, function(line) { return self._toInternalFormat(line) }))); + var length = self.log().length; + if (length >= self.upperLimit()) { + var cutoff = "--- too many lines to buffer, cut off ---"; + var last = self.log()[length-1]; + if (!last || last.type != "cut" || last.line != cutoff) { + self.log(self.log().concat(self._toInternalFormat(cutoff, "cut"))); + } + return; + } + + var newLog = self.log().concat(_.map(data, function(line) { return self._toInternalFormat(line) })); if (self.autoscrollEnabled()) { - self.log(self.log.slice(-self.buffer())); + // we only keep the last entries + newLog = newLog.slice(-self.buffer()); + } else if (newLog.length > self.upperLimit()) { + // we only keep the first entries + newLog = newLog.slice(0, self.upperLimit()); } + self.log(newLog); + self.updateOutput(); }; self._processHistoryLogData = function(data) { self.log(_.map(data, function(line) { return self._toInternalFormat(line) })); + self.updateOutput(); }; self._toInternalFormat = function(line, type) { @@ -141,7 +171,7 @@ $(function() { self.scrollToEnd = function() { var container = $("#terminal-output"); if (container.length) { - container.scrollTop(container[0].scrollHeight - container.height()) + container.scrollTop(container[0].scrollHeight); } }; @@ -232,4 +262,4 @@ $(function() { ["loginStateViewModel", "settingsViewModel"], "#term" ]); -}); \ No newline at end of file +}); diff --git a/src/octoprint/static/less/octoprint.less b/src/octoprint/static/less/octoprint.less index c1b8daf61..0736edc63 100644 --- a/src/octoprint/static/less/octoprint.less +++ b/src/octoprint/static/less/octoprint.less @@ -396,10 +396,17 @@ ul.dropdown-menu li a { left: 0; width: 100%; height: 100%; - z-index: 10001; display: none; } +#offline_overlay { + z-index: 10002; +} + +#reloadui_overlay { + z-index: 10001; +} + #offline_overlay_background, #reloadui_overlay_background { position: fixed; diff --git a/src/octoprint/templates/initscript.jinja2 b/src/octoprint/templates/initscript.jinja2 index 8d212c621..5763a7ee7 100644 --- a/src/octoprint/templates/initscript.jinja2 +++ b/src/octoprint/templates/initscript.jinja2 @@ -33,4 +33,12 @@ var OCTOPRINT_VIEWMODELS = []; var ADDITIONAL_VIEWMODELS = []; var OCTOPRINT_ADDITIONAL_BINDINGS = []; + + {% if templates.tab.order %} + {% set first_tab = templates.tab.order[0] %} + {% set entry, data = templates.tab.entries[first_tab] %} + var OCTOPRINT_INITIAL_TAB = "#{{ data._div }}"; + {% else %} + var OCTOPRINT_INITIAL_TAB = undefined; + {% endif %} diff --git a/src/octoprint/templates/tabs/temperature.jinja2 b/src/octoprint/templates/tabs/temperature.jinja2 index 90622dcdd..103443428 100644 --- a/src/octoprint/templates/tabs/temperature.jinja2 +++ b/src/octoprint/templates/tabs/temperature.jinja2 @@ -1,5 +1,5 @@ {% if enableTemperatureGraph %} -
+
{% endif %} diff --git a/src/octoprint/templates/tabs/terminal.jinja2 b/src/octoprint/templates/tabs/terminal.jinja2 index 18d2a30a4..4389d7252 100644 --- a/src/octoprint/templates/tabs/terminal.jinja2 +++ b/src/octoprint/templates/tabs/terminal.jinja2 @@ -1,5 +1,5 @@
-

+

{{ _("Scroll to end") }} | {{ _("Select all") }}
diff --git a/src/octoprint/translations/de/LC_MESSAGES/messages.mo b/src/octoprint/translations/de/LC_MESSAGES/messages.mo index 9f2ed5e39..3c036179c 100644 Binary files a/src/octoprint/translations/de/LC_MESSAGES/messages.mo and b/src/octoprint/translations/de/LC_MESSAGES/messages.mo differ diff --git a/src/octoprint/translations/de/LC_MESSAGES/messages.po b/src/octoprint/translations/de/LC_MESSAGES/messages.po index f87120120..51ae962a4 100644 --- a/src/octoprint/translations/de/LC_MESSAGES/messages.po +++ b/src/octoprint/translations/de/LC_MESSAGES/messages.po @@ -11,116 +11,146 @@ msgid "" msgstr "" "Project-Id-Version: OctoPrint\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2015-08-31 10:04+0200\n" -"PO-Revision-Date: 2015-08-31 10:28+0100\n" +"POT-Creation-Date: 2015-12-01 11:20+0100\n" +"PO-Revision-Date: 2015-12-01 11:37+0100\n" "Last-Translator: Gina Häußge \n" +"Language: de\n" "Language-Team: German (http://www.transifex.com/projects/p/octoprint/language/de/)\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" -"Language: de\n" +"Generated-By: Babel 2.1.1\n" "X-Generator: Poedit 1.6.8\n" -#: src/octoprint/plugins/cura/__init__.py:43 -msgid "CuraEngine" -msgstr "CuraEngine" - #: src/octoprint/plugins/cura/templates/cura_settings.jinja2:1 #: src/octoprint/templates/tabs/control.jinja2:98 msgid "General" msgstr "Allgemein" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:5 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:3 +msgid "" +"\n" +" Specify the path to the CuraEngine binary. Note that only\n" +" versions up to and including 15.04 are supported.\n" +" CuraEngine version 15.06 or newer is not\n" +" compatible with this plugin.\n" +msgstr "" +"\n" +" Gib den Pfad zum CuraEngine Binary an. Beachte, dass nur\n" +" Versionen bis einschließlich 15.04 unterstützt sind.\n" +" CuraEngine Version 15.06 oder neuere sind nicht\n" +" kompatibel mit diesem Plugin.\n" + +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:12 msgid "Path to CuraEngine" msgstr "Pfad zu CuraEngine" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:13 -msgid "Log the output of CuraEngine to plugin_cura_engine.log" -msgstr "Output von CuraEngine nach plugin_cura_engine.log loggen" +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:20 +msgid "Log the output of CuraEngine to plugin_cura_engine.log" +msgstr "Output von CuraEngine nach plugin_cura_engine.log loggen" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:19 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:26 msgid "Profiles" msgstr "Profile" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:22 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:29 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 -#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 msgid "Sort by" msgstr "Sortieren" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:22 -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:27 -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:76 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:29 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:34 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:87 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:51 msgid "Identifier" msgstr "ID" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:22 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:75 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:29 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:105 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 #: src/octoprint/templates/sidebar/files_header.jinja2:6 -#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 msgid "ascending" msgstr "aufsteigend" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:22 -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:28 -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:82 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:14 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:29 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:35 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:93 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:38 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:4 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 #: src/octoprint/templates/dialogs/settings/logs.jinja2:12 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:5 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:44 #: src/octoprint/templates/dialogs/settings/terminalfilters.jinja2:3 -#: src/octoprint/templates/tabs/timelapse.jinja2:49 -#: src/octoprint/templates/tabs/timelapse.jinja2:54 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 +#: src/octoprint/templates/tabs/timelapse.jinja2:55 msgid "Name" msgstr "Name" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:29 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:15 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:36 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:39 msgid "Actions" msgstr "Aktionen" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:37 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:44 msgid "Make default" msgstr "Als Standard speichern" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:37 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:44 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:15 msgid "Delete Profile" msgstr "Profil entfernen" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:54 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:61 msgid "Import Profile..." msgstr "Profil importieren..." -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:59 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:64 +#, python-format +msgid "For more information on configuration and usage please see the Plugin's homepage." +msgstr "Für weitere Informationen zu Konfiguration and Verwendung schaue bitte auf die Homepage des Plugins." + +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:70 msgid "Import Existing Cura Profile" msgstr "Vorhandenes Curaprofil importieren" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:64 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:75 msgid "Profile ini file" msgstr "Profil-INI-Datei" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:68 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:141 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:79 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:171 #: src/octoprint/templates/dialogs/settings/appearance.jinja2:83 msgid "Browse..." msgstr "Durchsuchen..." -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:88 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:99 msgid "Description" msgstr "Beschreibung" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:96 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:107 msgid "Overwrite existing file" msgstr "Vorhandene Datei überschreiben" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:103 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:113 +msgid "" +"\n" +" You can import your existing profile .ini files from Cura (version up to and\n" +" including 15.04) here. Please be aware that neither the .json profile format\n" +" from Cura versions starting with 15.06 is supported, nor are the custom Cura profile formats\n" +" that third party tools like e.g. Repetier create.\n" +" " +msgstr "" +"\n" +" Hier kannst Du Deine existierenden Profildateien (.ini) aus Cura importieren (Versionen bis\n" +" einschließlich 15.04). Bitte beachte, dass weder die .json Profile aus\n" +" Curaversionen ab 15.06 unterstützt werden, noch andere Thirdpartyprofilformate von\n" +" Tools wie z.B. Repetier Host.\n" + +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:121 #: src/octoprint/templates/dialogs/usersettings.jinja2:46 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:80 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:109 @@ -129,7 +159,7 @@ msgstr "Vorhandene Datei überschreiben" msgid "Abort" msgstr "Abbrechen" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:104 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:122 #: src/octoprint/templates/dialogs/usersettings.jinja2:47 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:81 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:110 @@ -138,226 +168,226 @@ msgstr "Abbrechen" msgid "Confirm" msgstr "Bestätigen" -#: src/octoprint/plugins/pluginmanager/__init__.py:107 +#: src/octoprint/plugins/pluginmanager/__init__.py:116 msgid "Plugin Manager" msgstr "Pluginmanager" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:132 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:277 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:149 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:310 msgid "Installing plugin..." msgstr "Installiere Plugin..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:132 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:149 msgid "Installing plugin from uploaded archive..." msgstr "Installiere Plugin von hochgeladenem Archiv..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:147 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:225 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:302 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:332 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:546 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:576 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:593 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:610 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:164 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:258 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:335 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:365 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:631 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:661 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:678 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:695 msgid "Something went wrong" msgstr "Etwas ist schief gegangen" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:148 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:226 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:303 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:333 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:165 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:259 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:336 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:366 msgid "Please consult octoprint.log for details" msgstr "Bitte konsultiere octoprint.log für Details" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:279 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:312 #, python-format msgid "Installing plugin \"%(name)s\" from %(url)s..." msgstr "Installiere Plugin \"%(name)s\" von %(url)s..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:281 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:314 #, python-format msgid "Installing plugin from %(url)s..." msgstr "Installiere Plugin von %(url)s..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:284 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:317 msgid "Reinstalling plugin..." msgstr "Reinstalliere Plugin..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:285 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:318 #, python-format msgid "Reinstalling plugin \"%(name)s\" from %(url)s..." msgstr "Reinstalliere Plugin \"%(name)s\" von %(url)s..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:323 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:356 msgid "Uninstalling plugin..." msgstr "Deinstalliere Plugin..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:323 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:356 #, python-format msgid "Uninstalling plugin \"%(name)s\"" msgstr "Deinstalliere Plugin \"%(name)s\"" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:443 msgid "Reinstall" msgstr "Reinstallieren" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:130 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:146 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:443 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:160 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:176 msgid "Install" msgstr "Installieren" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:443 msgid "Incompatible" msgstr "Inkompatibel" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:376 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:461 #: src/octoprint/templates/overlays/reloadui.jinja2:9 msgid "Reload now" msgstr "Jetzt neu laden" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:445 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:530 msgid "Done!" msgstr "Fertig!" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:465 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:550 msgid "Enable Plugin" msgstr "Plugin enablen" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:465 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:550 msgid "Disable Plugin" msgstr "Plugin disablen" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:530 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:615 msgid "Plugin installed" msgstr "Plugin installiert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:531 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:616 msgid "A plugin was installed successfully, however it was impossible to detect which one. Please Restart OctoPrint to make sure everything will be registered properly" msgstr "Ein Plugin wurde erfolgreich installiert, es war aber unmöglich zu detektieren, welches. Bitte starte OctoPrint neu um sicherzustellen, dass alles ordnungsgemäß registriert wird." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:535 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:620 #, python-format msgid "Plugin \"%(name)s\" reinstalled" msgstr "Plugin \"%(name)s\" reinstalliert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:536 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:621 msgid "The plugin was reinstalled successfully" msgstr "Das Plugin wurde erfolgreich reinstalliert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:537 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:622 msgid "The plugin was reinstalled successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich reinstalliert, es ist aber ein Neustart von OctoPrint notwendig bevor es genutzt werden kann." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:538 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:623 msgid "The plugin was reinstalled successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich reinstalliert, es ist aber ein Neuladen der Seite notwendig bevor es genutzt werden kann." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:540 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:625 #, python-format msgid "Plugin \"%(name)s\" installed" msgstr "Plugin \"%(name)s\" installiert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:541 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:626 msgid "The plugin was installed successfully" msgstr "Das Plugin wurde erfolgreich installiert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:542 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:627 msgid "The plugin was installed successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich installiert, es ist jedoch ein Neustart von OctoPrint notwendig bevor es genutzt werden kann." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:543 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:628 msgid "The plugin was installed successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich installiert, es ist jedoch ein Neuladen der Seite notwendig bevor es genutzt werden kann." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:554 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:639 #, python-format msgid "Reinstalling the plugin from URL \"%(url)s\" failed: %(reason)s" msgstr "Reinstallation des Plugins von URL \"%(url)s\" fehlgeschlagen: %(reason)s" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:556 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:641 #, python-format msgid "Installing the plugin from URL \"%(url)s\" failed: %(reason)s" msgstr "Installation des Plugins von URL \"%(url)s\" fehlgeschlagen: %(reason)s" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:560 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:645 #, python-format msgid "Reinstalling the plugin from URL \"%(url)s\" failed, please see the log for details." msgstr "Reinstallation des Plugins von URL \"%(url)s\" fehlgeschlagen, bitte konsultiere das Log für Details." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:562 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:647 #, python-format msgid "Installing the plugin from URL \"%(url)s\" failed, please see the log for details." msgstr "Installation des Plugins von URL \"%(url)s\" fehlgeschlagen, bitte konsultiere das Log für Details" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:571 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:656 #, python-format msgid "Plugin \"%(name)s\" uninstalled" msgstr "Plugin \"%(name)s\" deinstalliert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:572 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:657 msgid "The plugin was uninstalled successfully" msgstr "Das Plugin wurde erfolgreich deinstalliert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:573 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:658 msgid "The plugin was uninstalled successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich deinstalliert, es ist jedoch ein Neustart von OctoPrint notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:574 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:659 msgid "The plugin was uninstalled successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich deinstalliert, es ist jedoch ein Neuladen der Seite notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:578 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:663 #, python-format msgid "Uninstalling the plugin failed: %(reason)s" msgstr "Deinstallation des Plugins fehlgeschlagen: %(reason)s" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:580 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:665 msgid "Uninstalling the plugin failed, please see the log for details." msgstr "Deinstallation des Plugins fehlgeschlagen, bitte konsultiere das Log für Details." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:588 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:673 #, python-format msgid "Plugin \"%(name)s\" enabled" msgstr "Plugin \"%(name)s\" aktiviert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:589 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:674 msgid "The plugin was enabled successfully." msgstr "Das Plugin wurde erfolgreich aktiviert." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:590 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:675 msgid "The plugin was enabled successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich aktiviert, es ist jedoch ein Neustart von OctoPrint notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:591 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:676 msgid "The plugin was enabled successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich aktiviert, es ist jedoch ein Neuladen der Seite notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:595 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:612 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:680 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:697 #, python-format msgid "Toggling the plugin failed: %(reason)s" msgstr "Togglen des Plugins fehlgeschalgen: %(reason)s" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:597 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:614 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:682 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:699 msgid "Toggling the plugin failed, please see the log for details." msgstr "Togglen des Plugins fehlgeschlagen, bitte konsultiere das Log für Details." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:605 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:690 #, python-format msgid "Plugin \"%(name)s\" disabled" msgstr "Plugin \"%(name)s\" deaktiviert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:606 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:691 msgid "The plugin was disabled successfully." msgstr "Das Plugin wurde erfolgreich deaktiviert." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:607 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:692 msgid "The plugin was disabled successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich deaktiviert, es ist jedoch ein Neustart von OctoPrint notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:608 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:693 msgid "The plugin was disabled successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich deaktiviert, es ist jedoch ein Neuladen der Seite notwendig." @@ -365,125 +395,204 @@ msgstr "Das Plugin wurde erfolgreich deaktiviert, es ist jedoch ein Neuladen der msgid "Take note that all plugin management functionality is disabled while your printer is printing." msgstr "Bitte beachte dass jegliche Pluginmanagementfunktionen während des Druckens deaktiviert sind." -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:9 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:8 +msgid "" +"\n" +" The pip command could not be found.\n" +" Please configure it manually. No installation and uninstallation of plugin\n" +" packages is possible while pip is unavailable.\n" +msgstr " Das pip Command konnte nicht gefunden werden. Bitte konfiguriere es manuell. Installation und Deinstallation von Plugins ist nicht möglich, solange pip nicht verfügbar ist." + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:16 +msgid "" +"\n" +" The pip command is configured to use sudo. This\n" +" is not recommended due to security reasons. It is strongly\n" +" suggested you install OctoPrint under a\n" +" user-owned virtual environment\n" +" so that the use of sudo is not needed for plugin management.\n" +msgstr " Das pip Command ist konfiguriert, sudo zu nutzen. Das ist aus Gründen der Systemsicherheit nicht empfehlenswert. Es ist ausdrücklichst empfohlen, dass Du OctoPrint in einem Virtual Environment installierst, dass einem User gehört, so dass sudo für die Pluginverwaltung nicht benötigt wird." + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:30 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:204 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:20 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:72 +msgid "Plugin Configuration" +msgstr "Pluginkonfiguration" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:33 msgid "Installed Plugins" msgstr "Installierte Plugins" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:21 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:45 msgid "Bundled" msgstr "Gebundled" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:24 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:99 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:48 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:129 #: src/octoprint/templates/index.jinja2:118 msgid "Homepage" msgstr "Homepage" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:31 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:55 msgid "Uninstall Plugin" msgstr "Plugin deinstallieren" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:48 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:72 msgid "Get More..." msgstr "Mehr..." -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:59 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:167 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:87 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:197 #: src/octoprint/templates/dialogs/settings/appearance.jinja2:96 msgid "Close" msgstr "Schließen" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:66 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:94 msgid "Install new Plugins..." msgstr "Installation neuer Plugins..." -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:71 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:101 #, python-format msgid "... from the Plugin Repository" msgstr "... vom Plugin Repository" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:75 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:105 msgid "Sort by title" msgstr "Nach Titel sortieren" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:76 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:106 msgid "Sort by publication date" msgstr "Nach Veröffentlichungsdatum sortieren" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:76 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:106 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 #: src/octoprint/templates/sidebar/files_header.jinja2:7 #: src/octoprint/templates/sidebar/files_header.jinja2:8 -#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 msgid "descending" msgstr "absteigend" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:78 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:108 msgid "Only show uninstalled plugins" msgstr "Nur uninstallierte Plugins anzeigen" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:79 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:109 msgid "Only show compatible plugins" msgstr "Nur kompatible Plugins anzeigen" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:81 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:111 msgid "Refresh list from repository" msgstr "Liste vom Repository neu laden" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:87 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:117 #: src/octoprint/templates/sidebar/files.jinja2:2 msgid "Search..." msgstr "Suchen..." -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:98 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:128 msgid "Details" msgstr "Details" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:115 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:145 msgid "Sadly the repository is currently not available" msgstr "Das Repository ist leider zur Zeit nicht verfügbar" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:118 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:148 msgid "Is your OctoPrint installation connected to the internet?" msgstr "Ist Deine OctoPrint Installation mit dem Internet verbunden?" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:123 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:153 msgid "... from URL" msgstr "... von URL" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:128 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:158 msgid "Enter URL..." msgstr "URL eingeben..." -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:132 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:162 msgid "This does not look like a valid \"http://\" or \"https://\" URL." msgstr "Das sieht nicht wie eine valide \"http://\" oder \"https://\" URL aus." -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:135 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:165 msgid "... from an uploaded archive" msgstr "... von einem hochgeladenen Archiv" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:148 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:178 msgid "This does not look like a valid plugin archive. Valid plugin archives should be either zip files or tarballs and have the extension \".zip\", \".tar.gz\", \".tgz\" or \".tar\"" msgstr "Das sieht nicht aus wie ein valides Pluginarchiv. Valide Pluginarchive sollten entweder ZIP-Dateien oder Tarballs sein und die Dateiextension \".zip\", \".tar.gz\", \".tgz\" oder \".tar\" haben" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:152 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:182 #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:62 #: src/octoprint/templates/tabs/terminal.jinja2:25 msgid "Advanced options" msgstr "Erweiterte Optionen" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:158 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:188 msgid "Use --process-dependency-links with pip install" msgstr "--process-dependency-link mit pip install verwenden" -#: src/octoprint/plugins/softwareupdate/__init__.py:378 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:208 +msgid "pip command to use for managing plugins. You might have to configure this if auto detection fails." +msgstr "pip Command, das zur Verwaltung von Plugins verwendet werden soll. Es kann sein, dass Du das manuell konfigurieren musst, falls die Autodetection fehlschlägt." + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:209 +msgid "pip command" +msgstr "pip Command" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:211 +msgid "Autodetect" +msgstr "Automatisch erkennen" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:212 +msgid "Only set this if OctoPrint cannot autodetect the path to pip to use for managing plugins." +msgstr "Nur setzen, wenn OctoPrint den Pfad zum pip Command für die Pluginverwaltung nicht selbst erkennen kann." + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:215 +msgid "Additional arguments for pip command. You should normally not have to change this." +msgstr "Weitere Argument für das pip Command. Du solltest hier normalerweise nichts ändern müssen." + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:216 +msgid "Additional pip arguments" +msgstr "Weitere pip Argumente" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:221 +msgid "URL of the Plugin Repository to use. You should normally not have to change this." +msgstr "URL des zu nutzenden Pluginrepositories. Du solltest hier normalerweise nichts ändern müssen." + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:222 +msgid "Repository URL" +msgstr "Repository-URL" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:227 +msgid "How long to cache repository data, in minutes. You should normally not have to change this." +msgstr "Wie lange die Repositorydaten gecached werden sollen, in Minuten. Du solltest hier normalerweise nichts ändern müssen." + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:228 +msgid "Repository cache TTL" +msgstr "Repository-Cache TTL" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:239 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:100 +#: src/octoprint/templates/dialogs/confirmation.jinja2:11 +#: src/octoprint/templates/dialogs/settings.jinja2:51 +#: src/octoprint/templates/dialogs/slicing.jinja2:50 +#: src/octoprint/templates/sidebar/state.jinja2:19 +msgid "Cancel" +msgstr "Abbruch" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:240 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101 +#: src/octoprint/templates/dialogs/settings.jinja2:52 +msgid "Save" +msgstr "Speichern" + +#: src/octoprint/plugins/softwareupdate/__init__.py:394 msgid "Software Update" msgstr "Software Update" -#: src/octoprint/plugins/softwareupdate/__init__.py:662 -#: src/octoprint/plugins/softwareupdate/__init__.py:693 -#: src/octoprint/server/views.py:149 +#: src/octoprint/plugins/softwareupdate/__init__.py:680 +#: src/octoprint/server/views.py:155 #: src/octoprint/static/js/app/viewmodels/appearance.js:11 #: src/octoprint/static/js/app/viewmodels/appearance.js:13 #: src/octoprint/static/js/app/viewmodels/appearance.js:18 @@ -499,126 +608,118 @@ msgstr "Release" msgid "Commit" msgstr "Commit" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:145 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:147 msgid "There are updates available for the following components:" msgstr "Es gibt Aktualisierungen für die folgenden Komponenten:" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:159 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:161 msgid "Those components marked with can be updated directly." msgstr "Die mit markierten Komponenten können direkt aktualisiert werden." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:162 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:164 msgid "Update Available" msgstr "Aktualisierung verfügbar" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:174 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:176 msgid "Ignore" msgstr "Ignorieren" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:178 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:180 msgid "You can make this message display again via \"Settings\" > \"Software Update\" > \"Check for update now\"" msgstr "Du kannst diese Nachricht erneut anzeigen lassen mittels \"Einstellungen\" > \"Software Update\" > \"Jetzt nach Aktualisierungen suchen\"" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:182 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:184 msgid "Update now" msgstr "Jetzt aktualisieren" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:199 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:201 msgid "Everything is up-to-date" msgstr "Alles ist auf dem neusten Stand" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:264 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:266 msgid "Updating..." msgstr "Aktualisiere..." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:265 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:267 msgid "Now updating, please wait." msgstr "Aktualisiere gerade, bitte warten." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:284 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:286 msgid "Update not started!" msgstr "Aktualisierung nicht gestartet!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:285 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:287 msgid "The update could not be started. Is it already active? Please consult the log for details." msgstr "Die Aktualisierung konnte nicht gestartet werden. Läuft bereits eine? Bitte konsultiere das Log für Details." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:307 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:309 msgid "Can't update while printing" msgstr "Aktualisierung nicht möglich während gedruckt wird" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:308 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:310 msgid "A print job is currently in progress. Updating will be prevented until it is done." msgstr "Ein Druckjob ist zur Zeit aktiv. Aktualisierungen werden unterbunden bis er fertig ist." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:312 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:314 msgid "This will update your OctoPrint installation and restart the server." msgstr "Das wird Deine OctoPrint Installation aktualisieren und den Server neu starten." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:336 -msgid "Restart successful!" -msgstr "Neustart erfolgreich!" - -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:337 -msgid "The server was restarted successfully. The page will now reload automatically." -msgstr "Der Server wurde erfolgreich neu gestartet. Die Seite wird nun automatisch neu geladen." - -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:369 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:363 #, python-format msgid "Now updating %(name)s to %(version)s" msgstr "Aktualisiere %(name)s auf %(version)s" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:377 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:371 msgid "Update successful, restarting!" msgstr "Aktualisierung erfolgreich, starte neu!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:378 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:372 msgid "The update finished successfully and the server will now be restarted." msgstr "Die Aktualisierung wurde erfolgreich durchgeführt und der Server wird jetzt neu gestartet." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:389 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:431 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:383 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:425 msgid "Restart failed" msgstr "Neustart fehlgeschlagen" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:390 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:432 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:384 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:426 msgid "The server apparently did not restart by itself, you'll have to do it manually. Please consult the log file on what went wrong." msgstr "Der Server hat anscheinend nicht von selbst neu gstartet, Du wirst das manuell tun müssen. Bitte konsultiere das Logfile." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:406 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:400 msgid "The update finished successfully, please restart OctoPrint now." msgstr "Die Aktualisierung wurde erfolgreich abgeschlossen, bitte starte OctoPrint jetzt neu." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:408 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:402 msgid "The update finished successfully, please reboot the server now." msgstr "Die Aktualisierung wurde erfolgreich abgeschlossen, bitte reboote den Server jetzt." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:412 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:406 msgid "Update successful, restart required!" msgstr "Aktualisierung erfolgreich, Neustart notwendig!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:425 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:419 msgid "Restarting OctoPrint failed, please restart it manually. You might also want to consult the log file on what went wrong here." msgstr "Der Neustart von OctoPrint ist fehlgeschlagen, bitte starte es manuell neu. Du solltest das Logfile konsultieren, um herauszufinden, was hier schief gelaufen ist." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:427 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:421 msgid "Rebooting the server failed, please reboot it manually. You might also want to consult the log file on what went wrong here." msgstr "Reboot des Servers fehlgeschlagen, bitte reboote ihn manuell. Du solltest auch das Logfile konsultieren, um herauszufinden, was hier gerade schief gelaufen ist." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:445 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:439 msgid "Update successful!" msgstr "Aktualisierung erfolgreich!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:446 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:440 msgid "The update finished successfully." msgstr "Die Aktualisierung wurde erfolgreich abgeschlossen." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:458 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:452 msgid "Update failed!" msgstr "Aktualisierung fehlgeschlagen!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:459 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:453 msgid "The update did not finish successfully. Please consult the log for details." msgstr "Die Aktualisierung wurde nicht erfolgreich abgeschlossen. Bitte konsultiere das Log für Details." @@ -645,11 +746,6 @@ msgid "" "

\n" msgstr "

Du nutzt eine unveröffentlichte Version von OctoPrint, trackst aber OctoPrint Releases.

Du willst vermutlich, dass OctoPrint stattdessen die entsprechende Entwicklungsversion trackt. Falls Du dein lokales OctoPrint-Checkoutverzeichnis auf einen anderen Branch gewechselt hast, dann wechsle das Tracking einfach auf \"Commit\". Ansonsten wirf einen Blick in die Dokumentation.

" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:20 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:72 -msgid "Plugin Configuration" -msgstr "Pluginkonfiguration" - #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:23 msgid "Current versions" msgstr "Aktuelle Versionen" @@ -694,120 +790,107 @@ msgstr "Versionstracking für OctoPrint" msgid "Version cache TTL" msgstr "TTL des Versionscaches" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:100 -#: src/octoprint/templates/dialogs/confirmation.jinja2:11 -#: src/octoprint/templates/dialogs/settings.jinja2:51 -#: src/octoprint/templates/dialogs/slicing.jinja2:50 -#: src/octoprint/templates/sidebar/state.jinja2:19 -msgid "Cancel" -msgstr "Abbruch" - -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101 -#: src/octoprint/templates/dialogs/settings.jinja2:52 -msgid "Save" -msgstr "Speichern" - -#: src/octoprint/server/views.py:58 +#: src/octoprint/server/views.py:64 msgid "Plugins" msgstr "Plugins" -#: src/octoprint/server/views.py:115 +#: src/octoprint/server/views.py:121 msgid "Connection" msgstr "Verbindung" -#: src/octoprint/server/views.py:116 +#: src/octoprint/server/views.py:122 msgid "State" msgstr "Status" -#: src/octoprint/server/views.py:117 +#: src/octoprint/server/views.py:123 msgid "Files" msgstr "Dateien" -#: src/octoprint/server/views.py:123 +#: src/octoprint/server/views.py:129 msgid "Temperature" msgstr "Temperatur" -#: src/octoprint/server/views.py:124 +#: src/octoprint/server/views.py:130 msgid "Control" msgstr "Steuerung" -#: src/octoprint/server/views.py:125 +#: src/octoprint/server/views.py:131 msgid "Terminal" msgstr "Terminal" -#: src/octoprint/server/views.py:128 +#: src/octoprint/server/views.py:134 msgid "GCode Viewer" msgstr "GCode Viewer" -#: src/octoprint/server/views.py:130 +#: src/octoprint/server/views.py:136 #: src/octoprint/templates/sidebar/state.jinja2:3 msgid "Timelapse" msgstr "Zeitraffer" -#: src/octoprint/server/views.py:135 +#: src/octoprint/server/views.py:141 msgid "Printer" msgstr "Drucker" -#: src/octoprint/server/views.py:137 +#: src/octoprint/server/views.py:143 msgid "Serial Connection" msgstr "Serielle Verbindung" -#: src/octoprint/server/views.py:138 +#: src/octoprint/server/views.py:144 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:1 msgid "Printer Profiles" msgstr "Druckerprofile" -#: src/octoprint/server/views.py:139 +#: src/octoprint/server/views.py:145 msgid "Temperatures" msgstr "Temperaturen" -#: src/octoprint/server/views.py:140 +#: src/octoprint/server/views.py:146 msgid "Terminal Filters" msgstr "Terminalfilter" -#: src/octoprint/server/views.py:141 +#: src/octoprint/server/views.py:147 msgid "GCODE Scripts" msgstr "GCODE Scripts" -#: src/octoprint/server/views.py:143 src/octoprint/server/views.py:145 +#: src/octoprint/server/views.py:149 src/octoprint/server/views.py:151 msgid "Features" msgstr "Funktionen" -#: src/octoprint/server/views.py:146 +#: src/octoprint/server/views.py:152 msgid "Webcam" msgstr "Webcam" -#: src/octoprint/server/views.py:147 +#: src/octoprint/server/views.py:153 msgid "API" msgstr "API" -#: src/octoprint/server/views.py:151 +#: src/octoprint/server/views.py:157 #: src/octoprint/templates/dialogs/settings/folders.jinja2:2 msgid "Folders" msgstr "Verzeichnisse" -#: src/octoprint/server/views.py:152 +#: src/octoprint/server/views.py:158 msgid "Appearance" msgstr "Aussehen" -#: src/octoprint/server/views.py:153 +#: src/octoprint/server/views.py:159 #: src/octoprint/templates/dialogs/settings/logs.jinja2:2 msgid "Logs" msgstr "Logs" -#: src/octoprint/server/views.py:154 +#: src/octoprint/server/views.py:160 msgid "Server" msgstr "Server" -#: src/octoprint/server/views.py:157 +#: src/octoprint/server/views.py:163 msgid "Access Control" msgstr "Zugangsbeschränkung" -#: src/octoprint/server/views.py:163 +#: src/octoprint/server/views.py:169 msgid "Access" msgstr "Zugriff" -#: src/octoprint/server/views.py:164 +#: src/octoprint/server/views.py:170 msgid "Interface" msgstr "Interface" @@ -827,69 +910,92 @@ msgid "The server appears to be offline, at least I'm not getting any response f msgstr "Der Server scheint offline zu sein, zumindest kann ich mich nicht mit ihm verbinden. Ich konnte mich nicht automatisch neu verbinden, aber Du kannst mittels des folgenden Buttons einen manuellen Verbindungsversuch anstoßen." #: src/octoprint/static/js/app/dataupdater.js:169 -#: src/octoprint/static/js/app/dataupdater.js:197 +#: src/octoprint/static/js/app/dataupdater.js:222 #, python-format msgid "Slicing ... (%(percentage)d%%)" msgstr "Slice ... (%(percentage)d%%)" -#: src/octoprint/static/js/app/dataupdater.js:186 +#: src/octoprint/static/js/app/dataupdater.js:187 msgid "Rendering timelapse" msgstr "Zeitrafferaufnahme wird gerendert" -#: src/octoprint/static/js/app/dataupdater.js:186 +#: src/octoprint/static/js/app/dataupdater.js:187 #, python-format msgid "Now rendering timelapse %(movie_basename)s" msgstr "Rendere Zeitrafferaufnahme %(movie_basename)s" -#: src/octoprint/static/js/app/dataupdater.js:188 +#: src/octoprint/static/js/app/dataupdater.js:189 msgid "Timelapse ready" msgstr "Zeitrafferaufnahme fertig" -#: src/octoprint/static/js/app/dataupdater.js:188 +#: src/octoprint/static/js/app/dataupdater.js:189 #, python-format msgid "New timelapse %(movie_basename)s is done rendering." msgstr "Neue Zeitrafferaufnahme %(movie_basename)s wurde fertig gerendert" -#: src/octoprint/static/js/app/dataupdater.js:190 +#: src/octoprint/static/js/app/dataupdater.js:191 #, python-format msgid "Rendering of timelapse %(movie_basename)s failed with return code %(returncode)s" msgstr "Rendering der Zeitrafferaufnahme %(movie_basename)s fehlgeschlagen mit Returncode %(returncode)s" -#: src/octoprint/static/js/app/dataupdater.js:192 +#: src/octoprint/static/js/app/dataupdater.js:194 msgid "Rendering failed" msgstr "Rendering fehlgeschlagen" -#: src/octoprint/static/js/app/dataupdater.js:199 +#: src/octoprint/static/js/app/dataupdater.js:200 +msgid "Capturing timelapse postroll" +msgstr "Zeichne Timelapse-Postroll auf" + +#: src/octoprint/static/js/app/dataupdater.js:204 +msgid "Now capturing timelapse post roll, this will take only a moment..." +msgstr "Zeichne jetzt Timelapse-Postroll auf, dies wird nur einen Moment dauern..." + +#: src/octoprint/static/js/app/dataupdater.js:207 +#, python-format +msgid "%(minutes)d min" +msgstr "%(minutes)d Min" + +#: src/octoprint/static/js/app/dataupdater.js:209 +#, python-format +msgid "%(seconds)d sec" +msgstr "%(seconds) Sek" + +#: src/octoprint/static/js/app/dataupdater.js:211 +#, python-format +msgid "Now capturing timelapse post roll, this will take approximately %(duration)s..." +msgstr "Zeichne jetzt Timelapse-Postroll auf, dies wird voraussichtlich %(duration)s dauern..." + +#: src/octoprint/static/js/app/dataupdater.js:224 msgid "Slicing ..." msgstr "Slice ..." -#: src/octoprint/static/js/app/dataupdater.js:205 +#: src/octoprint/static/js/app/dataupdater.js:230 msgid "Slicing done" msgstr "Slicing abgeschlossen" -#: src/octoprint/static/js/app/dataupdater.js:205 +#: src/octoprint/static/js/app/dataupdater.js:230 #, python-format msgid "Sliced %(stl)s to %(gcode)s, took %(time).2f seconds" msgstr "%(stl)s nach %(gcode)s geslicet, dauerte %(time).2f Sekunden" -#: src/octoprint/static/js/app/dataupdater.js:215 +#: src/octoprint/static/js/app/dataupdater.js:240 #, python-format msgid "Could not slice %(stl)s to %(gcode)s: %(reason)s" msgstr "Konnte %(stl)s nicht nach %(gcode)s slicen: %(reason)s" -#: src/octoprint/static/js/app/dataupdater.js:216 +#: src/octoprint/static/js/app/dataupdater.js:241 msgid "Slicing failed" msgstr "Slicing fehlgeschlagen" -#: src/octoprint/static/js/app/dataupdater.js:220 +#: src/octoprint/static/js/app/dataupdater.js:245 msgid "Streaming ..." msgstr "Streaming ..." -#: src/octoprint/static/js/app/dataupdater.js:226 +#: src/octoprint/static/js/app/dataupdater.js:251 msgid "Streaming done" msgstr "Streaming abgeschlossen" -#: src/octoprint/static/js/app/dataupdater.js:227 +#: src/octoprint/static/js/app/dataupdater.js:252 #, python-format msgid "Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds" msgstr "%(local)s nach %(remote)s gestreamt, dauerte %(time).2f Sekunden" @@ -908,51 +1014,51 @@ msgstr "DD.MM.YYYY HH:mm" msgid "off" msgstr "Aus" -#: src/octoprint/static/js/app/main.js:46 +#: src/octoprint/static/js/app/main.js:129 msgid "Offline" msgstr "Offline" -#: src/octoprint/static/js/app/main.js:47 +#: src/octoprint/static/js/app/main.js:130 msgid "Opening serial port" msgstr "Öffnet Serialport" -#: src/octoprint/static/js/app/main.js:48 +#: src/octoprint/static/js/app/main.js:131 msgid "Detecting serial port" msgstr "Detektiere Serialport" -#: src/octoprint/static/js/app/main.js:49 +#: src/octoprint/static/js/app/main.js:132 msgid "Detecting baudrate" msgstr "Detektiere Baudrate" -#: src/octoprint/static/js/app/main.js:50 +#: src/octoprint/static/js/app/main.js:133 msgid "Connecting" msgstr "Verbinde" -#: src/octoprint/static/js/app/main.js:51 +#: src/octoprint/static/js/app/main.js:134 msgid "Operational" msgstr "Bereit" -#: src/octoprint/static/js/app/main.js:52 +#: src/octoprint/static/js/app/main.js:135 msgid "Printing from SD" msgstr "Drucke von SD" -#: src/octoprint/static/js/app/main.js:53 +#: src/octoprint/static/js/app/main.js:136 msgid "Sending file to SD" msgstr "Sende Datei zu SD" -#: src/octoprint/static/js/app/main.js:54 +#: src/octoprint/static/js/app/main.js:137 msgid "Printing" msgstr "Drucke" -#: src/octoprint/static/js/app/main.js:55 +#: src/octoprint/static/js/app/main.js:138 msgid "Paused" msgstr "Pausiert" -#: src/octoprint/static/js/app/main.js:56 +#: src/octoprint/static/js/app/main.js:139 msgid "Closed" msgstr "Geschlossen" -#: src/octoprint/static/js/app/main.js:57 +#: src/octoprint/static/js/app/main.js:140 msgid "Transfering file to SD" msgstr "Sende Datei zu SD" @@ -965,15 +1071,15 @@ msgstr "Verbinden" msgid "Disconnect" msgstr "Trennen" -#: src/octoprint/static/js/app/viewmodels/control.js:60 +#: src/octoprint/static/js/app/viewmodels/control.js:64 #: src/octoprint/static/js/app/viewmodels/files.js:330 -#: src/octoprint/static/js/app/viewmodels/gcode.js:453 +#: src/octoprint/static/js/app/viewmodels/gcode.js:467 #: src/octoprint/static/js/app/viewmodels/printerstate.js:167 #: src/octoprint/static/js/app/viewmodels/temperature.js:58 msgid "Tool" msgstr "Werkzeug" -#: src/octoprint/static/js/app/viewmodels/control.js:67 +#: src/octoprint/static/js/app/viewmodels/control.js:71 #: src/octoprint/static/js/app/viewmodels/temperature.js:70 msgid "Hotend" msgstr "Hotend" @@ -1023,60 +1129,60 @@ msgstr "Speichere ..." msgid "If you disable Access Control and your OctoPrint installation is accessible from the internet, your printer will be accessible by everyone - that also includes the bad guys!" msgstr "Wenn Du die Zugangsbeschränkung deaktivierst und Deine OctoPrint Installation vom Internet aus erreichbar ist, kann jeder auf Deinen Drucker zugreifen - auch die bösen Jungs!" -#: src/octoprint/static/js/app/viewmodels/gcode.js:14 +#: src/octoprint/static/js/app/viewmodels/gcode.js:18 msgid "Loading..." msgstr "Lade..." -#: src/octoprint/static/js/app/viewmodels/gcode.js:18 +#: src/octoprint/static/js/app/viewmodels/gcode.js:22 msgid "Analyzing..." msgstr "Analysiere..." -#: src/octoprint/static/js/app/viewmodels/gcode.js:22 +#: src/octoprint/static/js/app/viewmodels/gcode.js:26 msgid "Analyzed" msgstr "Analysiert" -#: src/octoprint/static/js/app/viewmodels/gcode.js:420 +#: src/octoprint/static/js/app/viewmodels/gcode.js:434 msgid "Model size" msgstr "Modelgröße" -#: src/octoprint/static/js/app/viewmodels/gcode.js:421 +#: src/octoprint/static/js/app/viewmodels/gcode.js:435 msgid "Estimated layer height" msgstr "Geschätzte Schichthöhe" -#: src/octoprint/static/js/app/viewmodels/gcode.js:421 +#: src/octoprint/static/js/app/viewmodels/gcode.js:435 msgid "mm" msgstr "mm" -#: src/octoprint/static/js/app/viewmodels/gcode.js:422 +#: src/octoprint/static/js/app/viewmodels/gcode.js:436 msgid "Layer count" msgstr "Schichtanzahl" -#: src/octoprint/static/js/app/viewmodels/gcode.js:422 +#: src/octoprint/static/js/app/viewmodels/gcode.js:436 msgid "printed" msgstr "gedruckt" -#: src/octoprint/static/js/app/viewmodels/gcode.js:422 +#: src/octoprint/static/js/app/viewmodels/gcode.js:436 msgid "visited" msgstr "besucht" -#: src/octoprint/static/js/app/viewmodels/gcode.js:445 +#: src/octoprint/static/js/app/viewmodels/gcode.js:459 msgid "Layer number" msgstr "Schichtnummer" -#: src/octoprint/static/js/app/viewmodels/gcode.js:446 +#: src/octoprint/static/js/app/viewmodels/gcode.js:460 msgid "Layer height" msgstr "Schichthöhe" -#: src/octoprint/static/js/app/viewmodels/gcode.js:447 +#: src/octoprint/static/js/app/viewmodels/gcode.js:461 msgid "GCODE commands in layer" msgstr "GCODE Befehle in Schicht" -#: src/octoprint/static/js/app/viewmodels/gcode.js:450 -#: src/octoprint/static/js/app/viewmodels/gcode.js:453 +#: src/octoprint/static/js/app/viewmodels/gcode.js:464 +#: src/octoprint/static/js/app/viewmodels/gcode.js:467 msgid "Filament used by layer" msgstr "Genutztes Filament in Schicht" -#: src/octoprint/static/js/app/viewmodels/gcode.js:457 +#: src/octoprint/static/js/app/viewmodels/gcode.js:471 msgid "Print time for layer" msgstr "Druckdauer für Schicht" @@ -1244,18 +1350,18 @@ msgid "Pause" msgstr "Pause" #: src/octoprint/static/js/app/viewmodels/printerstate.js:96 -#: src/octoprint/templates/tabs/timelapse.jinja2:10 +#: src/octoprint/templates/tabs/timelapse.jinja2:11 msgid "On Z Change" msgstr "Bei Ebenenwechsel" #: src/octoprint/static/js/app/viewmodels/printerstate.js:98 -#: src/octoprint/templates/tabs/timelapse.jinja2:11 +#: src/octoprint/templates/tabs/timelapse.jinja2:10 msgid "Timed" msgstr "Nach Zeit" #: src/octoprint/static/js/app/viewmodels/printerstate.js:98 -#: src/octoprint/templates/tabs/timelapse.jinja2:24 -#: src/octoprint/templates/tabs/timelapse.jinja2:31 +#: src/octoprint/templates/tabs/timelapse.jinja2:25 +#: src/octoprint/templates/tabs/timelapse.jinja2:32 msgid "sec" msgstr "Sek" @@ -1295,39 +1401,49 @@ msgid "Slicing %(filename)s" msgstr "Slice %(filename)s" #: src/octoprint/static/js/app/viewmodels/temperature.js:23 -#: src/octoprint/static/js/app/viewmodels/temperature.js:76 +#: src/octoprint/static/js/app/viewmodels/temperature.js:78 #: src/octoprint/templates/dialogs/settings/temperatures.jinja2:16 msgid "Bed" msgstr "Bett" -#: src/octoprint/static/js/app/viewmodels/temperature.js:115 +#: src/octoprint/static/js/app/viewmodels/temperature.js:121 msgid "just now" msgstr "gerade eben" -#: src/octoprint/static/js/app/viewmodels/temperature.js:117 +#: src/octoprint/static/js/app/viewmodels/temperature.js:123 msgid "min" msgstr "Min" -#: src/octoprint/static/js/app/viewmodels/temperature.js:263 +#: src/octoprint/static/js/app/viewmodels/temperature.js:264 #: src/octoprint/templates/tabs/temperature.jinja2:11 msgid "Actual" msgstr "Ist" -#: src/octoprint/static/js/app/viewmodels/temperature.js:268 +#: src/octoprint/static/js/app/viewmodels/temperature.js:269 #: src/octoprint/templates/tabs/temperature.jinja2:12 msgid "Target" msgstr "Soll" -#: src/octoprint/static/js/app/viewmodels/terminal.js:59 +#: src/octoprint/static/js/app/viewmodels/terminal.js:61 #, python-format -msgid "showing %(displayed)d lines" -msgstr "zeige %(displayed)d Zeilen" +msgid "showing %(displayed)d lines (%(filtered)d of %(total)d total lines filtered, buffer full)" +msgstr "zeige %(displayed)d Zeilen (%(filtered)d von %(total)d Zeilen gefiltert, Buffer voll)" -#: src/octoprint/static/js/app/viewmodels/terminal.js:61 +#: src/octoprint/static/js/app/viewmodels/terminal.js:63 #, python-format msgid "showing %(displayed)d lines (%(filtered)d of %(total)d total lines filtered)" msgstr "zeige %(displayed)d Zeilen (%(filtered)d von %(total)d Zeilen gefiltert)" +#: src/octoprint/static/js/app/viewmodels/terminal.js:67 +#, python-format +msgid "showing %(displayed)d lines (buffer full)" +msgstr "zeige %(displayed)d Zeilen (Buffer voll)" + +#: src/octoprint/static/js/app/viewmodels/terminal.js:69 +#, python-format +msgid "showing %(displayed)d lines" +msgstr "zeige %(displayed)d Zeilen" + #: src/octoprint/static/js/app/viewmodels/usersettings.js:10 msgid "Site default" msgstr "Seitenvoreinstellung" @@ -1521,7 +1637,7 @@ msgstr "Admin" #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:7 #: src/octoprint/templates/dialogs/settings/logs.jinja2:15 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:7 -#: src/octoprint/templates/tabs/timelapse.jinja2:56 +#: src/octoprint/templates/tabs/timelapse.jinja2:57 msgid "Action" msgstr "Aktion" @@ -1797,8 +1913,8 @@ msgstr "Änderungsdatum" #: src/octoprint/templates/dialogs/settings/logs.jinja2:13 #: src/octoprint/templates/sidebar/files.jinja2:10 #: src/octoprint/templates/sidebar/files.jinja2:24 -#: src/octoprint/templates/tabs/timelapse.jinja2:49 -#: src/octoprint/templates/tabs/timelapse.jinja2:55 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 +#: src/octoprint/templates/tabs/timelapse.jinja2:56 msgid "Size" msgstr "Größe" @@ -2468,35 +2584,43 @@ msgstr "Zeitraffermodus" msgid "Do not use with spiralized (\"Joris\") vases or similar continuous Z models." msgstr "Nicht mit spiralisierten Vasen (\"Joris\") oder ähnlichen Modellen mit ständigen Z-Achsen-Änderungen verwenden." -#: src/octoprint/templates/tabs/timelapse.jinja2:15 +#: src/octoprint/templates/tabs/timelapse.jinja2:14 +msgid "Note" +msgstr "Bemerkung" + +#: src/octoprint/templates/tabs/timelapse.jinja2:14 +msgid "Does not work when printing from the printer's SD Card (no way to detect the change in Z reliably). Use \"Timed\" mode for those prints instead." +msgstr "Funktioniert nicht, wenn von der SD-Karte des Druckers gedruckt wird (keine Möglichkeit, Änderungen der Z-Achse zuverlässig zu detektieren). Verwende stattdessen den \"Nach Zeit\"-Modus für solche Drucke." + +#: src/octoprint/templates/tabs/timelapse.jinja2:16 msgid "Timelapse frame rate (in frames per second)" msgstr "Zeitrafferbildrate (in Bildern pro Sekunde)" -#: src/octoprint/templates/tabs/timelapse.jinja2:18 +#: src/octoprint/templates/tabs/timelapse.jinja2:19 msgid "fps" msgstr "FPS" -#: src/octoprint/templates/tabs/timelapse.jinja2:21 +#: src/octoprint/templates/tabs/timelapse.jinja2:22 msgid "Timelapse post roll (in rendered seconds)" msgstr "Zeitraffernachlauf (in gerenderten Sekunden)" -#: src/octoprint/templates/tabs/timelapse.jinja2:28 +#: src/octoprint/templates/tabs/timelapse.jinja2:29 msgid "Interval" msgstr "Intervall" -#: src/octoprint/templates/tabs/timelapse.jinja2:37 +#: src/octoprint/templates/tabs/timelapse.jinja2:38 msgid "Save as default" msgstr "Als Standard speichern" -#: src/octoprint/templates/tabs/timelapse.jinja2:42 +#: src/octoprint/templates/tabs/timelapse.jinja2:43 msgid "Save config" msgstr "Konfiguration speichern" -#: src/octoprint/templates/tabs/timelapse.jinja2:46 +#: src/octoprint/templates/tabs/timelapse.jinja2:47 msgid "Finished Timelapses" msgstr "Abgeschlossene Zeitraffer" -#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 msgid "Creation date" msgstr "Erstellungsdatum" @@ -2556,3 +2680,12 @@ msgstr "Erstellungsdatum" #~ msgid "Swallow the first \"ok\" after a resend response" #~ msgstr "Erstes \"ok\" nach Resend ignorieren" + +#~ msgid "CuraEngine" +#~ msgstr "CuraEngine" + +#~ msgid "Restart successful!" +#~ msgstr "Neustart erfolgreich!" + +#~ msgid "The server was restarted successfully. The page will now reload automatically." +#~ msgstr "Der Server wurde erfolgreich neu gestartet. Die Seite wird nun automatisch neu geladen." diff --git a/src/octoprint/util/__init__.py b/src/octoprint/util/__init__.py index bc4ddfd71..2174f4cf5 100644 --- a/src/octoprint/util/__init__.py +++ b/src/octoprint/util/__init__.py @@ -378,6 +378,14 @@ def dict_merge(a, b): Taken from https://www.xormedia.com/recursively-merge-dictionaries-in-python/ + Example:: + + >>> a = dict(foo="foo", bar="bar", fnord=dict(a=1)) + >>> b = dict(foo="other foo", fnord=dict(b=2, l=["some", "list"])) + >>> expected = dict(foo="other foo", bar="bar", fnord=dict(a=1, b=2, l=["some", "list"])) + >>> dict_merge(a, b) == expected + True + Arguments: a (dict): The dictionary to merge ``b`` into b (dict): The dictionary to merge into ``a`` @@ -399,14 +407,24 @@ def dict_merge(a, b): return result -def dict_clean(a, b): +def dict_sanitize(a, b): """ - Recursively deep-cleans ``b`` from ``a``, removing all keys and corresponding values from ``a`` that appear in - ``b``. + Recursively deep-sanitizes ``a`` based on ``b``, removing all keys (and + associated values) from ``a`` that do not appear in ``b``. + + Example:: + + >>> a = dict(foo="foo", bar="bar", fnord=dict(a=1, b=2, l=["some", "list"])) + >>> b = dict(foo=None, fnord=dict(a=None, b=None)) + >>> expected = dict(foo="foo", fnord=dict(a=1, b=2)) + >>> dict_sanitize(a, b) == expected + True + >>> dict_clean(a, b) == expected + True Arguments: - a (dict): The dictionary to clean from ``b``. - b (dict): The dictionary to clean ``b`` from. + a (dict): The dictionary to clean against ``b``. + b (dict): The dictionary containing the key structure to clean from ``a``. Results: dict: A new dict based on ``a`` with all keys (and corresponding values) found in ``b`` removed. @@ -421,21 +439,87 @@ def dict_clean(a, b): if not k in b: del result[k] elif isinstance(v, dict): - result[k] = dict_clean(v, b[k]) + result[k] = dict_sanitize(v, b[k]) else: result[k] = deepcopy(v) return result +dict_clean = deprecated("dict_clean has been renamed to dict_sanitize", + includedoc="Replaced by :func:`dict_sanitize`")(dict_sanitize) + + +def dict_minimal_mergediff(source, target): + """ + Recursively calculates the minimal dict that would be needed to be deep merged with + a in order to produce the same result as deep merging a and b. + + Example:: + + >>> a = dict(foo=dict(a=1, b=2), bar=dict(c=3, d=4)) + >>> b = dict(bar=dict(c=3, d=5), fnord=None) + >>> c = dict_minimal_mergediff(a, b) + >>> c == dict(bar=dict(d=5), fnord=None) + True + >>> dict_merge(a, c) == dict_merge(a, b) + True + + Arguments: + source (dict): Source dictionary + target (dict): Dictionary to compare to source dictionary and derive diff for + + Returns: + dict: The minimal dictionary to deep merge on ``source`` to get the same result + as deep merging ``target`` on ``source``. + """ + + if not isinstance(source, dict) or not isinstance(target, dict): + raise ValueError("source and target must be dictionaries") + + if source == target: + # shortcut: if both are equal, we return an empty dict as result + return dict() + + from copy import deepcopy + + all_keys = set(source.keys() + target.keys()) + result = dict() + for k in all_keys: + if k not in target: + # key not contained in target => not contained in result + continue + + if k in source: + # key is present in both dicts, we have to take a look at the value + value_source = source[k] + value_target = target[k] + + if value_source != value_target: + # we only need to look further if the values are not equal + + if isinstance(value_source, dict) and isinstance(value_target, dict): + # both are dicts => deeper down it goes into the rabbit hole + result[k] = dict_minimal_mergediff(value_source, value_target) + else: + # new b wins over old a + result[k] = deepcopy(value_target) + + else: + # key is new, add it + result[k] = deepcopy(target[k]) + return result -def dict_contains_keys(a, b): +def dict_contains_keys(keys, dictionary): """ - Recursively deep-checks if ``a`` contains all keys found in ``b``. + Recursively deep-checks if ``dictionary`` contains all keys found in ``keys``. Example:: - >>> dict_contains_keys(dict(foo="bar", fnord=dict(a=1, b=2, c=3)), dict(foo="some_other_bar", fnord=dict(b=100))) + >>> positive = dict(foo="some_other_bar", fnord=dict(b=100)) + >>> negative = dict(foo="some_other_bar", fnord=dict(b=100, d=20)) + >>> dictionary = dict(foo="bar", fnord=dict(a=1, b=2, c=3)) + >>> dict_contains_keys(positive, dictionary) True - >>> dict_contains_keys(dict(foo="bar", fnord=dict(a=1, b=2, c=3)), dict(foo="some_other_bar", fnord=dict(b=100, d=20))) + >>> dict_contains_keys(negative, dictionary) False Arguments: @@ -446,14 +530,14 @@ def dict_contains_keys(a, b): boolean: True if all keys found in ``b`` are also present in ``a``, False otherwise. """ - if not isinstance(a, dict) or not isinstance(b, dict): + if not isinstance(keys, dict) or not isinstance(dictionary, dict): return False - for k, v in a.iteritems(): - if not k in b: + for k, v in keys.iteritems(): + if not k in dictionary: return False elif isinstance(v, dict): - if not dict_contains_keys(v, b[k]): + if not dict_contains_keys(v, dictionary[k]): return False return True @@ -500,8 +584,10 @@ def address_for_client(host, port): @contextlib.contextmanager def atomic_write(filename, mode="w+b", prefix="tmp", suffix=""): temp_config = tempfile.NamedTemporaryFile(mode=mode, prefix=prefix, suffix=suffix, delete=False) - yield temp_config - temp_config.close() + try: + yield temp_config + finally: + temp_config.close() shutil.move(temp_config.name, filename) @@ -525,7 +611,32 @@ def bom_aware_open(filename, encoding="ascii", mode="r", **kwargs): if header.startswith(bom): encoding += "-sig" - return codecs.open(filename, encoding=encoding, **kwargs) + return codecs.open(filename, encoding=encoding, mode=mode, **kwargs) + + +def is_hidden_path(path): + if path is None: + # we define a None path as not hidden here + return False + + filename = os.path.basename(path) + if filename.startswith("."): + # filenames starting with a . are hidden + return True + + if sys.platform == "win32": + # if we are running on windows we also try to read the hidden file + # attribute via the windows api + try: + import ctypes + attrs = ctypes.windll.kernel32.GetFileAttributesW(unicode(path)) + assert attrs != -1 # INVALID_FILE_ATTRIBUTES == -1 + return bool(attrs & 2) # FILE_ATTRIBUTE_HIDDEN == 2 + except (AttributeError, AssertionError): + pass + + # if we reach that point, the path is not hidden + return False class RepeatedTimer(threading.Thread): diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index 9bc2c7024..cf4b5d54e 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -262,6 +262,7 @@ def __init__(self, port = None, baudrate=None, callbackObject=None, printerProfi self._serial_factory_hooks = self._pluginManager.get_hooks("octoprint.comm.transport.serial.factory") # SD status data + self._sdEnabled = settings().getBoolean(["feature", "sdSupport"]) self._sdAvailable = False self._sdFileList = False self._sdFiles = [] @@ -719,21 +720,28 @@ def getSdFiles(self): return self._sdFiles def startSdFileTransfer(self, filename): - if not self.isOperational() or self.isBusy(): + if not self._sdEnabled: return + if not self.isOperational() or self.isBusy(): + return self._changeState(self.STATE_TRANSFERING_FILE) self.sendCommand("M28 %s" % filename.lower()) def endSdFileTransfer(self, filename): - if not self.isOperational() or self.isBusy(): + if not self._sdEnabled: return + if not self.isOperational() or self.isBusy(): + return self.sendCommand("M29 %s" % filename.lower()) self._changeState(self.STATE_OPERATIONAL) self.refreshSdFiles() def deleteSdFile(self, filename): + if not self._sdEnabled: + return + if not self.isOperational() or (self.isBusy() and isinstance(self._currentFile, PrintingSdFileInformation) and self._currentFile.getFilename() == filename): @@ -744,13 +752,21 @@ def deleteSdFile(self, filename): self.refreshSdFiles() def refreshSdFiles(self): + if not self._sdEnabled: + return + if not self.isOperational() or self.isBusy(): return + self.sendCommand("M20") def initSdCard(self): + if not self._sdEnabled: + return + if not self.isOperational(): return + self.sendCommand("M21") if settings().getBoolean(["feature", "sdAlwaysAvailable"]): self._sdAvailable = True @@ -758,6 +774,9 @@ def initSdCard(self): self._callback.on_comm_sd_state_change(self._sdAvailable) def releaseSdCard(self): + if not self._sdEnabled: + return + if not self.isOperational() or (self.isBusy() and self.isSdFileSelected()): # do not release the sd card if we are currently printing from it return @@ -1314,6 +1333,11 @@ def default(_, port, baudrate, read_timeout): return False def _handleErrors(self, line): + if line is None: + return + + lower_line = line.lower() + # No matter the state, if we see an error, goto the error state and store the error for reference. if line.startswith('Error:') or line.startswith('!!'): #Oh YEAH, consistency. @@ -1323,14 +1347,18 @@ def _handleErrors(self, line): if regex_minMaxError.match(line): line = line.rstrip() + self._readline() - if 'line number' in line.lower() or 'checksum' in line.lower() or 'format error' in line.lower() or 'expected line' in line.lower(): + if 'line number' in lower_line or 'checksum' in lower_line or 'format error' in lower_line or 'expected line' in lower_line: #Skip the communication errors, as those get corrected. self._lastCommError = line[6:] if line.startswith("Error:") else line[2:] pass - elif 'volume.init' in line.lower() or "openroot" in line.lower() or 'workdir' in line.lower()\ - or "error writing to file" in line.lower(): + elif 'volume.init' in lower_line or "openroot" in lower_line or 'workdir' in lower_line\ + or "error writing to file" in lower_line or "cannot open" in lower_line\ + or "cannot enter" in lower_line: #Also skip errors with the SD card pass + elif 'unknown command' in lower_line: + #Ignore unkown command errors, it could be a typo or some missing feature + pass elif not self.isError(): self._errorValue = line[6:] if line.startswith("Error:") else line[2:] self._changeState(self.STATE_ERROR) @@ -1701,6 +1729,18 @@ def _gcode_M0_queuing(self, cmd, cmd_type=None): return None, # Don't send the M0 or M1 to the machine, as M0 and M1 are handled as an LCD menu pause. _gcode_M1_queuing = _gcode_M0_queuing + def _gcode_M25_queuing(self, cmd, cmd_type=None): + # M25 while not printing from SD will be handled as pause. This way it can be used as another marker + # for GCODE induced pausing. Send it to the printer anyway though. + if self.isPrinting() and not self.isSdPrinting(): + self.setPause(True) + + def _gcode_M140_queuing(self, cmd, cmd_type=None): + if not self._printerProfileManager.get_current_or_default()["heatedBed"]: + self._log("Warn: Not sending \"{}\", printer profile has no heated bed".format(cmd)) + return None, # Don't send bed commands if we don't have a heated bed + _gcode_M190_queuing = _gcode_M140_queuing + def _gcode_M104_sent(self, cmd, cmd_type=None): toolNum = self._currentTool toolMatch = regexes_parameters["intT"].search(cmd) @@ -1774,7 +1814,8 @@ def _gcode_M112_queuing(self, cmd, cmd_type=None): # are going to shutdown the connection in a second anyhow. for tool in range(self._printerProfileManager.get_current_or_default()["extruder"]["count"]): self._doIncrementAndSendWithChecksum("M104 T{tool} S0".format(tool=tool)) - self._doIncrementAndSendWithChecksum("M140 S0") + if self._printerProfileManager.get_current_or_default()["heatedBed"]: + self._doIncrementAndSendWithChecksum("M140 S0") # close to reset host state self._errorValue = "Closing serial port due to emergency stop M112." diff --git a/src/octoprint/util/jinja.py b/src/octoprint/util/jinja.py new file mode 100644 index 000000000..bf3f8b305 --- /dev/null +++ b/src/octoprint/util/jinja.py @@ -0,0 +1,50 @@ +# coding=utf-8 +from __future__ import absolute_import + +__license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' +__copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms of the AGPLv3 License" + +import os + +from jinja2.loaders import FileSystemLoader, TemplateNotFound, split_template_path + +class FilteredFileSystemLoader(FileSystemLoader): + """ + Jinja2 ``FileSystemLoader`` subclass that allows filtering templates. + + Only such templates will be accessible for whose paths the provided + ``path_filter`` filter function returns True. + + ``path_filter`` will receive the actual path on disc and should behave just + like callables provided to Python's internal ``filter`` function, returning + ``True`` if the path is cleared and ``False`` if it is supposed to be removed + from results and hence ``filter(path_filter, iterable)`` should be + equivalent to ``[item for item in iterable if path_filter(item)]``. + + If ``path_filter`` is not set or not a ``callable``, the loader will + behave just like the regular Jinja2 ``FileSystemLoader``. + """ + def __init__(self, searchpath, path_filter=None, **kwargs): + FileSystemLoader.__init__(self, searchpath, **kwargs) + self.path_filter = path_filter + + def get_source(self, environment, template): + if callable(self.path_filter): + pieces = split_template_path(template) + if not self._combined_filter(os.path.join(*pieces)): + raise TemplateNotFound(template) + + return FileSystemLoader.get_source(self, environment, template) + + def list_templates(self): + result = FileSystemLoader.list_templates(self) + + if callable(self.path_filter): + result = sorted(filter(self._combined_filter, result)) + + return result + + def _combined_filter(self, path): + filter_results = map(lambda x: not os.path.exists(os.path.join(x, path)) or self.path_filter(os.path.join(x, path)), + self.searchpath) + return all(filter_results) diff --git a/tests/plugin/test_types_blueprint.py b/tests/plugin/test_types_blueprint.py new file mode 100644 index 000000000..17df406c3 --- /dev/null +++ b/tests/plugin/test_types_blueprint.py @@ -0,0 +1,139 @@ +import unittest +import mock + +import octoprint.plugin + +class BlueprintPluginTest(unittest.TestCase): + + def setUp(self): + self.basefolder = "/some/funny/basefolder" + + self.plugin = octoprint.plugin.BlueprintPlugin() + self.plugin._basefolder = self.basefolder + + class MyAssetPlugin(octoprint.plugin.BlueprintPlugin, octoprint.plugin.AssetPlugin): + def get_asset_folder(self): + return "/some/asset/folder" + + class MyTemplatePlugin(octoprint.plugin.BlueprintPlugin, octoprint.plugin.TemplatePlugin): + def get_template_folder(self): + return "/some/template/folder" + + self.assetplugin = MyAssetPlugin() + self.assetplugin._basefolder = self.basefolder + + self.templateplugin = MyTemplatePlugin() + self.templateplugin._basefolder = self.basefolder + + def test_route(self): + + def test_method(): + pass + + octoprint.plugin.BlueprintPlugin.route("/test/method", methods=["GET"])(test_method) + octoprint.plugin.BlueprintPlugin.route("/test/method/{foo}", methods=["PUT"])(test_method) + + self.assertTrue(hasattr(test_method, "_blueprint_rules")) + self.assertTrue("test_method" in test_method._blueprint_rules) + self.assertTrue(len(test_method._blueprint_rules["test_method"]) == 2) + self.assertListEqual(test_method._blueprint_rules["test_method"], [ + ("/test/method", dict(methods=["GET"])), + ("/test/method/{foo}", dict(methods=["PUT"])) + ]) + + def test_errorhandler(self): + + def test_method(): + pass + + octoprint.plugin.BlueprintPlugin.errorhandler(404)(test_method) + + self.assertTrue(hasattr(test_method, "_blueprint_error_handler")) + self.assertTrue("test_method" in test_method._blueprint_error_handler) + self.assertTrue(len(test_method._blueprint_error_handler["test_method"]) == 1) + self.assertListEqual(test_method._blueprint_error_handler["test_method"], [ + 404 + ]) + + def test_get_blueprint_kwargs(self): + import os + expected = dict( + static_folder=os.path.join(self.basefolder, "static"), + template_folder=os.path.join(self.basefolder, "templates") + ) + + result = self.plugin.get_blueprint_kwargs() + + self.assertEquals(result, expected) + + def test_get_blueprint_kwargs_assetplugin(self): + import os + expected = dict( + static_folder=self.assetplugin.get_asset_folder(), + template_folder=os.path.join(self.basefolder, "templates") + ) + + result = self.assetplugin.get_blueprint_kwargs() + + self.assertEquals(result, expected) + + def test_get_blueprint_kwargs_templateplugin(self): + import os + expected = dict( + static_folder=os.path.join(self.basefolder, "static"), + template_folder=self.templateplugin.get_template_folder() + ) + + result = self.templateplugin.get_blueprint_kwargs() + + self.assertEquals(result, expected) + + def test_get_blueprint(self): + import os + expected_kwargs = dict( + static_folder=os.path.join(self.basefolder, "static"), + template_folder=os.path.join(self.basefolder, "templates") + ) + + class MyPlugin(octoprint.plugin.BlueprintPlugin): + + @octoprint.plugin.BlueprintPlugin.route("/some/path", methods=["GET"]) + def route_method(self): + pass + + @octoprint.plugin.BlueprintPlugin.errorhandler(404) + def errorhandler_method(self): + pass + + @octoprint.plugin.BlueprintPlugin.route("/hidden/path", methods=["GET"]) + def _hidden_method(self): + pass + + plugin = MyPlugin() + plugin._basefolder = self.basefolder + plugin._identifier = "myplugin" + + with mock.patch("flask.Blueprint") as MockBlueprint: + blueprint = mock.MagicMock() + MockBlueprint.return_value = blueprint + + errorhandler = mock.MagicMock() + blueprint.errorhandler.return_value = errorhandler + + result = plugin.get_blueprint() + + self.assertEquals(result, blueprint) + + MockBlueprint.assert_called_once_with("plugin.myplugin", "myplugin", **expected_kwargs) + blueprint.add_url_rule.assert_called_once_with("/some/path", "route_method", view_func=plugin.route_method, methods=["GET"]) + + blueprint.errorhandler.assert_called_once_with(404) + errorhandler.assert_called_once_with(plugin.errorhandler_method) + + def test_get_blueprint_cached(self): + blueprint = mock.MagicMock() + self.plugin._blueprint = blueprint + + result = self.plugin.get_blueprint() + + self.assertEquals(blueprint, result) diff --git a/tests/plugin/test_types_settings.py b/tests/plugin/test_types_settings.py new file mode 100644 index 000000000..31a53df7b --- /dev/null +++ b/tests/plugin/test_types_settings.py @@ -0,0 +1,313 @@ +import unittest +import mock + +import octoprint.plugin + +class TestSettingsPlugin(unittest.TestCase): + + def setUp(self): + self.settings = mock.MagicMock() + + self.plugin = octoprint.plugin.SettingsPlugin() + self.plugin._settings = self.settings + + def test_on_settings_cleanup(self): + """Tests that after cleanup only minimal config is left in storage.""" + + ### setup + + # settings defaults + defaults = dict( + foo=dict( + a=1, + b=2, + l1=["some", "list"], + l2=["another", "list"] + ), + bar=True, + fnord=None + ) + self.plugin.get_settings_defaults = mock.MagicMock() + self.plugin.get_settings_defaults.return_value = defaults + + # stored config, containing one redundant entry (bar=True, same as default) + in_config = dict( + foo=dict( + l1=["some", "other", "list"], + l2=["another", "list"], + l3=["a", "third", "list"] + ), + bar=True, + fnord=dict( + c=3, + d=4 + ) + ) + self.settings.get_all_data.return_value = in_config + + ### execute + + self.plugin.on_settings_cleanup() + + ### assert + + # minimal config (current without redundant value) should have been set + expected = dict( + foo=dict( + l1=["some", "other", "list"], + l3=["a", "third", "list"] + ), + fnord=dict( + c=3, + d=4 + ) + ) + self.settings.set.assert_called_once_with([], expected) + + def test_on_settings_cleanup_configversion(self): + """Tests that set config version is always left stored.""" + + ### setup + + defaults = dict( + foo="fnord" + ) + self.plugin.get_settings_defaults = mock.MagicMock() + self.plugin.get_settings_defaults.return_value = defaults + + in_config = dict( + _config_version=1, + foo="fnord" + ) + self.settings.get_all_data.return_value = in_config + + ### execute + + self.plugin.on_settings_cleanup() + + ### assert + + # minimal config incl. config version should have been set + self.settings.set.assert_called_once_with([], dict(_config_version=1)) + + def test_on_settings_cleanup_noconfigversion(self): + """Tests that config versions of None are cleaned from stored data.""" + + ### setup + + defaults = dict( + foo="bar" + ) + self.plugin.get_settings_defaults = mock.MagicMock() + self.plugin.get_settings_defaults.return_value = defaults + + # stored config version is None + in_config = dict( + _config_version=None, + foo="fnord" + ) + self.settings.get_all_data.return_value = in_config + + ### execute + + self.plugin.on_settings_cleanup() + + ### assert + + # minimal config without config version should have been set + self.settings.set.assert_called_once_with([], dict(foo="fnord")) + + def test_on_settings_cleanup_emptydiff(self): + """Tests that settings are cleaned up if the diff data <-> defaults is empty.""" + + ### setup + + defaults = dict( + foo="bar" + ) + self.plugin.get_settings_defaults = mock.MagicMock() + self.plugin.get_settings_defaults.return_value = defaults + + # current stored config, same as defaults + in_config = dict( + foo="bar" + ) + self.settings.get_all_data.return_value = in_config + + ### execute + + self.plugin.on_settings_cleanup() + + ### assert + + # should have been cleared + self.settings.clean_all_data.assert_called_once_with() + + def test_on_settings_cleanup_nosuchpath(self): + """Tests that no processing is done if nothing is stored in settings.""" + + from octoprint.settings import NoSuchSettingsPath + + ### setup + + # simulate no settings stored in config.yaml + self.settings.get_all_data.side_effect = NoSuchSettingsPath() + + ### execute + + self.plugin.on_settings_cleanup() + + ### assert + + # only get_all_data should have been called + self.settings.get_all_data.assert_called_once_with(merged=False, incl_defaults=False, error_on_path=True) + self.assertTrue(len(self.settings.method_calls) == 1) + + def test_on_settings_cleanup_none(self): + """Tests the None entries in config get cleaned up.""" + + ### setup + + # simulate None entry in config.yaml + self.settings.get_all_data.return_value = None + + ### execute + + self.plugin.on_settings_cleanup() + + ### assert + + # should have been cleaned + self.settings.clean_all_data.assert_called_once_with() + + def test_on_settings_save(self): + """Tests that only the diff is saved.""" + + ### setup + + current = dict( + foo="bar" + ) + self.settings.get_all_data.return_value = current + + defaults = dict( + foo="foo", + bar=dict( + a=1, + b=2 + ) + ) + self.plugin.get_settings_defaults = mock.MagicMock() + self.plugin.get_settings_defaults.return_value = defaults + + ### execute + + data = dict( + foo="fnord", + bar=dict( + a=1, + b=2 + ) + ) + diff = self.plugin.on_settings_save(data) + + ### assert + + # the minimal diff should have been saved + expected = dict( + foo="fnord" + ) + self.settings.set.assert_called_once_with([], expected) + + self.assertEquals(diff, expected) + + def test_on_settings_save_nodiff(self): + """Tests that data is cleaned if there's not difference between data and defaults.""" + + ### setup + + self.settings.get_all_data.return_value = None + + defaults = dict( + foo="bar", + bar=dict( + a=1, + b=2, + l=["some", "list"] + ) + ) + self.plugin.get_settings_defaults = mock.MagicMock() + self.plugin.get_settings_defaults.return_value = defaults + + ### execute + + data = dict(foo="bar") + diff = self.plugin.on_settings_save(data) + + ### assert + + self.settings.clean_all_data.assert_called_once_with() + self.assertEquals(diff, dict()) + + def test_on_settings_save_configversion(self): + """Tests that saved data gets stripped config version and set correct one.""" + + ### setup + + self.settings.get_all_data.return_value = None + + defaults = dict( + foo="bar" + ) + self.plugin.get_settings_defaults = mock.MagicMock() + self.plugin.get_settings_defaults.return_value = defaults + + version = 1 + self.plugin.get_settings_version = mock.MagicMock() + self.plugin.get_settings_version.return_value = version + + ### execute + + data = dict(_config_version=None, foo="bar") + diff = self.plugin.on_settings_save(data) + + ### assert + + expected_diff = dict() + expected_set = dict(_config_version=version) + + # while there was no diff, we should still have saved the new config version + self.settings.set.assert_called_once_with([], expected_set) + + self.assertEquals(diff, expected_diff) + + def test_on_settings_load(self): + """Tests that on_settings_load returns what's stored in the config, without config version.""" + + ### setup + + # current data incl. config version + current = dict( + _config_version=3, + foo="bar", + fnord=dict( + a=1, + b=2, + l=["some", "list"] + ) + ) + + # expected is current without _config_version - we make the copy now + # since our current dict will be modified by the test + expected = dict(current) + del expected["_config_version"] + + self.settings.get_all_data.return_value = expected + + ### execute + + result = self.plugin.on_settings_load() + + ### assert + + self.assertEquals(result, expected) diff --git a/tests/util/_files/jinja_test_data/.hidden_everywhere.txt b/tests/util/_files/jinja_test_data/.hidden_everywhere.txt new file mode 100644 index 000000000..2277db7a8 --- /dev/null +++ b/tests/util/_files/jinja_test_data/.hidden_everywhere.txt @@ -0,0 +1 @@ +hidden_everywhere diff --git a/tests/util/_files/jinja_test_data/normal_text.txt b/tests/util/_files/jinja_test_data/normal_text.txt new file mode 100644 index 000000000..5685cd075 --- /dev/null +++ b/tests/util/_files/jinja_test_data/normal_text.txt @@ -0,0 +1 @@ +normal_text diff --git a/tests/util/_files/jinja_test_data/not_a_text.dat b/tests/util/_files/jinja_test_data/not_a_text.dat new file mode 100644 index 000000000..7376e5616 --- /dev/null +++ b/tests/util/_files/jinja_test_data/not_a_text.dat @@ -0,0 +1 @@ +not_a_text diff --git a/tests/util/_files/utf8_with_bom.txt b/tests/util/_files/utf8_with_bom.txt new file mode 100644 index 000000000..38d2961e3 --- /dev/null +++ b/tests/util/_files/utf8_with_bom.txt @@ -0,0 +1,3 @@ +# This is a text file encoded in UTF8 with a BOM + +Here are some umlauts: äöüÄÖÜß \ No newline at end of file diff --git a/tests/util/_files/utf8_without_bom.txt b/tests/util/_files/utf8_without_bom.txt new file mode 100644 index 000000000..16ea8c8c7 --- /dev/null +++ b/tests/util/_files/utf8_without_bom.txt @@ -0,0 +1,3 @@ +# This is a text file encoded in UTF8 without a BOM + +Here are some umlauts: äöüÄÖÜß \ No newline at end of file diff --git a/tests/util/test_file_helpers.py b/tests/util/test_file_helpers.py new file mode 100644 index 000000000..160f776c0 --- /dev/null +++ b/tests/util/test_file_helpers.py @@ -0,0 +1,208 @@ +# coding=utf-8 +from __future__ import absolute_import + +__license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' +__copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms of the AGPLv3 License" + +import unittest +import mock +import os +import ddt +import sys + +import octoprint.util + +class BomAwareOpenTest(unittest.TestCase): + """ + Tests for :func:`octoprint.util.bom_aware_open`. + """ + + def setUp(self): + self.filename_utf8_with_bom = os.path.join(os.path.abspath(os.path.dirname(__file__)), "_files", "utf8_with_bom.txt") + self.filename_utf8_without_bom = os.path.join(os.path.abspath(os.path.dirname(__file__)), "_files", "utf8_without_bom.txt") + + def test_bom_aware_open_with_bom(self): + """Tests that the contents of a UTF8 file with BOM are loaded correctly (without the BOM).""" + + # test + with octoprint.util.bom_aware_open(self.filename_utf8_with_bom, encoding="utf-8") as f: + contents = f.readlines() + + # assert + self.assertEquals(len(contents), 3) + self.assertTrue(contents[0].startswith("#")) + + def test_bom_aware_open_without_bom(self): + """Tests that the contents of a UTF8 file without BOM are loaded correctly.""" + + # test + with octoprint.util.bom_aware_open(self.filename_utf8_without_bom, encoding="utf-8") as f: + contents = f.readlines() + + # assert + self.assertEquals(len(contents), 3) + self.assertTrue(contents[0].startswith("#")) + + def test_bom_aware_open_ascii(self): + """Tests that the contents of a UTF8 file loaded as ASCII are replaced correctly if "replace" is specified on errors.""" + + # test + with octoprint.util.bom_aware_open(self.filename_utf8_with_bom, errors="replace") as f: + contents = f.readlines() + + # assert + self.assertEquals(len(contents), 3) + self.assertTrue(contents[0].startswith(u"\ufffd" * 3 + "#")) + self.assertTrue(contents[2].endswith(u"\ufffd\ufffd" * 6)) + + def test_bom_aware_open_encoding_error(self): + """Tests that an encoding error is thrown if not suppressed when opening a UTF8 file as ASCII.""" + try: + with octoprint.util.bom_aware_open(self.filename_utf8_without_bom) as f: + f.readlines() + self.fail("Expected an exception") + except UnicodeDecodeError: + pass + + def test_bom_aware_open_parameters(self): + """Tests that the parameters are propagated properly.""" + + with mock.patch("codecs.open") as mock_open: + with octoprint.util.bom_aware_open(self.filename_utf8_without_bom, mode="rb", encoding="utf-8", errors="ignore") as f: + f.readlines() + + mock_open.assert_called_once_with(self.filename_utf8_without_bom, encoding="utf-8", mode="rb", errors="ignore") + +class TestAtomicWrite(unittest.TestCase): + """ + Tests for :func:`octoprint.util.atomic_write`. + """ + + def setUp(self): + pass + + @mock.patch("shutil.move") + @mock.patch("tempfile.NamedTemporaryFile") + def test_atomic_write(self, mock_tempfile, mock_move): + """Tests the regular basic "good" case.""" + + # setup + mock_file = mock.MagicMock() + mock_file.name = "tempfile.tmp" + mock_tempfile.return_value = mock_file + + # test + with octoprint.util.atomic_write("somefile.yaml") as f: + f.write("test") + + # assert + mock_tempfile.assert_called_once_with(mode="w+b", prefix="tmp", suffix="", delete=False) + mock_file.write.assert_called_once_with("test") + mock_file.close.assert_called_once_with() + mock_move.assert_called_once_with("tempfile.tmp", "somefile.yaml") + + @mock.patch("shutil.move") + @mock.patch("tempfile.NamedTemporaryFile") + def test_atomic_write_error_on_write(self, mock_tempfile, mock_move): + """Tests the error case where something in the wrapped code fails.""" + + # setup + mock_file = mock.MagicMock() + mock_file.name = "tempfile.tmp" + mock_file.write.side_effect = RuntimeError() + mock_tempfile.return_value = mock_file + + # test + try: + with octoprint.util.atomic_write("somefile.yaml") as f: + f.write("test") + self.fail("Expected an exception") + except RuntimeError: + pass + + # assert + mock_tempfile.assert_called_once_with(mode="w+b", prefix="tmp", suffix="", delete=False) + mock_file.close.assert_called_once_with() + self.assertFalse(mock_move.called) + + @mock.patch("shutil.move") + @mock.patch("tempfile.NamedTemporaryFile") + def test_atomic_write_error_on_move(self, mock_tempfile, mock_move): + """Tests the error case where the final move fails.""" + # setup + mock_file = mock.MagicMock() + mock_file.name = "tempfile.tmp" + mock_tempfile.return_value = mock_file + mock_move.side_effect = RuntimeError() + + # test + try: + with octoprint.util.atomic_write("somefile.yaml") as f: + f.write("test") + self.fail("Expected an exception") + except RuntimeError: + pass + + # assert + mock_tempfile.assert_called_once_with(mode="w+b", prefix="tmp", suffix="", delete=False) + mock_file.close.assert_called_once_with() + self.assertTrue(mock_move.called) + + @mock.patch("shutil.move") + @mock.patch("tempfile.NamedTemporaryFile") + def test_atomic_write_parameters(self, mock_tempfile, mock_move): + """Tests that the open parameters are propagated properly.""" + + # setup + mock_file = mock.MagicMock() + mock_file.name = "tempfile.tmp" + mock_tempfile.return_value = mock_file + + # test + with octoprint.util.atomic_write("somefile.yaml", mode="w", prefix="foo", suffix="bar") as f: + f.write("test") + + # assert + mock_tempfile.assert_called_once_with(mode="w", prefix="foo", suffix="bar", delete=False) + mock_file.close.assert_called_once_with() + mock_move.assert_called_once_with("tempfile.tmp", "somefile.yaml") + + +@ddt.ddt +class IsHiddenPathTest(unittest.TestCase): + + def setUp(self): + import tempfile + + self.basepath = tempfile.mkdtemp() + + self.path_always_visible = os.path.join(self.basepath, "always_visible.txt") + self.path_hidden_on_windows = os.path.join(self.basepath, "hidden_on_windows.txt") + self.path_always_hidden = os.path.join(self.basepath, ".always_hidden.txt") + + for attr in ("path_always_visible", "path_hidden_on_windows", "path_always_hidden"): + path = getattr(self, attr) + with open(path, "w+b") as f: + f.write(attr) + + import sys + if sys.platform == "win32": + # we use ctypes and the windows API to set the hidden attribute on the file + # only hidden on windows + import ctypes + ctypes.windll.kernel32.SetFileAttributesW(unicode(self.path_hidden_on_windows), 2) + + def tearDown(self): + import shutil + shutil.rmtree(self.basepath) + + @ddt.data( + (None, False), + ("path_always_visible", False), + ("path_always_hidden", True), + ("path_hidden_on_windows", sys.platform == "win32") + ) + @ddt.unpack + def test_is_hidden_path(self, path_id, expected): + path = getattr(self, path_id) if path_id is not None else None + self.assertEqual(octoprint.util.is_hidden_path(path), expected) diff --git a/tests/util/test_jinja.py b/tests/util/test_jinja.py new file mode 100644 index 000000000..f391cdee9 --- /dev/null +++ b/tests/util/test_jinja.py @@ -0,0 +1,76 @@ +# coding=utf-8 +from __future__ import absolute_import + +__license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agpl.html' +__copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms of the AGPLv3 License" + + +import unittest +import os +import jinja2 + +from ddt import ddt, data, unpack + +import octoprint.util.jinja + +NONE_FILTER = None +HIDDEN_FILTER = lambda x: not os.path.basename(x).startswith(".") +NO_TXT_FILTER = lambda x: x.endswith(".txt") +COMBINED_FILTER = lambda x: HIDDEN_FILTER(x) and NO_TXT_FILTER(x) + +@ddt +class FilteredFileSystemLoaderTest(unittest.TestCase): + + def setUp(self): + self.basepath = os.path.join(os.path.abspath(os.path.dirname(__file__)), "_files", "jinja_test_data") + self.environment = jinja2.Environment() + + def loader_factory(self, path_filter): + return octoprint.util.jinja.FilteredFileSystemLoader(self.basepath, + path_filter=path_filter) + + @data( + (NONE_FILTER, [".hidden_everywhere.txt", "normal_text.txt", "not_a_text.dat"]), + (HIDDEN_FILTER, ["normal_text.txt", "not_a_text.dat"]), + (NO_TXT_FILTER, [".hidden_everywhere.txt", "normal_text.txt"]), + (COMBINED_FILTER, ["normal_text.txt"]) + ) + @unpack + def test_list_templates(self, path_filter, expected): + loader = self.loader_factory(path_filter=path_filter) + templates = loader.list_templates() + self.assertListEqual(templates, expected) + + @data( + (NONE_FILTER, ((".hidden_everywhere.txt", True), + ("normal_text.txt", True), + ("not_a_text.dat", True))), + (HIDDEN_FILTER, ((".hidden_everywhere.txt", False), + ("normal_text.txt", True), + ("not_a_text.dat", True))), + (NO_TXT_FILTER, ((".hidden_everywhere.txt", True), + ("normal_text.txt", True), + ("not_a_text.dat", False))), + (COMBINED_FILTER, ((".hidden_everywhere.txt", False), + ("normal_text.txt", True), + ("not_a_text.dat", False))) + ) + @unpack + def test_get_source_none_filter(self, path_filter, param_sets): + loader = self.loader_factory(path_filter=path_filter) + for param_set in param_sets: + template, success = param_set + if success: + self._test_get_source_success(loader, template) + else: + self._test_get_source_notfound(loader, template) + + def _test_get_source_success(self, loader, template): + loader.get_source(self.environment, template) + + def _test_get_source_notfound(self, loader, template): + try: + loader.get_source(self.environment, template) + self.fail("Expected an exception") + except jinja2.TemplateNotFound: + pass diff --git a/translations/de/LC_MESSAGES/messages.mo b/translations/de/LC_MESSAGES/messages.mo index 9f2ed5e39..3c036179c 100644 Binary files a/translations/de/LC_MESSAGES/messages.mo and b/translations/de/LC_MESSAGES/messages.mo differ diff --git a/translations/de/LC_MESSAGES/messages.po b/translations/de/LC_MESSAGES/messages.po index f87120120..51ae962a4 100644 --- a/translations/de/LC_MESSAGES/messages.po +++ b/translations/de/LC_MESSAGES/messages.po @@ -11,116 +11,146 @@ msgid "" msgstr "" "Project-Id-Version: OctoPrint\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2015-08-31 10:04+0200\n" -"PO-Revision-Date: 2015-08-31 10:28+0100\n" +"POT-Creation-Date: 2015-12-01 11:20+0100\n" +"PO-Revision-Date: 2015-12-01 11:37+0100\n" "Last-Translator: Gina Häußge \n" +"Language: de\n" "Language-Team: German (http://www.transifex.com/projects/p/octoprint/language/de/)\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" -"Language: de\n" +"Generated-By: Babel 2.1.1\n" "X-Generator: Poedit 1.6.8\n" -#: src/octoprint/plugins/cura/__init__.py:43 -msgid "CuraEngine" -msgstr "CuraEngine" - #: src/octoprint/plugins/cura/templates/cura_settings.jinja2:1 #: src/octoprint/templates/tabs/control.jinja2:98 msgid "General" msgstr "Allgemein" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:5 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:3 +msgid "" +"\n" +" Specify the path to the CuraEngine binary. Note that only\n" +" versions up to and including 15.04 are supported.\n" +" CuraEngine version 15.06 or newer is not\n" +" compatible with this plugin.\n" +msgstr "" +"\n" +" Gib den Pfad zum CuraEngine Binary an. Beachte, dass nur\n" +" Versionen bis einschließlich 15.04 unterstützt sind.\n" +" CuraEngine Version 15.06 oder neuere sind nicht\n" +" kompatibel mit diesem Plugin.\n" + +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:12 msgid "Path to CuraEngine" msgstr "Pfad zu CuraEngine" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:13 -msgid "Log the output of CuraEngine to plugin_cura_engine.log" -msgstr "Output von CuraEngine nach plugin_cura_engine.log loggen" +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:20 +msgid "Log the output of CuraEngine to plugin_cura_engine.log" +msgstr "Output von CuraEngine nach plugin_cura_engine.log loggen" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:19 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:26 msgid "Profiles" msgstr "Profile" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:22 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:29 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 -#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 msgid "Sort by" msgstr "Sortieren" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:22 -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:27 -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:76 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:29 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:34 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:87 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:51 msgid "Identifier" msgstr "ID" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:22 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:75 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:29 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:105 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 #: src/octoprint/templates/sidebar/files_header.jinja2:6 -#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 msgid "ascending" msgstr "aufsteigend" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:22 -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:28 -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:82 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:14 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:29 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:35 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:93 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:38 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:4 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 #: src/octoprint/templates/dialogs/settings/logs.jinja2:12 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:5 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:44 #: src/octoprint/templates/dialogs/settings/terminalfilters.jinja2:3 -#: src/octoprint/templates/tabs/timelapse.jinja2:49 -#: src/octoprint/templates/tabs/timelapse.jinja2:54 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 +#: src/octoprint/templates/tabs/timelapse.jinja2:55 msgid "Name" msgstr "Name" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:29 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:15 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:36 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:39 msgid "Actions" msgstr "Aktionen" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:37 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:44 msgid "Make default" msgstr "Als Standard speichern" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:37 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:44 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:15 msgid "Delete Profile" msgstr "Profil entfernen" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:54 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:61 msgid "Import Profile..." msgstr "Profil importieren..." -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:59 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:64 +#, python-format +msgid "For more information on configuration and usage please see the Plugin's homepage." +msgstr "Für weitere Informationen zu Konfiguration and Verwendung schaue bitte auf die Homepage des Plugins." + +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:70 msgid "Import Existing Cura Profile" msgstr "Vorhandenes Curaprofil importieren" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:64 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:75 msgid "Profile ini file" msgstr "Profil-INI-Datei" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:68 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:141 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:79 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:171 #: src/octoprint/templates/dialogs/settings/appearance.jinja2:83 msgid "Browse..." msgstr "Durchsuchen..." -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:88 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:99 msgid "Description" msgstr "Beschreibung" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:96 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:107 msgid "Overwrite existing file" msgstr "Vorhandene Datei überschreiben" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:103 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:113 +msgid "" +"\n" +" You can import your existing profile .ini files from Cura (version up to and\n" +" including 15.04) here. Please be aware that neither the .json profile format\n" +" from Cura versions starting with 15.06 is supported, nor are the custom Cura profile formats\n" +" that third party tools like e.g. Repetier create.\n" +" " +msgstr "" +"\n" +" Hier kannst Du Deine existierenden Profildateien (.ini) aus Cura importieren (Versionen bis\n" +" einschließlich 15.04). Bitte beachte, dass weder die .json Profile aus\n" +" Curaversionen ab 15.06 unterstützt werden, noch andere Thirdpartyprofilformate von\n" +" Tools wie z.B. Repetier Host.\n" + +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:121 #: src/octoprint/templates/dialogs/usersettings.jinja2:46 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:80 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:109 @@ -129,7 +159,7 @@ msgstr "Vorhandene Datei überschreiben" msgid "Abort" msgstr "Abbrechen" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:104 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:122 #: src/octoprint/templates/dialogs/usersettings.jinja2:47 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:81 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:110 @@ -138,226 +168,226 @@ msgstr "Abbrechen" msgid "Confirm" msgstr "Bestätigen" -#: src/octoprint/plugins/pluginmanager/__init__.py:107 +#: src/octoprint/plugins/pluginmanager/__init__.py:116 msgid "Plugin Manager" msgstr "Pluginmanager" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:132 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:277 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:149 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:310 msgid "Installing plugin..." msgstr "Installiere Plugin..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:132 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:149 msgid "Installing plugin from uploaded archive..." msgstr "Installiere Plugin von hochgeladenem Archiv..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:147 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:225 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:302 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:332 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:546 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:576 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:593 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:610 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:164 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:258 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:335 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:365 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:631 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:661 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:678 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:695 msgid "Something went wrong" msgstr "Etwas ist schief gegangen" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:148 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:226 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:303 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:333 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:165 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:259 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:336 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:366 msgid "Please consult octoprint.log for details" msgstr "Bitte konsultiere octoprint.log für Details" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:279 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:312 #, python-format msgid "Installing plugin \"%(name)s\" from %(url)s..." msgstr "Installiere Plugin \"%(name)s\" von %(url)s..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:281 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:314 #, python-format msgid "Installing plugin from %(url)s..." msgstr "Installiere Plugin von %(url)s..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:284 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:317 msgid "Reinstalling plugin..." msgstr "Reinstalliere Plugin..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:285 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:318 #, python-format msgid "Reinstalling plugin \"%(name)s\" from %(url)s..." msgstr "Reinstalliere Plugin \"%(name)s\" von %(url)s..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:323 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:356 msgid "Uninstalling plugin..." msgstr "Deinstalliere Plugin..." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:323 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:356 #, python-format msgid "Uninstalling plugin \"%(name)s\"" msgstr "Deinstalliere Plugin \"%(name)s\"" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:443 msgid "Reinstall" msgstr "Reinstallieren" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:130 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:146 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:443 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:160 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:176 msgid "Install" msgstr "Installieren" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:443 msgid "Incompatible" msgstr "Inkompatibel" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:376 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:461 #: src/octoprint/templates/overlays/reloadui.jinja2:9 msgid "Reload now" msgstr "Jetzt neu laden" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:445 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:530 msgid "Done!" msgstr "Fertig!" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:465 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:550 msgid "Enable Plugin" msgstr "Plugin enablen" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:465 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:550 msgid "Disable Plugin" msgstr "Plugin disablen" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:530 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:615 msgid "Plugin installed" msgstr "Plugin installiert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:531 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:616 msgid "A plugin was installed successfully, however it was impossible to detect which one. Please Restart OctoPrint to make sure everything will be registered properly" msgstr "Ein Plugin wurde erfolgreich installiert, es war aber unmöglich zu detektieren, welches. Bitte starte OctoPrint neu um sicherzustellen, dass alles ordnungsgemäß registriert wird." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:535 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:620 #, python-format msgid "Plugin \"%(name)s\" reinstalled" msgstr "Plugin \"%(name)s\" reinstalliert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:536 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:621 msgid "The plugin was reinstalled successfully" msgstr "Das Plugin wurde erfolgreich reinstalliert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:537 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:622 msgid "The plugin was reinstalled successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich reinstalliert, es ist aber ein Neustart von OctoPrint notwendig bevor es genutzt werden kann." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:538 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:623 msgid "The plugin was reinstalled successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich reinstalliert, es ist aber ein Neuladen der Seite notwendig bevor es genutzt werden kann." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:540 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:625 #, python-format msgid "Plugin \"%(name)s\" installed" msgstr "Plugin \"%(name)s\" installiert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:541 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:626 msgid "The plugin was installed successfully" msgstr "Das Plugin wurde erfolgreich installiert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:542 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:627 msgid "The plugin was installed successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich installiert, es ist jedoch ein Neustart von OctoPrint notwendig bevor es genutzt werden kann." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:543 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:628 msgid "The plugin was installed successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich installiert, es ist jedoch ein Neuladen der Seite notwendig bevor es genutzt werden kann." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:554 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:639 #, python-format msgid "Reinstalling the plugin from URL \"%(url)s\" failed: %(reason)s" msgstr "Reinstallation des Plugins von URL \"%(url)s\" fehlgeschlagen: %(reason)s" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:556 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:641 #, python-format msgid "Installing the plugin from URL \"%(url)s\" failed: %(reason)s" msgstr "Installation des Plugins von URL \"%(url)s\" fehlgeschlagen: %(reason)s" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:560 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:645 #, python-format msgid "Reinstalling the plugin from URL \"%(url)s\" failed, please see the log for details." msgstr "Reinstallation des Plugins von URL \"%(url)s\" fehlgeschlagen, bitte konsultiere das Log für Details." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:562 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:647 #, python-format msgid "Installing the plugin from URL \"%(url)s\" failed, please see the log for details." msgstr "Installation des Plugins von URL \"%(url)s\" fehlgeschlagen, bitte konsultiere das Log für Details" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:571 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:656 #, python-format msgid "Plugin \"%(name)s\" uninstalled" msgstr "Plugin \"%(name)s\" deinstalliert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:572 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:657 msgid "The plugin was uninstalled successfully" msgstr "Das Plugin wurde erfolgreich deinstalliert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:573 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:658 msgid "The plugin was uninstalled successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich deinstalliert, es ist jedoch ein Neustart von OctoPrint notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:574 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:659 msgid "The plugin was uninstalled successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich deinstalliert, es ist jedoch ein Neuladen der Seite notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:578 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:663 #, python-format msgid "Uninstalling the plugin failed: %(reason)s" msgstr "Deinstallation des Plugins fehlgeschlagen: %(reason)s" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:580 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:665 msgid "Uninstalling the plugin failed, please see the log for details." msgstr "Deinstallation des Plugins fehlgeschlagen, bitte konsultiere das Log für Details." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:588 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:673 #, python-format msgid "Plugin \"%(name)s\" enabled" msgstr "Plugin \"%(name)s\" aktiviert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:589 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:674 msgid "The plugin was enabled successfully." msgstr "Das Plugin wurde erfolgreich aktiviert." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:590 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:675 msgid "The plugin was enabled successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich aktiviert, es ist jedoch ein Neustart von OctoPrint notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:591 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:676 msgid "The plugin was enabled successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich aktiviert, es ist jedoch ein Neuladen der Seite notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:595 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:612 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:680 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:697 #, python-format msgid "Toggling the plugin failed: %(reason)s" msgstr "Togglen des Plugins fehlgeschalgen: %(reason)s" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:597 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:614 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:682 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:699 msgid "Toggling the plugin failed, please see the log for details." msgstr "Togglen des Plugins fehlgeschlagen, bitte konsultiere das Log für Details." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:605 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:690 #, python-format msgid "Plugin \"%(name)s\" disabled" msgstr "Plugin \"%(name)s\" deaktiviert" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:606 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:691 msgid "The plugin was disabled successfully." msgstr "Das Plugin wurde erfolgreich deaktiviert." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:607 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:692 msgid "The plugin was disabled successfully, however a restart of OctoPrint is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich deaktiviert, es ist jedoch ein Neustart von OctoPrint notwendig." -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:608 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:693 msgid "The plugin was disabled successfully, however a reload of the page is needed for that to take effect." msgstr "Das Plugin wurde erfolgreich deaktiviert, es ist jedoch ein Neuladen der Seite notwendig." @@ -365,125 +395,204 @@ msgstr "Das Plugin wurde erfolgreich deaktiviert, es ist jedoch ein Neuladen der msgid "Take note that all plugin management functionality is disabled while your printer is printing." msgstr "Bitte beachte dass jegliche Pluginmanagementfunktionen während des Druckens deaktiviert sind." -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:9 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:8 +msgid "" +"\n" +" The pip command could not be found.\n" +" Please configure it manually. No installation and uninstallation of plugin\n" +" packages is possible while pip is unavailable.\n" +msgstr " Das pip Command konnte nicht gefunden werden. Bitte konfiguriere es manuell. Installation und Deinstallation von Plugins ist nicht möglich, solange pip nicht verfügbar ist." + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:16 +msgid "" +"\n" +" The pip command is configured to use sudo. This\n" +" is not recommended due to security reasons. It is strongly\n" +" suggested you install OctoPrint under a\n" +" user-owned virtual environment\n" +" so that the use of sudo is not needed for plugin management.\n" +msgstr " Das pip Command ist konfiguriert, sudo zu nutzen. Das ist aus Gründen der Systemsicherheit nicht empfehlenswert. Es ist ausdrücklichst empfohlen, dass Du OctoPrint in einem Virtual Environment installierst, dass einem User gehört, so dass sudo für die Pluginverwaltung nicht benötigt wird." + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:30 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:204 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:20 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:72 +msgid "Plugin Configuration" +msgstr "Pluginkonfiguration" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:33 msgid "Installed Plugins" msgstr "Installierte Plugins" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:21 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:45 msgid "Bundled" msgstr "Gebundled" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:24 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:99 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:48 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:129 #: src/octoprint/templates/index.jinja2:118 msgid "Homepage" msgstr "Homepage" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:31 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:55 msgid "Uninstall Plugin" msgstr "Plugin deinstallieren" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:48 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:72 msgid "Get More..." msgstr "Mehr..." -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:59 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:167 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:87 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:197 #: src/octoprint/templates/dialogs/settings/appearance.jinja2:96 msgid "Close" msgstr "Schließen" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:66 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:94 msgid "Install new Plugins..." msgstr "Installation neuer Plugins..." -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:71 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:101 #, python-format msgid "... from the Plugin Repository" msgstr "... vom Plugin Repository" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:75 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:105 msgid "Sort by title" msgstr "Nach Titel sortieren" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:76 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:106 msgid "Sort by publication date" msgstr "Nach Veröffentlichungsdatum sortieren" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:76 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:106 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 #: src/octoprint/templates/sidebar/files_header.jinja2:7 #: src/octoprint/templates/sidebar/files_header.jinja2:8 -#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 msgid "descending" msgstr "absteigend" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:78 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:108 msgid "Only show uninstalled plugins" msgstr "Nur uninstallierte Plugins anzeigen" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:79 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:109 msgid "Only show compatible plugins" msgstr "Nur kompatible Plugins anzeigen" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:81 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:111 msgid "Refresh list from repository" msgstr "Liste vom Repository neu laden" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:87 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:117 #: src/octoprint/templates/sidebar/files.jinja2:2 msgid "Search..." msgstr "Suchen..." -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:98 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:128 msgid "Details" msgstr "Details" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:115 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:145 msgid "Sadly the repository is currently not available" msgstr "Das Repository ist leider zur Zeit nicht verfügbar" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:118 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:148 msgid "Is your OctoPrint installation connected to the internet?" msgstr "Ist Deine OctoPrint Installation mit dem Internet verbunden?" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:123 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:153 msgid "... from URL" msgstr "... von URL" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:128 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:158 msgid "Enter URL..." msgstr "URL eingeben..." -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:132 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:162 msgid "This does not look like a valid \"http://\" or \"https://\" URL." msgstr "Das sieht nicht wie eine valide \"http://\" oder \"https://\" URL aus." -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:135 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:165 msgid "... from an uploaded archive" msgstr "... von einem hochgeladenen Archiv" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:148 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:178 msgid "This does not look like a valid plugin archive. Valid plugin archives should be either zip files or tarballs and have the extension \".zip\", \".tar.gz\", \".tgz\" or \".tar\"" msgstr "Das sieht nicht aus wie ein valides Pluginarchiv. Valide Pluginarchive sollten entweder ZIP-Dateien oder Tarballs sein und die Dateiextension \".zip\", \".tar.gz\", \".tgz\" oder \".tar\" haben" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:152 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:182 #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:62 #: src/octoprint/templates/tabs/terminal.jinja2:25 msgid "Advanced options" msgstr "Erweiterte Optionen" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:158 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:188 msgid "Use --process-dependency-links with pip install" msgstr "--process-dependency-link mit pip install verwenden" -#: src/octoprint/plugins/softwareupdate/__init__.py:378 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:208 +msgid "pip command to use for managing plugins. You might have to configure this if auto detection fails." +msgstr "pip Command, das zur Verwaltung von Plugins verwendet werden soll. Es kann sein, dass Du das manuell konfigurieren musst, falls die Autodetection fehlschlägt." + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:209 +msgid "pip command" +msgstr "pip Command" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:211 +msgid "Autodetect" +msgstr "Automatisch erkennen" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:212 +msgid "Only set this if OctoPrint cannot autodetect the path to pip to use for managing plugins." +msgstr "Nur setzen, wenn OctoPrint den Pfad zum pip Command für die Pluginverwaltung nicht selbst erkennen kann." + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:215 +msgid "Additional arguments for pip command. You should normally not have to change this." +msgstr "Weitere Argument für das pip Command. Du solltest hier normalerweise nichts ändern müssen." + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:216 +msgid "Additional pip arguments" +msgstr "Weitere pip Argumente" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:221 +msgid "URL of the Plugin Repository to use. You should normally not have to change this." +msgstr "URL des zu nutzenden Pluginrepositories. Du solltest hier normalerweise nichts ändern müssen." + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:222 +msgid "Repository URL" +msgstr "Repository-URL" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:227 +msgid "How long to cache repository data, in minutes. You should normally not have to change this." +msgstr "Wie lange die Repositorydaten gecached werden sollen, in Minuten. Du solltest hier normalerweise nichts ändern müssen." + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:228 +msgid "Repository cache TTL" +msgstr "Repository-Cache TTL" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:239 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:100 +#: src/octoprint/templates/dialogs/confirmation.jinja2:11 +#: src/octoprint/templates/dialogs/settings.jinja2:51 +#: src/octoprint/templates/dialogs/slicing.jinja2:50 +#: src/octoprint/templates/sidebar/state.jinja2:19 +msgid "Cancel" +msgstr "Abbruch" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:240 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101 +#: src/octoprint/templates/dialogs/settings.jinja2:52 +msgid "Save" +msgstr "Speichern" + +#: src/octoprint/plugins/softwareupdate/__init__.py:394 msgid "Software Update" msgstr "Software Update" -#: src/octoprint/plugins/softwareupdate/__init__.py:662 -#: src/octoprint/plugins/softwareupdate/__init__.py:693 -#: src/octoprint/server/views.py:149 +#: src/octoprint/plugins/softwareupdate/__init__.py:680 +#: src/octoprint/server/views.py:155 #: src/octoprint/static/js/app/viewmodels/appearance.js:11 #: src/octoprint/static/js/app/viewmodels/appearance.js:13 #: src/octoprint/static/js/app/viewmodels/appearance.js:18 @@ -499,126 +608,118 @@ msgstr "Release" msgid "Commit" msgstr "Commit" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:145 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:147 msgid "There are updates available for the following components:" msgstr "Es gibt Aktualisierungen für die folgenden Komponenten:" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:159 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:161 msgid "Those components marked with can be updated directly." msgstr "Die mit markierten Komponenten können direkt aktualisiert werden." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:162 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:164 msgid "Update Available" msgstr "Aktualisierung verfügbar" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:174 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:176 msgid "Ignore" msgstr "Ignorieren" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:178 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:180 msgid "You can make this message display again via \"Settings\" > \"Software Update\" > \"Check for update now\"" msgstr "Du kannst diese Nachricht erneut anzeigen lassen mittels \"Einstellungen\" > \"Software Update\" > \"Jetzt nach Aktualisierungen suchen\"" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:182 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:184 msgid "Update now" msgstr "Jetzt aktualisieren" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:199 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:201 msgid "Everything is up-to-date" msgstr "Alles ist auf dem neusten Stand" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:264 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:266 msgid "Updating..." msgstr "Aktualisiere..." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:265 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:267 msgid "Now updating, please wait." msgstr "Aktualisiere gerade, bitte warten." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:284 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:286 msgid "Update not started!" msgstr "Aktualisierung nicht gestartet!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:285 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:287 msgid "The update could not be started. Is it already active? Please consult the log for details." msgstr "Die Aktualisierung konnte nicht gestartet werden. Läuft bereits eine? Bitte konsultiere das Log für Details." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:307 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:309 msgid "Can't update while printing" msgstr "Aktualisierung nicht möglich während gedruckt wird" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:308 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:310 msgid "A print job is currently in progress. Updating will be prevented until it is done." msgstr "Ein Druckjob ist zur Zeit aktiv. Aktualisierungen werden unterbunden bis er fertig ist." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:312 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:314 msgid "This will update your OctoPrint installation and restart the server." msgstr "Das wird Deine OctoPrint Installation aktualisieren und den Server neu starten." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:336 -msgid "Restart successful!" -msgstr "Neustart erfolgreich!" - -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:337 -msgid "The server was restarted successfully. The page will now reload automatically." -msgstr "Der Server wurde erfolgreich neu gestartet. Die Seite wird nun automatisch neu geladen." - -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:369 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:363 #, python-format msgid "Now updating %(name)s to %(version)s" msgstr "Aktualisiere %(name)s auf %(version)s" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:377 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:371 msgid "Update successful, restarting!" msgstr "Aktualisierung erfolgreich, starte neu!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:378 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:372 msgid "The update finished successfully and the server will now be restarted." msgstr "Die Aktualisierung wurde erfolgreich durchgeführt und der Server wird jetzt neu gestartet." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:389 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:431 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:383 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:425 msgid "Restart failed" msgstr "Neustart fehlgeschlagen" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:390 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:432 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:384 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:426 msgid "The server apparently did not restart by itself, you'll have to do it manually. Please consult the log file on what went wrong." msgstr "Der Server hat anscheinend nicht von selbst neu gstartet, Du wirst das manuell tun müssen. Bitte konsultiere das Logfile." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:406 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:400 msgid "The update finished successfully, please restart OctoPrint now." msgstr "Die Aktualisierung wurde erfolgreich abgeschlossen, bitte starte OctoPrint jetzt neu." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:408 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:402 msgid "The update finished successfully, please reboot the server now." msgstr "Die Aktualisierung wurde erfolgreich abgeschlossen, bitte reboote den Server jetzt." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:412 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:406 msgid "Update successful, restart required!" msgstr "Aktualisierung erfolgreich, Neustart notwendig!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:425 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:419 msgid "Restarting OctoPrint failed, please restart it manually. You might also want to consult the log file on what went wrong here." msgstr "Der Neustart von OctoPrint ist fehlgeschlagen, bitte starte es manuell neu. Du solltest das Logfile konsultieren, um herauszufinden, was hier schief gelaufen ist." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:427 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:421 msgid "Rebooting the server failed, please reboot it manually. You might also want to consult the log file on what went wrong here." msgstr "Reboot des Servers fehlgeschlagen, bitte reboote ihn manuell. Du solltest auch das Logfile konsultieren, um herauszufinden, was hier gerade schief gelaufen ist." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:445 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:439 msgid "Update successful!" msgstr "Aktualisierung erfolgreich!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:446 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:440 msgid "The update finished successfully." msgstr "Die Aktualisierung wurde erfolgreich abgeschlossen." -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:458 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:452 msgid "Update failed!" msgstr "Aktualisierung fehlgeschlagen!" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:459 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:453 msgid "The update did not finish successfully. Please consult the log for details." msgstr "Die Aktualisierung wurde nicht erfolgreich abgeschlossen. Bitte konsultiere das Log für Details." @@ -645,11 +746,6 @@ msgid "" "

\n" msgstr "

Du nutzt eine unveröffentlichte Version von OctoPrint, trackst aber OctoPrint Releases.

Du willst vermutlich, dass OctoPrint stattdessen die entsprechende Entwicklungsversion trackt. Falls Du dein lokales OctoPrint-Checkoutverzeichnis auf einen anderen Branch gewechselt hast, dann wechsle das Tracking einfach auf \"Commit\". Ansonsten wirf einen Blick in die Dokumentation.

" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:20 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:72 -msgid "Plugin Configuration" -msgstr "Pluginkonfiguration" - #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:23 msgid "Current versions" msgstr "Aktuelle Versionen" @@ -694,120 +790,107 @@ msgstr "Versionstracking für OctoPrint" msgid "Version cache TTL" msgstr "TTL des Versionscaches" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:100 -#: src/octoprint/templates/dialogs/confirmation.jinja2:11 -#: src/octoprint/templates/dialogs/settings.jinja2:51 -#: src/octoprint/templates/dialogs/slicing.jinja2:50 -#: src/octoprint/templates/sidebar/state.jinja2:19 -msgid "Cancel" -msgstr "Abbruch" - -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101 -#: src/octoprint/templates/dialogs/settings.jinja2:52 -msgid "Save" -msgstr "Speichern" - -#: src/octoprint/server/views.py:58 +#: src/octoprint/server/views.py:64 msgid "Plugins" msgstr "Plugins" -#: src/octoprint/server/views.py:115 +#: src/octoprint/server/views.py:121 msgid "Connection" msgstr "Verbindung" -#: src/octoprint/server/views.py:116 +#: src/octoprint/server/views.py:122 msgid "State" msgstr "Status" -#: src/octoprint/server/views.py:117 +#: src/octoprint/server/views.py:123 msgid "Files" msgstr "Dateien" -#: src/octoprint/server/views.py:123 +#: src/octoprint/server/views.py:129 msgid "Temperature" msgstr "Temperatur" -#: src/octoprint/server/views.py:124 +#: src/octoprint/server/views.py:130 msgid "Control" msgstr "Steuerung" -#: src/octoprint/server/views.py:125 +#: src/octoprint/server/views.py:131 msgid "Terminal" msgstr "Terminal" -#: src/octoprint/server/views.py:128 +#: src/octoprint/server/views.py:134 msgid "GCode Viewer" msgstr "GCode Viewer" -#: src/octoprint/server/views.py:130 +#: src/octoprint/server/views.py:136 #: src/octoprint/templates/sidebar/state.jinja2:3 msgid "Timelapse" msgstr "Zeitraffer" -#: src/octoprint/server/views.py:135 +#: src/octoprint/server/views.py:141 msgid "Printer" msgstr "Drucker" -#: src/octoprint/server/views.py:137 +#: src/octoprint/server/views.py:143 msgid "Serial Connection" msgstr "Serielle Verbindung" -#: src/octoprint/server/views.py:138 +#: src/octoprint/server/views.py:144 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:1 msgid "Printer Profiles" msgstr "Druckerprofile" -#: src/octoprint/server/views.py:139 +#: src/octoprint/server/views.py:145 msgid "Temperatures" msgstr "Temperaturen" -#: src/octoprint/server/views.py:140 +#: src/octoprint/server/views.py:146 msgid "Terminal Filters" msgstr "Terminalfilter" -#: src/octoprint/server/views.py:141 +#: src/octoprint/server/views.py:147 msgid "GCODE Scripts" msgstr "GCODE Scripts" -#: src/octoprint/server/views.py:143 src/octoprint/server/views.py:145 +#: src/octoprint/server/views.py:149 src/octoprint/server/views.py:151 msgid "Features" msgstr "Funktionen" -#: src/octoprint/server/views.py:146 +#: src/octoprint/server/views.py:152 msgid "Webcam" msgstr "Webcam" -#: src/octoprint/server/views.py:147 +#: src/octoprint/server/views.py:153 msgid "API" msgstr "API" -#: src/octoprint/server/views.py:151 +#: src/octoprint/server/views.py:157 #: src/octoprint/templates/dialogs/settings/folders.jinja2:2 msgid "Folders" msgstr "Verzeichnisse" -#: src/octoprint/server/views.py:152 +#: src/octoprint/server/views.py:158 msgid "Appearance" msgstr "Aussehen" -#: src/octoprint/server/views.py:153 +#: src/octoprint/server/views.py:159 #: src/octoprint/templates/dialogs/settings/logs.jinja2:2 msgid "Logs" msgstr "Logs" -#: src/octoprint/server/views.py:154 +#: src/octoprint/server/views.py:160 msgid "Server" msgstr "Server" -#: src/octoprint/server/views.py:157 +#: src/octoprint/server/views.py:163 msgid "Access Control" msgstr "Zugangsbeschränkung" -#: src/octoprint/server/views.py:163 +#: src/octoprint/server/views.py:169 msgid "Access" msgstr "Zugriff" -#: src/octoprint/server/views.py:164 +#: src/octoprint/server/views.py:170 msgid "Interface" msgstr "Interface" @@ -827,69 +910,92 @@ msgid "The server appears to be offline, at least I'm not getting any response f msgstr "Der Server scheint offline zu sein, zumindest kann ich mich nicht mit ihm verbinden. Ich konnte mich nicht automatisch neu verbinden, aber Du kannst mittels des folgenden Buttons einen manuellen Verbindungsversuch anstoßen." #: src/octoprint/static/js/app/dataupdater.js:169 -#: src/octoprint/static/js/app/dataupdater.js:197 +#: src/octoprint/static/js/app/dataupdater.js:222 #, python-format msgid "Slicing ... (%(percentage)d%%)" msgstr "Slice ... (%(percentage)d%%)" -#: src/octoprint/static/js/app/dataupdater.js:186 +#: src/octoprint/static/js/app/dataupdater.js:187 msgid "Rendering timelapse" msgstr "Zeitrafferaufnahme wird gerendert" -#: src/octoprint/static/js/app/dataupdater.js:186 +#: src/octoprint/static/js/app/dataupdater.js:187 #, python-format msgid "Now rendering timelapse %(movie_basename)s" msgstr "Rendere Zeitrafferaufnahme %(movie_basename)s" -#: src/octoprint/static/js/app/dataupdater.js:188 +#: src/octoprint/static/js/app/dataupdater.js:189 msgid "Timelapse ready" msgstr "Zeitrafferaufnahme fertig" -#: src/octoprint/static/js/app/dataupdater.js:188 +#: src/octoprint/static/js/app/dataupdater.js:189 #, python-format msgid "New timelapse %(movie_basename)s is done rendering." msgstr "Neue Zeitrafferaufnahme %(movie_basename)s wurde fertig gerendert" -#: src/octoprint/static/js/app/dataupdater.js:190 +#: src/octoprint/static/js/app/dataupdater.js:191 #, python-format msgid "Rendering of timelapse %(movie_basename)s failed with return code %(returncode)s" msgstr "Rendering der Zeitrafferaufnahme %(movie_basename)s fehlgeschlagen mit Returncode %(returncode)s" -#: src/octoprint/static/js/app/dataupdater.js:192 +#: src/octoprint/static/js/app/dataupdater.js:194 msgid "Rendering failed" msgstr "Rendering fehlgeschlagen" -#: src/octoprint/static/js/app/dataupdater.js:199 +#: src/octoprint/static/js/app/dataupdater.js:200 +msgid "Capturing timelapse postroll" +msgstr "Zeichne Timelapse-Postroll auf" + +#: src/octoprint/static/js/app/dataupdater.js:204 +msgid "Now capturing timelapse post roll, this will take only a moment..." +msgstr "Zeichne jetzt Timelapse-Postroll auf, dies wird nur einen Moment dauern..." + +#: src/octoprint/static/js/app/dataupdater.js:207 +#, python-format +msgid "%(minutes)d min" +msgstr "%(minutes)d Min" + +#: src/octoprint/static/js/app/dataupdater.js:209 +#, python-format +msgid "%(seconds)d sec" +msgstr "%(seconds) Sek" + +#: src/octoprint/static/js/app/dataupdater.js:211 +#, python-format +msgid "Now capturing timelapse post roll, this will take approximately %(duration)s..." +msgstr "Zeichne jetzt Timelapse-Postroll auf, dies wird voraussichtlich %(duration)s dauern..." + +#: src/octoprint/static/js/app/dataupdater.js:224 msgid "Slicing ..." msgstr "Slice ..." -#: src/octoprint/static/js/app/dataupdater.js:205 +#: src/octoprint/static/js/app/dataupdater.js:230 msgid "Slicing done" msgstr "Slicing abgeschlossen" -#: src/octoprint/static/js/app/dataupdater.js:205 +#: src/octoprint/static/js/app/dataupdater.js:230 #, python-format msgid "Sliced %(stl)s to %(gcode)s, took %(time).2f seconds" msgstr "%(stl)s nach %(gcode)s geslicet, dauerte %(time).2f Sekunden" -#: src/octoprint/static/js/app/dataupdater.js:215 +#: src/octoprint/static/js/app/dataupdater.js:240 #, python-format msgid "Could not slice %(stl)s to %(gcode)s: %(reason)s" msgstr "Konnte %(stl)s nicht nach %(gcode)s slicen: %(reason)s" -#: src/octoprint/static/js/app/dataupdater.js:216 +#: src/octoprint/static/js/app/dataupdater.js:241 msgid "Slicing failed" msgstr "Slicing fehlgeschlagen" -#: src/octoprint/static/js/app/dataupdater.js:220 +#: src/octoprint/static/js/app/dataupdater.js:245 msgid "Streaming ..." msgstr "Streaming ..." -#: src/octoprint/static/js/app/dataupdater.js:226 +#: src/octoprint/static/js/app/dataupdater.js:251 msgid "Streaming done" msgstr "Streaming abgeschlossen" -#: src/octoprint/static/js/app/dataupdater.js:227 +#: src/octoprint/static/js/app/dataupdater.js:252 #, python-format msgid "Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds" msgstr "%(local)s nach %(remote)s gestreamt, dauerte %(time).2f Sekunden" @@ -908,51 +1014,51 @@ msgstr "DD.MM.YYYY HH:mm" msgid "off" msgstr "Aus" -#: src/octoprint/static/js/app/main.js:46 +#: src/octoprint/static/js/app/main.js:129 msgid "Offline" msgstr "Offline" -#: src/octoprint/static/js/app/main.js:47 +#: src/octoprint/static/js/app/main.js:130 msgid "Opening serial port" msgstr "Öffnet Serialport" -#: src/octoprint/static/js/app/main.js:48 +#: src/octoprint/static/js/app/main.js:131 msgid "Detecting serial port" msgstr "Detektiere Serialport" -#: src/octoprint/static/js/app/main.js:49 +#: src/octoprint/static/js/app/main.js:132 msgid "Detecting baudrate" msgstr "Detektiere Baudrate" -#: src/octoprint/static/js/app/main.js:50 +#: src/octoprint/static/js/app/main.js:133 msgid "Connecting" msgstr "Verbinde" -#: src/octoprint/static/js/app/main.js:51 +#: src/octoprint/static/js/app/main.js:134 msgid "Operational" msgstr "Bereit" -#: src/octoprint/static/js/app/main.js:52 +#: src/octoprint/static/js/app/main.js:135 msgid "Printing from SD" msgstr "Drucke von SD" -#: src/octoprint/static/js/app/main.js:53 +#: src/octoprint/static/js/app/main.js:136 msgid "Sending file to SD" msgstr "Sende Datei zu SD" -#: src/octoprint/static/js/app/main.js:54 +#: src/octoprint/static/js/app/main.js:137 msgid "Printing" msgstr "Drucke" -#: src/octoprint/static/js/app/main.js:55 +#: src/octoprint/static/js/app/main.js:138 msgid "Paused" msgstr "Pausiert" -#: src/octoprint/static/js/app/main.js:56 +#: src/octoprint/static/js/app/main.js:139 msgid "Closed" msgstr "Geschlossen" -#: src/octoprint/static/js/app/main.js:57 +#: src/octoprint/static/js/app/main.js:140 msgid "Transfering file to SD" msgstr "Sende Datei zu SD" @@ -965,15 +1071,15 @@ msgstr "Verbinden" msgid "Disconnect" msgstr "Trennen" -#: src/octoprint/static/js/app/viewmodels/control.js:60 +#: src/octoprint/static/js/app/viewmodels/control.js:64 #: src/octoprint/static/js/app/viewmodels/files.js:330 -#: src/octoprint/static/js/app/viewmodels/gcode.js:453 +#: src/octoprint/static/js/app/viewmodels/gcode.js:467 #: src/octoprint/static/js/app/viewmodels/printerstate.js:167 #: src/octoprint/static/js/app/viewmodels/temperature.js:58 msgid "Tool" msgstr "Werkzeug" -#: src/octoprint/static/js/app/viewmodels/control.js:67 +#: src/octoprint/static/js/app/viewmodels/control.js:71 #: src/octoprint/static/js/app/viewmodels/temperature.js:70 msgid "Hotend" msgstr "Hotend" @@ -1023,60 +1129,60 @@ msgstr "Speichere ..." msgid "If you disable Access Control and your OctoPrint installation is accessible from the internet, your printer will be accessible by everyone - that also includes the bad guys!" msgstr "Wenn Du die Zugangsbeschränkung deaktivierst und Deine OctoPrint Installation vom Internet aus erreichbar ist, kann jeder auf Deinen Drucker zugreifen - auch die bösen Jungs!" -#: src/octoprint/static/js/app/viewmodels/gcode.js:14 +#: src/octoprint/static/js/app/viewmodels/gcode.js:18 msgid "Loading..." msgstr "Lade..." -#: src/octoprint/static/js/app/viewmodels/gcode.js:18 +#: src/octoprint/static/js/app/viewmodels/gcode.js:22 msgid "Analyzing..." msgstr "Analysiere..." -#: src/octoprint/static/js/app/viewmodels/gcode.js:22 +#: src/octoprint/static/js/app/viewmodels/gcode.js:26 msgid "Analyzed" msgstr "Analysiert" -#: src/octoprint/static/js/app/viewmodels/gcode.js:420 +#: src/octoprint/static/js/app/viewmodels/gcode.js:434 msgid "Model size" msgstr "Modelgröße" -#: src/octoprint/static/js/app/viewmodels/gcode.js:421 +#: src/octoprint/static/js/app/viewmodels/gcode.js:435 msgid "Estimated layer height" msgstr "Geschätzte Schichthöhe" -#: src/octoprint/static/js/app/viewmodels/gcode.js:421 +#: src/octoprint/static/js/app/viewmodels/gcode.js:435 msgid "mm" msgstr "mm" -#: src/octoprint/static/js/app/viewmodels/gcode.js:422 +#: src/octoprint/static/js/app/viewmodels/gcode.js:436 msgid "Layer count" msgstr "Schichtanzahl" -#: src/octoprint/static/js/app/viewmodels/gcode.js:422 +#: src/octoprint/static/js/app/viewmodels/gcode.js:436 msgid "printed" msgstr "gedruckt" -#: src/octoprint/static/js/app/viewmodels/gcode.js:422 +#: src/octoprint/static/js/app/viewmodels/gcode.js:436 msgid "visited" msgstr "besucht" -#: src/octoprint/static/js/app/viewmodels/gcode.js:445 +#: src/octoprint/static/js/app/viewmodels/gcode.js:459 msgid "Layer number" msgstr "Schichtnummer" -#: src/octoprint/static/js/app/viewmodels/gcode.js:446 +#: src/octoprint/static/js/app/viewmodels/gcode.js:460 msgid "Layer height" msgstr "Schichthöhe" -#: src/octoprint/static/js/app/viewmodels/gcode.js:447 +#: src/octoprint/static/js/app/viewmodels/gcode.js:461 msgid "GCODE commands in layer" msgstr "GCODE Befehle in Schicht" -#: src/octoprint/static/js/app/viewmodels/gcode.js:450 -#: src/octoprint/static/js/app/viewmodels/gcode.js:453 +#: src/octoprint/static/js/app/viewmodels/gcode.js:464 +#: src/octoprint/static/js/app/viewmodels/gcode.js:467 msgid "Filament used by layer" msgstr "Genutztes Filament in Schicht" -#: src/octoprint/static/js/app/viewmodels/gcode.js:457 +#: src/octoprint/static/js/app/viewmodels/gcode.js:471 msgid "Print time for layer" msgstr "Druckdauer für Schicht" @@ -1244,18 +1350,18 @@ msgid "Pause" msgstr "Pause" #: src/octoprint/static/js/app/viewmodels/printerstate.js:96 -#: src/octoprint/templates/tabs/timelapse.jinja2:10 +#: src/octoprint/templates/tabs/timelapse.jinja2:11 msgid "On Z Change" msgstr "Bei Ebenenwechsel" #: src/octoprint/static/js/app/viewmodels/printerstate.js:98 -#: src/octoprint/templates/tabs/timelapse.jinja2:11 +#: src/octoprint/templates/tabs/timelapse.jinja2:10 msgid "Timed" msgstr "Nach Zeit" #: src/octoprint/static/js/app/viewmodels/printerstate.js:98 -#: src/octoprint/templates/tabs/timelapse.jinja2:24 -#: src/octoprint/templates/tabs/timelapse.jinja2:31 +#: src/octoprint/templates/tabs/timelapse.jinja2:25 +#: src/octoprint/templates/tabs/timelapse.jinja2:32 msgid "sec" msgstr "Sek" @@ -1295,39 +1401,49 @@ msgid "Slicing %(filename)s" msgstr "Slice %(filename)s" #: src/octoprint/static/js/app/viewmodels/temperature.js:23 -#: src/octoprint/static/js/app/viewmodels/temperature.js:76 +#: src/octoprint/static/js/app/viewmodels/temperature.js:78 #: src/octoprint/templates/dialogs/settings/temperatures.jinja2:16 msgid "Bed" msgstr "Bett" -#: src/octoprint/static/js/app/viewmodels/temperature.js:115 +#: src/octoprint/static/js/app/viewmodels/temperature.js:121 msgid "just now" msgstr "gerade eben" -#: src/octoprint/static/js/app/viewmodels/temperature.js:117 +#: src/octoprint/static/js/app/viewmodels/temperature.js:123 msgid "min" msgstr "Min" -#: src/octoprint/static/js/app/viewmodels/temperature.js:263 +#: src/octoprint/static/js/app/viewmodels/temperature.js:264 #: src/octoprint/templates/tabs/temperature.jinja2:11 msgid "Actual" msgstr "Ist" -#: src/octoprint/static/js/app/viewmodels/temperature.js:268 +#: src/octoprint/static/js/app/viewmodels/temperature.js:269 #: src/octoprint/templates/tabs/temperature.jinja2:12 msgid "Target" msgstr "Soll" -#: src/octoprint/static/js/app/viewmodels/terminal.js:59 +#: src/octoprint/static/js/app/viewmodels/terminal.js:61 #, python-format -msgid "showing %(displayed)d lines" -msgstr "zeige %(displayed)d Zeilen" +msgid "showing %(displayed)d lines (%(filtered)d of %(total)d total lines filtered, buffer full)" +msgstr "zeige %(displayed)d Zeilen (%(filtered)d von %(total)d Zeilen gefiltert, Buffer voll)" -#: src/octoprint/static/js/app/viewmodels/terminal.js:61 +#: src/octoprint/static/js/app/viewmodels/terminal.js:63 #, python-format msgid "showing %(displayed)d lines (%(filtered)d of %(total)d total lines filtered)" msgstr "zeige %(displayed)d Zeilen (%(filtered)d von %(total)d Zeilen gefiltert)" +#: src/octoprint/static/js/app/viewmodels/terminal.js:67 +#, python-format +msgid "showing %(displayed)d lines (buffer full)" +msgstr "zeige %(displayed)d Zeilen (Buffer voll)" + +#: src/octoprint/static/js/app/viewmodels/terminal.js:69 +#, python-format +msgid "showing %(displayed)d lines" +msgstr "zeige %(displayed)d Zeilen" + #: src/octoprint/static/js/app/viewmodels/usersettings.js:10 msgid "Site default" msgstr "Seitenvoreinstellung" @@ -1521,7 +1637,7 @@ msgstr "Admin" #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:7 #: src/octoprint/templates/dialogs/settings/logs.jinja2:15 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:7 -#: src/octoprint/templates/tabs/timelapse.jinja2:56 +#: src/octoprint/templates/tabs/timelapse.jinja2:57 msgid "Action" msgstr "Aktion" @@ -1797,8 +1913,8 @@ msgstr "Änderungsdatum" #: src/octoprint/templates/dialogs/settings/logs.jinja2:13 #: src/octoprint/templates/sidebar/files.jinja2:10 #: src/octoprint/templates/sidebar/files.jinja2:24 -#: src/octoprint/templates/tabs/timelapse.jinja2:49 -#: src/octoprint/templates/tabs/timelapse.jinja2:55 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 +#: src/octoprint/templates/tabs/timelapse.jinja2:56 msgid "Size" msgstr "Größe" @@ -2468,35 +2584,43 @@ msgstr "Zeitraffermodus" msgid "Do not use with spiralized (\"Joris\") vases or similar continuous Z models." msgstr "Nicht mit spiralisierten Vasen (\"Joris\") oder ähnlichen Modellen mit ständigen Z-Achsen-Änderungen verwenden." -#: src/octoprint/templates/tabs/timelapse.jinja2:15 +#: src/octoprint/templates/tabs/timelapse.jinja2:14 +msgid "Note" +msgstr "Bemerkung" + +#: src/octoprint/templates/tabs/timelapse.jinja2:14 +msgid "Does not work when printing from the printer's SD Card (no way to detect the change in Z reliably). Use \"Timed\" mode for those prints instead." +msgstr "Funktioniert nicht, wenn von der SD-Karte des Druckers gedruckt wird (keine Möglichkeit, Änderungen der Z-Achse zuverlässig zu detektieren). Verwende stattdessen den \"Nach Zeit\"-Modus für solche Drucke." + +#: src/octoprint/templates/tabs/timelapse.jinja2:16 msgid "Timelapse frame rate (in frames per second)" msgstr "Zeitrafferbildrate (in Bildern pro Sekunde)" -#: src/octoprint/templates/tabs/timelapse.jinja2:18 +#: src/octoprint/templates/tabs/timelapse.jinja2:19 msgid "fps" msgstr "FPS" -#: src/octoprint/templates/tabs/timelapse.jinja2:21 +#: src/octoprint/templates/tabs/timelapse.jinja2:22 msgid "Timelapse post roll (in rendered seconds)" msgstr "Zeitraffernachlauf (in gerenderten Sekunden)" -#: src/octoprint/templates/tabs/timelapse.jinja2:28 +#: src/octoprint/templates/tabs/timelapse.jinja2:29 msgid "Interval" msgstr "Intervall" -#: src/octoprint/templates/tabs/timelapse.jinja2:37 +#: src/octoprint/templates/tabs/timelapse.jinja2:38 msgid "Save as default" msgstr "Als Standard speichern" -#: src/octoprint/templates/tabs/timelapse.jinja2:42 +#: src/octoprint/templates/tabs/timelapse.jinja2:43 msgid "Save config" msgstr "Konfiguration speichern" -#: src/octoprint/templates/tabs/timelapse.jinja2:46 +#: src/octoprint/templates/tabs/timelapse.jinja2:47 msgid "Finished Timelapses" msgstr "Abgeschlossene Zeitraffer" -#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 msgid "Creation date" msgstr "Erstellungsdatum" @@ -2556,3 +2680,12 @@ msgstr "Erstellungsdatum" #~ msgid "Swallow the first \"ok\" after a resend response" #~ msgstr "Erstes \"ok\" nach Resend ignorieren" + +#~ msgid "CuraEngine" +#~ msgstr "CuraEngine" + +#~ msgid "Restart successful!" +#~ msgstr "Neustart erfolgreich!" + +#~ msgid "The server was restarted successfully. The page will now reload automatically." +#~ msgstr "Der Server wurde erfolgreich neu gestartet. Die Seite wird nun automatisch neu geladen." diff --git a/translations/messages.pot b/translations/messages.pot index e5a10bf43..ce58d5c6b 100644 --- a/translations/messages.pot +++ b/translations/messages.pot @@ -6,115 +6,141 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: OctoPrint 1.2.5-dev-57-g8ed0bef-dirty\n" +"Project-Id-Version: OctoPrint 1.2.8.dev50+gb8283b2\n" "Report-Msgid-Bugs-To: i18n@octoprint.org\n" -"POT-Creation-Date: 2015-08-31 10:04+0200\n" +"POT-Creation-Date: 2015-12-01 11:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" - -#: src/octoprint/plugins/cura/__init__.py:43 -msgid "CuraEngine" -msgstr "" +"Generated-By: Babel 2.1.1\n" #: src/octoprint/plugins/cura/templates/cura_settings.jinja2:1 #: src/octoprint/templates/tabs/control.jinja2:98 msgid "General" msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:5 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:3 +msgid "" +"\n" +" Specify the path to the CuraEngine binary. Note that only\n" +" versions up to and including 15.04 are supported.\n" +" CuraEngine version 15.06 or newer is not\n" +" compatible with this plugin.\n" +msgstr "" + +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:12 msgid "Path to CuraEngine" msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:13 -msgid "Log the output of CuraEngine to plugin_cura_engine.log" +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:20 +msgid "Log the output of CuraEngine to plugin_cura_engine.log" msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:19 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:26 msgid "Profiles" msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:22 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:29 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 -#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 msgid "Sort by" msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:22 -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:27 -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:76 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:29 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:34 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:87 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:51 msgid "Identifier" msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:22 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:75 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:29 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:105 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 #: src/octoprint/templates/sidebar/files_header.jinja2:6 -#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 msgid "ascending" msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:22 -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:28 -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:82 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:14 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:29 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:35 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:93 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:38 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:4 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 #: src/octoprint/templates/dialogs/settings/logs.jinja2:12 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:5 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:44 #: src/octoprint/templates/dialogs/settings/terminalfilters.jinja2:3 -#: src/octoprint/templates/tabs/timelapse.jinja2:49 -#: src/octoprint/templates/tabs/timelapse.jinja2:54 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 +#: src/octoprint/templates/tabs/timelapse.jinja2:55 msgid "Name" msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:29 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:15 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:36 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:39 msgid "Actions" msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:37 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:44 msgid "Make default" msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:37 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:44 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:15 msgid "Delete Profile" msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:54 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:61 msgid "Import Profile..." msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:59 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:64 +#, python-format +msgid "" +"For more information on configuration and usage please see the Plugin's " +"homepage." +msgstr "" + +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:70 msgid "Import Existing Cura Profile" msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:64 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:75 msgid "Profile ini file" msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:68 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:141 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:79 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:171 #: src/octoprint/templates/dialogs/settings/appearance.jinja2:83 msgid "Browse..." msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:88 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:99 msgid "Description" msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:96 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:107 msgid "Overwrite existing file" msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:103 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:113 +msgid "" +"\n" +" You can import your existing profile .ini files " +"from Cura (version up to and\n" +" including 15.04) here. Please be aware that neither the " +".json profile format\n" +" from Cura versions starting with 15.06 is supported, nor are " +"the custom Cura profile formats\n" +" that third party tools like e.g. Repetier create.\n" +" " +msgstr "" + +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:121 #: src/octoprint/templates/dialogs/usersettings.jinja2:46 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:80 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:109 @@ -123,7 +149,7 @@ msgstr "" msgid "Abort" msgstr "" -#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:104 +#: src/octoprint/plugins/cura/templates/cura_settings.jinja2:122 #: src/octoprint/templates/dialogs/usersettings.jinja2:47 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:81 #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:110 @@ -132,251 +158,251 @@ msgstr "" msgid "Confirm" msgstr "" -#: src/octoprint/plugins/pluginmanager/__init__.py:107 +#: src/octoprint/plugins/pluginmanager/__init__.py:116 msgid "Plugin Manager" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:132 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:277 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:149 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:310 msgid "Installing plugin..." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:132 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:149 msgid "Installing plugin from uploaded archive..." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:147 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:225 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:302 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:332 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:546 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:576 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:593 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:610 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:164 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:258 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:335 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:365 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:631 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:661 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:678 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:695 msgid "Something went wrong" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:148 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:226 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:303 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:333 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:165 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:259 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:336 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:366 msgid "Please consult octoprint.log for details" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:279 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:312 #, python-format msgid "Installing plugin \"%(name)s\" from %(url)s..." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:281 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:314 #, python-format msgid "Installing plugin from %(url)s..." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:284 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:317 msgid "Reinstalling plugin..." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:285 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:318 #, python-format msgid "Reinstalling plugin \"%(name)s\" from %(url)s..." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:323 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:356 msgid "Uninstalling plugin..." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:323 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:356 #, python-format msgid "Uninstalling plugin \"%(name)s\"" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:443 msgid "Reinstall" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:130 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:146 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:443 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:160 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:176 msgid "Install" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:358 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:443 msgid "Incompatible" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:376 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:461 #: src/octoprint/templates/overlays/reloadui.jinja2:9 msgid "Reload now" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:445 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:530 msgid "Done!" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:465 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:550 msgid "Enable Plugin" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:465 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:550 msgid "Disable Plugin" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:530 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:615 msgid "Plugin installed" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:531 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:616 msgid "" "A plugin was installed successfully, however it was impossible to detect " "which one. Please Restart OctoPrint to make sure everything will be " "registered properly" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:535 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:620 #, python-format msgid "Plugin \"%(name)s\" reinstalled" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:536 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:621 msgid "The plugin was reinstalled successfully" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:537 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:622 msgid "" "The plugin was reinstalled successfully, however a restart of OctoPrint " "is needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:538 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:623 msgid "" "The plugin was reinstalled successfully, however a reload of the page is " "needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:540 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:625 #, python-format msgid "Plugin \"%(name)s\" installed" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:541 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:626 msgid "The plugin was installed successfully" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:542 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:627 msgid "" "The plugin was installed successfully, however a restart of OctoPrint is " "needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:543 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:628 msgid "" "The plugin was installed successfully, however a reload of the page is " "needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:554 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:639 #, python-format msgid "Reinstalling the plugin from URL \"%(url)s\" failed: %(reason)s" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:556 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:641 #, python-format msgid "Installing the plugin from URL \"%(url)s\" failed: %(reason)s" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:560 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:645 #, python-format msgid "" "Reinstalling the plugin from URL \"%(url)s\" failed, please see the log " "for details." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:562 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:647 #, python-format msgid "" "Installing the plugin from URL \"%(url)s\" failed, please see the log for" " details." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:571 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:656 #, python-format msgid "Plugin \"%(name)s\" uninstalled" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:572 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:657 msgid "The plugin was uninstalled successfully" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:573 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:658 msgid "" "The plugin was uninstalled successfully, however a restart of OctoPrint " "is needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:574 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:659 msgid "" "The plugin was uninstalled successfully, however a reload of the page is " "needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:578 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:663 #, python-format msgid "Uninstalling the plugin failed: %(reason)s" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:580 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:665 msgid "Uninstalling the plugin failed, please see the log for details." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:588 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:673 #, python-format msgid "Plugin \"%(name)s\" enabled" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:589 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:674 msgid "The plugin was enabled successfully." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:590 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:675 msgid "" "The plugin was enabled successfully, however a restart of OctoPrint is " "needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:591 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:676 msgid "" "The plugin was enabled successfully, however a reload of the page is " "needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:595 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:612 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:680 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:697 #, python-format msgid "Toggling the plugin failed: %(reason)s" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:597 -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:614 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:682 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:699 msgid "Toggling the plugin failed, please see the log for details." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:605 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:690 #, python-format msgid "Plugin \"%(name)s\" disabled" msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:606 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:691 msgid "The plugin was disabled successfully." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:607 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:692 msgid "" "The plugin was disabled successfully, however a restart of OctoPrint is " "needed for that to take effect." msgstr "" -#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:608 +#: src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js:693 msgid "" "The plugin was disabled successfully, however a reload of the page is " "needed for that to take effect." @@ -388,128 +414,222 @@ msgid "" " printer is printing." msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:9 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:8 +msgid "" +"\n" +" The pip command could not be found.\n" +" Please configure it manually. No installation and uninstallation of " +"plugin\n" +" packages is possible while pip is unavailable.\n" +msgstr "" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:16 +msgid "" +"\n" +" The pip command is configured to use sudo. " +"This\n" +" is not recommended due to security reasons. It is " +"strongly\n" +" suggested you install OctoPrint under a\n" +" user-" +"owned virtual environment\n" +" so that the use of sudo is not needed for plugin " +"management.\n" +msgstr "" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:30 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:204 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:20 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:72 +msgid "Plugin Configuration" +msgstr "" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:33 msgid "Installed Plugins" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:21 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:45 msgid "Bundled" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:24 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:99 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:48 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:129 #: src/octoprint/templates/index.jinja2:118 msgid "Homepage" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:31 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:55 msgid "Uninstall Plugin" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:48 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:72 msgid "Get More..." msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:59 -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:167 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:87 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:197 #: src/octoprint/templates/dialogs/settings/appearance.jinja2:96 msgid "Close" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:66 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:94 msgid "Install new Plugins..." msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:71 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:101 #, python-format msgid "... from the Plugin Repository" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:75 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:105 msgid "Sort by title" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:76 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:106 msgid "Sort by publication date" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:76 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:106 #: src/octoprint/templates/dialogs/settings/logs.jinja2:6 #: src/octoprint/templates/sidebar/files_header.jinja2:7 #: src/octoprint/templates/sidebar/files_header.jinja2:8 -#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 msgid "descending" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:78 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:108 msgid "Only show uninstalled plugins" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:79 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:109 msgid "Only show compatible plugins" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:81 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:111 msgid "Refresh list from repository" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:87 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:117 #: src/octoprint/templates/sidebar/files.jinja2:2 msgid "Search..." msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:98 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:128 msgid "Details" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:115 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:145 msgid "Sadly the repository is currently not available" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:118 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:148 msgid "Is your OctoPrint installation connected to the internet?" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:123 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:153 msgid "... from URL" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:128 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:158 msgid "Enter URL..." msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:132 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:162 msgid "This does not look like a valid \"http://\" or \"https://\" URL." msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:135 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:165 msgid "... from an uploaded archive" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:148 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:178 msgid "" "This does not look like a valid plugin archive. Valid plugin archives " "should be either zip files or tarballs and have the extension \".zip\", " "\".tar.gz\", \".tgz\" or \".tar\"" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:152 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:182 #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:62 #: src/octoprint/templates/tabs/terminal.jinja2:25 msgid "Advanced options" msgstr "" -#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:158 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:188 msgid "Use --process-dependency-links with pip install" msgstr "" -#: src/octoprint/plugins/softwareupdate/__init__.py:378 +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:208 +msgid "" +"pip command to use for managing plugins. You might have to configure this" +" if auto detection fails." +msgstr "" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:209 +msgid "pip command" +msgstr "" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:211 +msgid "Autodetect" +msgstr "" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:212 +msgid "" +"Only set this if OctoPrint cannot autodetect the path to" +" pip to use for managing plugins." +msgstr "" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:215 +msgid "" +"Additional arguments for pip command. You should normally not have to " +"change this." +msgstr "" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:216 +msgid "Additional pip arguments" +msgstr "" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:221 +msgid "" +"URL of the Plugin Repository to use. You should normally not have to " +"change this." +msgstr "" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:222 +msgid "Repository URL" +msgstr "" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:227 +msgid "" +"How long to cache repository data, in minutes. You should normally not " +"have to change this." +msgstr "" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:228 +msgid "Repository cache TTL" +msgstr "" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:239 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:100 +#: src/octoprint/templates/dialogs/confirmation.jinja2:11 +#: src/octoprint/templates/dialogs/settings.jinja2:51 +#: src/octoprint/templates/dialogs/slicing.jinja2:50 +#: src/octoprint/templates/sidebar/state.jinja2:19 +msgid "Cancel" +msgstr "" + +#: src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2:240 +#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101 +#: src/octoprint/templates/dialogs/settings.jinja2:52 +msgid "Save" +msgstr "" + +#: src/octoprint/plugins/softwareupdate/__init__.py:394 msgid "Software Update" msgstr "" -#: src/octoprint/plugins/softwareupdate/__init__.py:662 -#: src/octoprint/plugins/softwareupdate/__init__.py:693 -#: src/octoprint/server/views.py:149 +#: src/octoprint/plugins/softwareupdate/__init__.py:680 +#: src/octoprint/server/views.py:155 #: src/octoprint/static/js/app/viewmodels/appearance.js:11 #: src/octoprint/static/js/app/viewmodels/appearance.js:13 #: src/octoprint/static/js/app/viewmodels/appearance.js:18 @@ -525,142 +645,132 @@ msgstr "" msgid "Commit" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:145 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:147 msgid "There are updates available for the following components:" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:159 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:161 msgid "" "Those components marked with can be updated " "directly." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:162 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:164 msgid "Update Available" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:174 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:176 msgid "Ignore" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:178 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:180 msgid "" "You can make this message display again via \"Settings\" > \"Software " "Update\" > \"Check for update now\"" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:182 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:184 msgid "Update now" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:199 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:201 msgid "Everything is up-to-date" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:264 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:266 msgid "Updating..." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:265 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:267 msgid "Now updating, please wait." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:284 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:286 msgid "Update not started!" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:285 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:287 msgid "" "The update could not be started. Is it already active? Please consult the" " log for details." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:307 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:309 msgid "Can't update while printing" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:308 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:310 msgid "" "A print job is currently in progress. Updating will be prevented until it" " is done." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:312 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:314 msgid "This will update your OctoPrint installation and restart the server." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:336 -msgid "Restart successful!" -msgstr "" - -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:337 -msgid "" -"The server was restarted successfully. The page will now reload " -"automatically." -msgstr "" - -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:369 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:363 #, python-format msgid "Now updating %(name)s to %(version)s" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:377 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:371 msgid "Update successful, restarting!" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:378 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:372 msgid "The update finished successfully and the server will now be restarted." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:389 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:431 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:383 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:425 msgid "Restart failed" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:390 -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:432 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:384 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:426 msgid "" "The server apparently did not restart by itself, you'll have to do it " "manually. Please consult the log file on what went wrong." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:406 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:400 msgid "The update finished successfully, please restart OctoPrint now." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:408 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:402 msgid "The update finished successfully, please reboot the server now." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:412 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:406 msgid "Update successful, restart required!" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:425 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:419 msgid "" "Restarting OctoPrint failed, please restart it manually. You might also " "want to consult the log file on what went wrong here." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:427 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:421 msgid "" "Rebooting the server failed, please reboot it manually. You might also " "want to consult the log file on what went wrong here." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:445 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:439 msgid "Update successful!" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:446 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:440 msgid "The update finished successfully." msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:458 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:452 msgid "Update failed!" msgstr "" -#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:459 +#: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:453 msgid "" "The update did not finish successfully. Please consult the log for " "details." @@ -698,11 +808,6 @@ msgid "" "

\n" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:20 -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:72 -msgid "Plugin Configuration" -msgstr "" - #: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:23 msgid "Current versions" msgstr "" @@ -747,120 +852,107 @@ msgstr "" msgid "Version cache TTL" msgstr "" -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:100 -#: src/octoprint/templates/dialogs/confirmation.jinja2:11 -#: src/octoprint/templates/dialogs/settings.jinja2:51 -#: src/octoprint/templates/dialogs/slicing.jinja2:50 -#: src/octoprint/templates/sidebar/state.jinja2:19 -msgid "Cancel" -msgstr "" - -#: src/octoprint/plugins/softwareupdate/templates/softwareupdate_settings.jinja2:101 -#: src/octoprint/templates/dialogs/settings.jinja2:52 -msgid "Save" -msgstr "" - -#: src/octoprint/server/views.py:58 +#: src/octoprint/server/views.py:64 msgid "Plugins" msgstr "" -#: src/octoprint/server/views.py:115 +#: src/octoprint/server/views.py:121 msgid "Connection" msgstr "" -#: src/octoprint/server/views.py:116 +#: src/octoprint/server/views.py:122 msgid "State" msgstr "" -#: src/octoprint/server/views.py:117 +#: src/octoprint/server/views.py:123 msgid "Files" msgstr "" -#: src/octoprint/server/views.py:123 +#: src/octoprint/server/views.py:129 msgid "Temperature" msgstr "" -#: src/octoprint/server/views.py:124 +#: src/octoprint/server/views.py:130 msgid "Control" msgstr "" -#: src/octoprint/server/views.py:125 +#: src/octoprint/server/views.py:131 msgid "Terminal" msgstr "" -#: src/octoprint/server/views.py:128 +#: src/octoprint/server/views.py:134 msgid "GCode Viewer" msgstr "" -#: src/octoprint/server/views.py:130 +#: src/octoprint/server/views.py:136 #: src/octoprint/templates/sidebar/state.jinja2:3 msgid "Timelapse" msgstr "" -#: src/octoprint/server/views.py:135 +#: src/octoprint/server/views.py:141 msgid "Printer" msgstr "" -#: src/octoprint/server/views.py:137 +#: src/octoprint/server/views.py:143 msgid "Serial Connection" msgstr "" -#: src/octoprint/server/views.py:138 +#: src/octoprint/server/views.py:144 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:1 msgid "Printer Profiles" msgstr "" -#: src/octoprint/server/views.py:139 +#: src/octoprint/server/views.py:145 msgid "Temperatures" msgstr "" -#: src/octoprint/server/views.py:140 +#: src/octoprint/server/views.py:146 msgid "Terminal Filters" msgstr "" -#: src/octoprint/server/views.py:141 +#: src/octoprint/server/views.py:147 msgid "GCODE Scripts" msgstr "" -#: src/octoprint/server/views.py:143 src/octoprint/server/views.py:145 +#: src/octoprint/server/views.py:149 src/octoprint/server/views.py:151 msgid "Features" msgstr "" -#: src/octoprint/server/views.py:146 +#: src/octoprint/server/views.py:152 msgid "Webcam" msgstr "" -#: src/octoprint/server/views.py:147 +#: src/octoprint/server/views.py:153 msgid "API" msgstr "" -#: src/octoprint/server/views.py:151 +#: src/octoprint/server/views.py:157 #: src/octoprint/templates/dialogs/settings/folders.jinja2:2 msgid "Folders" msgstr "" -#: src/octoprint/server/views.py:152 +#: src/octoprint/server/views.py:158 msgid "Appearance" msgstr "" -#: src/octoprint/server/views.py:153 +#: src/octoprint/server/views.py:159 #: src/octoprint/templates/dialogs/settings/logs.jinja2:2 msgid "Logs" msgstr "" -#: src/octoprint/server/views.py:154 +#: src/octoprint/server/views.py:160 msgid "Server" msgstr "" -#: src/octoprint/server/views.py:157 +#: src/octoprint/server/views.py:163 msgid "Access Control" msgstr "" -#: src/octoprint/server/views.py:163 +#: src/octoprint/server/views.py:169 msgid "Access" msgstr "" -#: src/octoprint/server/views.py:164 +#: src/octoprint/server/views.py:170 msgid "Interface" msgstr "" @@ -887,71 +979,96 @@ msgid "" msgstr "" #: src/octoprint/static/js/app/dataupdater.js:169 -#: src/octoprint/static/js/app/dataupdater.js:197 +#: src/octoprint/static/js/app/dataupdater.js:222 #, python-format msgid "Slicing ... (%(percentage)d%%)" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:186 +#: src/octoprint/static/js/app/dataupdater.js:187 msgid "Rendering timelapse" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:186 +#: src/octoprint/static/js/app/dataupdater.js:187 #, python-format msgid "Now rendering timelapse %(movie_basename)s" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:188 +#: src/octoprint/static/js/app/dataupdater.js:189 msgid "Timelapse ready" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:188 +#: src/octoprint/static/js/app/dataupdater.js:189 #, python-format msgid "New timelapse %(movie_basename)s is done rendering." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:190 +#: src/octoprint/static/js/app/dataupdater.js:191 #, python-format msgid "" "Rendering of timelapse %(movie_basename)s failed with return code " "%(returncode)s" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:192 +#: src/octoprint/static/js/app/dataupdater.js:194 msgid "Rendering failed" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:199 +#: src/octoprint/static/js/app/dataupdater.js:200 +msgid "Capturing timelapse postroll" +msgstr "" + +#: src/octoprint/static/js/app/dataupdater.js:204 +msgid "Now capturing timelapse post roll, this will take only a moment..." +msgstr "" + +#: src/octoprint/static/js/app/dataupdater.js:207 +#, python-format +msgid "%(minutes)d min" +msgstr "" + +#: src/octoprint/static/js/app/dataupdater.js:209 +#, python-format +msgid "%(seconds)d sec" +msgstr "" + +#: src/octoprint/static/js/app/dataupdater.js:211 +#, python-format +msgid "" +"Now capturing timelapse post roll, this will take approximately " +"%(duration)s..." +msgstr "" + +#: src/octoprint/static/js/app/dataupdater.js:224 msgid "Slicing ..." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:205 +#: src/octoprint/static/js/app/dataupdater.js:230 msgid "Slicing done" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:205 +#: src/octoprint/static/js/app/dataupdater.js:230 #, python-format msgid "Sliced %(stl)s to %(gcode)s, took %(time).2f seconds" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:215 +#: src/octoprint/static/js/app/dataupdater.js:240 #, python-format msgid "Could not slice %(stl)s to %(gcode)s: %(reason)s" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:216 +#: src/octoprint/static/js/app/dataupdater.js:241 msgid "Slicing failed" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:220 +#: src/octoprint/static/js/app/dataupdater.js:245 msgid "Streaming ..." msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:226 +#: src/octoprint/static/js/app/dataupdater.js:251 msgid "Streaming done" msgstr "" -#: src/octoprint/static/js/app/dataupdater.js:227 +#: src/octoprint/static/js/app/dataupdater.js:252 #, python-format msgid "Streamed %(local)s to %(remote)s on SD, took %(time).2f seconds" msgstr "" @@ -970,51 +1087,51 @@ msgstr "" msgid "off" msgstr "" -#: src/octoprint/static/js/app/main.js:46 +#: src/octoprint/static/js/app/main.js:129 msgid "Offline" msgstr "" -#: src/octoprint/static/js/app/main.js:47 +#: src/octoprint/static/js/app/main.js:130 msgid "Opening serial port" msgstr "" -#: src/octoprint/static/js/app/main.js:48 +#: src/octoprint/static/js/app/main.js:131 msgid "Detecting serial port" msgstr "" -#: src/octoprint/static/js/app/main.js:49 +#: src/octoprint/static/js/app/main.js:132 msgid "Detecting baudrate" msgstr "" -#: src/octoprint/static/js/app/main.js:50 +#: src/octoprint/static/js/app/main.js:133 msgid "Connecting" msgstr "" -#: src/octoprint/static/js/app/main.js:51 +#: src/octoprint/static/js/app/main.js:134 msgid "Operational" msgstr "" -#: src/octoprint/static/js/app/main.js:52 +#: src/octoprint/static/js/app/main.js:135 msgid "Printing from SD" msgstr "" -#: src/octoprint/static/js/app/main.js:53 +#: src/octoprint/static/js/app/main.js:136 msgid "Sending file to SD" msgstr "" -#: src/octoprint/static/js/app/main.js:54 +#: src/octoprint/static/js/app/main.js:137 msgid "Printing" msgstr "" -#: src/octoprint/static/js/app/main.js:55 +#: src/octoprint/static/js/app/main.js:138 msgid "Paused" msgstr "" -#: src/octoprint/static/js/app/main.js:56 +#: src/octoprint/static/js/app/main.js:139 msgid "Closed" msgstr "" -#: src/octoprint/static/js/app/main.js:57 +#: src/octoprint/static/js/app/main.js:140 msgid "Transfering file to SD" msgstr "" @@ -1027,15 +1144,15 @@ msgstr "" msgid "Disconnect" msgstr "" -#: src/octoprint/static/js/app/viewmodels/control.js:60 +#: src/octoprint/static/js/app/viewmodels/control.js:64 #: src/octoprint/static/js/app/viewmodels/files.js:330 -#: src/octoprint/static/js/app/viewmodels/gcode.js:453 +#: src/octoprint/static/js/app/viewmodels/gcode.js:467 #: src/octoprint/static/js/app/viewmodels/printerstate.js:167 #: src/octoprint/static/js/app/viewmodels/temperature.js:58 msgid "Tool" msgstr "" -#: src/octoprint/static/js/app/viewmodels/control.js:67 +#: src/octoprint/static/js/app/viewmodels/control.js:71 #: src/octoprint/static/js/app/viewmodels/temperature.js:70 msgid "Hotend" msgstr "" @@ -1091,60 +1208,60 @@ msgid "" "be accessible by everyone - that also includes the bad guys!" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:14 +#: src/octoprint/static/js/app/viewmodels/gcode.js:18 msgid "Loading..." msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:18 +#: src/octoprint/static/js/app/viewmodels/gcode.js:22 msgid "Analyzing..." msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:22 +#: src/octoprint/static/js/app/viewmodels/gcode.js:26 msgid "Analyzed" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:420 +#: src/octoprint/static/js/app/viewmodels/gcode.js:434 msgid "Model size" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:421 +#: src/octoprint/static/js/app/viewmodels/gcode.js:435 msgid "Estimated layer height" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:421 +#: src/octoprint/static/js/app/viewmodels/gcode.js:435 msgid "mm" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:422 +#: src/octoprint/static/js/app/viewmodels/gcode.js:436 msgid "Layer count" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:422 +#: src/octoprint/static/js/app/viewmodels/gcode.js:436 msgid "printed" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:422 +#: src/octoprint/static/js/app/viewmodels/gcode.js:436 msgid "visited" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:445 +#: src/octoprint/static/js/app/viewmodels/gcode.js:459 msgid "Layer number" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:446 +#: src/octoprint/static/js/app/viewmodels/gcode.js:460 msgid "Layer height" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:447 +#: src/octoprint/static/js/app/viewmodels/gcode.js:461 msgid "GCODE commands in layer" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:450 -#: src/octoprint/static/js/app/viewmodels/gcode.js:453 +#: src/octoprint/static/js/app/viewmodels/gcode.js:464 +#: src/octoprint/static/js/app/viewmodels/gcode.js:467 msgid "Filament used by layer" msgstr "" -#: src/octoprint/static/js/app/viewmodels/gcode.js:457 +#: src/octoprint/static/js/app/viewmodels/gcode.js:471 msgid "Print time for layer" msgstr "" @@ -1318,18 +1435,18 @@ msgid "Pause" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerstate.js:96 -#: src/octoprint/templates/tabs/timelapse.jinja2:10 +#: src/octoprint/templates/tabs/timelapse.jinja2:11 msgid "On Z Change" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerstate.js:98 -#: src/octoprint/templates/tabs/timelapse.jinja2:11 +#: src/octoprint/templates/tabs/timelapse.jinja2:10 msgid "Timed" msgstr "" #: src/octoprint/static/js/app/viewmodels/printerstate.js:98 -#: src/octoprint/templates/tabs/timelapse.jinja2:24 -#: src/octoprint/templates/tabs/timelapse.jinja2:31 +#: src/octoprint/templates/tabs/timelapse.jinja2:25 +#: src/octoprint/templates/tabs/timelapse.jinja2:32 msgid "sec" msgstr "" @@ -1369,41 +1486,53 @@ msgid "Slicing %(filename)s" msgstr "" #: src/octoprint/static/js/app/viewmodels/temperature.js:23 -#: src/octoprint/static/js/app/viewmodels/temperature.js:76 +#: src/octoprint/static/js/app/viewmodels/temperature.js:78 #: src/octoprint/templates/dialogs/settings/temperatures.jinja2:16 msgid "Bed" msgstr "" -#: src/octoprint/static/js/app/viewmodels/temperature.js:115 +#: src/octoprint/static/js/app/viewmodels/temperature.js:121 msgid "just now" msgstr "" -#: src/octoprint/static/js/app/viewmodels/temperature.js:117 +#: src/octoprint/static/js/app/viewmodels/temperature.js:123 msgid "min" msgstr "" -#: src/octoprint/static/js/app/viewmodels/temperature.js:263 +#: src/octoprint/static/js/app/viewmodels/temperature.js:264 #: src/octoprint/templates/tabs/temperature.jinja2:11 msgid "Actual" msgstr "" -#: src/octoprint/static/js/app/viewmodels/temperature.js:268 +#: src/octoprint/static/js/app/viewmodels/temperature.js:269 #: src/octoprint/templates/tabs/temperature.jinja2:12 msgid "Target" msgstr "" -#: src/octoprint/static/js/app/viewmodels/terminal.js:59 +#: src/octoprint/static/js/app/viewmodels/terminal.js:61 #, python-format -msgid "showing %(displayed)d lines" +msgid "" +"showing %(displayed)d lines (%(filtered)d of %(total)d total lines " +"filtered, buffer full)" msgstr "" -#: src/octoprint/static/js/app/viewmodels/terminal.js:61 +#: src/octoprint/static/js/app/viewmodels/terminal.js:63 #, python-format msgid "" "showing %(displayed)d lines (%(filtered)d of %(total)d total lines " "filtered)" msgstr "" +#: src/octoprint/static/js/app/viewmodels/terminal.js:67 +#, python-format +msgid "showing %(displayed)d lines (buffer full)" +msgstr "" + +#: src/octoprint/static/js/app/viewmodels/terminal.js:69 +#, python-format +msgid "showing %(displayed)d lines" +msgstr "" + #: src/octoprint/static/js/app/viewmodels/usersettings.js:10 msgid "Site default" msgstr "" @@ -1591,7 +1720,7 @@ msgstr "" #: src/octoprint/templates/dialogs/settings/accesscontrol.jinja2:7 #: src/octoprint/templates/dialogs/settings/logs.jinja2:15 #: src/octoprint/templates/dialogs/settings/printerprofiles.jinja2:7 -#: src/octoprint/templates/tabs/timelapse.jinja2:56 +#: src/octoprint/templates/tabs/timelapse.jinja2:57 msgid "Action" msgstr "" @@ -1883,8 +2012,8 @@ msgstr "" #: src/octoprint/templates/dialogs/settings/logs.jinja2:13 #: src/octoprint/templates/sidebar/files.jinja2:10 #: src/octoprint/templates/sidebar/files.jinja2:24 -#: src/octoprint/templates/tabs/timelapse.jinja2:49 -#: src/octoprint/templates/tabs/timelapse.jinja2:55 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 +#: src/octoprint/templates/tabs/timelapse.jinja2:56 msgid "Size" msgstr "" @@ -2594,35 +2723,45 @@ msgid "" "models." msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:15 +#: src/octoprint/templates/tabs/timelapse.jinja2:14 +msgid "Note" +msgstr "" + +#: src/octoprint/templates/tabs/timelapse.jinja2:14 +msgid "" +"Does not work when printing from the printer's SD Card (no way to detect " +"the change in Z reliably). Use \"Timed\" mode for those prints instead." +msgstr "" + +#: src/octoprint/templates/tabs/timelapse.jinja2:16 msgid "Timelapse frame rate (in frames per second)" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:18 +#: src/octoprint/templates/tabs/timelapse.jinja2:19 msgid "fps" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:21 +#: src/octoprint/templates/tabs/timelapse.jinja2:22 msgid "Timelapse post roll (in rendered seconds)" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:28 +#: src/octoprint/templates/tabs/timelapse.jinja2:29 msgid "Interval" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:37 +#: src/octoprint/templates/tabs/timelapse.jinja2:38 msgid "Save as default" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:42 +#: src/octoprint/templates/tabs/timelapse.jinja2:43 msgid "Save config" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:46 +#: src/octoprint/templates/tabs/timelapse.jinja2:47 msgid "Finished Timelapses" msgstr "" -#: src/octoprint/templates/tabs/timelapse.jinja2:49 +#: src/octoprint/templates/tabs/timelapse.jinja2:50 msgid "Creation date" msgstr "" diff --git a/versioneer.py b/versioneer.py index 27e1741c2..bfbefda1c 100644 --- a/versioneer.py +++ b/versioneer.py @@ -1,5 +1,5 @@ -# Version: 0.10 +# Version: 0.15+dev """ The Versioneer @@ -9,9 +9,13 @@ * https://github.com/warner/python-versioneer * Brian Warner * License: Public Domain -* Compatible With: python2.6, 2.7, and 3.2, 3.3 - -[![Build Status](https://travis-ci.org/warner/python-versioneer.png?branch=master)](https://travis-ci.org/warner/python-versioneer) +* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, and pypy +* [![Latest Version] +(https://pypip.in/version/versioneer/badge.svg?style=flat) +](https://pypi.python.org/pypi/versioneer/) +* [![Build Status] +(https://travis-ci.org/warner/python-versioneer.png?branch=master) +](https://travis-ci.org/warner/python-versioneer) This is a tool for managing a recorded version number in distutils-based python projects. The goal is to remove the tedious and error-prone "update @@ -23,8 +27,8 @@ ## Quick Install * `pip install versioneer` to somewhere to your $PATH -* run `versioneer-installer` in your source tree: this installs `versioneer.py` -* follow the instructions below (also in the `versioneer.py` docstring) +* add a `[versioneer]` section to your setup.cfg (see below) +* run `versioneer install` in your source tree, commit the results ## Version Identifiers @@ -42,7 +46,7 @@ * ask the VCS tool itself, e.g. "git describe" (for checkouts), which knows about recent "tags" and an absolute revision-id * the name of the directory into which the tarball was unpacked -* an expanded VCS variable ($Id$, etc) +* an expanded VCS keyword ($Id$, etc) * a `_version.py` created by some earlier build step For released software, the version identifier is closely related to a VCS @@ -53,7 +57,7 @@ enough information to help developers recreate the same tree, while also giving them an idea of roughly how old the tree is (after version 1.2, before version 1.3). Many VCS systems can report a description that captures this, -for example 'git describe --tags --dirty --always' reports things like +for example `git describe --tags --dirty --always` reports things like "0.7-1-g574ab98-dirty" to indicate that the checkout is one revision past the 0.7 tag, has a unique revision id of "574ab98", and is "dirty" (it has uncommitted changes. @@ -67,33 +71,50 @@ Versioneer works by adding a special `_version.py` file into your source tree, where your `__init__.py` can import it. This `_version.py` knows how to -dynamically ask the VCS tool for version information at import time. However, -when you use "setup.py build" or "setup.py sdist", `_version.py` in the new -copy is replaced by a small static file that contains just the generated -version data. +dynamically ask the VCS tool for version information at import time. `_version.py` also contains `$Revision$` markers, and the installation process marks `_version.py` to have this marker rewritten with a tag name -during the "git archive" command. As a result, generated tarballs will +during the `git archive` command. As a result, generated tarballs will contain enough information to get the proper version. +To allow `setup.py` to compute a version too, a `versioneer.py` is added to +the top level of your source tree, next to `setup.py` and the `setup.cfg` +that configures it. This overrides several distutils/setuptools commands to +compute the version when invoked, and changes `setup.py build` and `setup.py +sdist` to replace `_version.py` with a small static file that contains just +the generated version data. ## Installation First, decide on values for the following configuration variables: +* `VCS`: the version control system you use. Currently accepts "git". + +* `style`: the style of version string to be produced. See "Styles" below for + details. Defaults to "pep440", which looks like + `TAG[+DISTANCE.gSHORTHASH[.dirty]]`. + * `versionfile_source`: A project-relative pathname into which the generated version strings should be written. This is usually a `_version.py` next to your project's main - `__init__.py` file. If your project uses `src/myproject/__init__.py`, this - should be `src/myproject/_version.py`. This file should be checked in to - your VCS as usual: the copy created below by `setup.py versioneer` will - include code that parses expanded VCS keywords in generated tarballs. The - 'build' and 'sdist' commands will replace it with a copy that has just the - calculated version string. - -* `versionfile_build`: + `__init__.py` file, so it can be imported at runtime. If your project uses + `src/myproject/__init__.py`, this should be `src/myproject/_version.py`. + This file should be checked in to your VCS as usual: the copy created below + by `setup.py setup_versioneer` will include code that parses expanded VCS + keywords in generated tarballs. The 'build' and 'sdist' commands will + replace it with a copy that has just the calculated version string. + + This must be set even if your project does not have any modules (and will + therefore never import `_version.py`), since "setup.py sdist" -based trees + still need somewhere to record the pre-calculated version strings. Anywhere + in the source tree should do. If there is a `__init__.py` next to your + `_version.py`, the `setup.py setup_versioneer` command (described below) + will append some `__version__`-setting assignments, if they aren't already + present. + +* `versionfile_build`: Like `versionfile_source`, but relative to the build directory instead of the source directory. These will differ when your setup.py uses @@ -101,49 +122,69 @@ then you will probably have `versionfile_build='myproject/_version.py'` and `versionfile_source='src/myproject/_version.py'`. + If this is set to None, then `setup.py build` will not attempt to rewrite + any `_version.py` in the built tree. If your project does not have any + libraries (e.g. if it only builds a script), then you should use + `versionfile_build = None` and override `distutils.command.build_scripts` + to explicitly insert a copy of `versioneer.get_version()` into your + generated script. + * `tag_prefix`: a string, like 'PROJECTNAME-', which appears at the start of all VCS tags. If your tags look like 'myproject-1.2.0', then you should use tag_prefix='myproject-'. If you use unprefixed tags like '1.2.0', this - should be an empty string. + should be an empty string, using either `tag_prefix=` or `tag_prefix=''`. * `parentdir_prefix`: - a string, frequently the same as tag_prefix, which appears at the start of - all unpacked tarball filenames. If your tarball unpacks into - 'myproject-1.2.0', this should be 'myproject-'. + a optional string, frequently the same as tag_prefix, which appears at the + start of all unpacked tarball filenames. If your tarball unpacks into + 'myproject-1.2.0', this should be 'myproject-'. To disable this feature, + just omit the field from your `setup.cfg`. -This tool provides one script, named `versioneer-installer`. That script does -one thing: write a copy of `versioneer.py` into the current directory. +This tool provides one script, named `versioneer`. That script has one mode, +"install", which writes a copy of `versioneer.py` into the current directory +and runs `versioneer.py setup` to finish the installation. To versioneer-enable your project: -* 1: Run `versioneer-installer` to copy `versioneer.py` into the top of your - source tree. +* 1: Modify your `setup.cfg`, adding a section named `[versioneer]` and + populating it with the configuration values you decided earlier (note that + the option names are not case-sensitive): + + ```` + [versioneer] + VCS = git + style = pep440 + versionfile_source = src/myproject/_version.py + versionfile_build = myproject/_version.py + tag_prefix = + parentdir_prefix = myproject- + ```` + +* 2: Run `versioneer install`. This will do the following: -* 2: add the following lines to the top of your `setup.py`, with the - configuration values you decided earlier: + * copy `versioneer.py` into the top of your source tree + * create `_version.py` in the right place (`versionfile_source`) + * modify your `__init__.py` (if one exists next to `_version.py`) to define + `__version__` (by calling a function from `_version.py`) + * modify your `MANIFEST.in` to include both `versioneer.py` and the + generated `_version.py` in sdist tarballs - import versioneer - versioneer.versionfile_source = 'src/myproject/_version.py' - versioneer.versionfile_build = 'myproject/_version.py' - versioneer.tag_prefix = '' # tags are like 1.2.0 - versioneer.parentdir_prefix = 'myproject-' # dirname like 'myproject-1.2.0' + `versioneer install` will complain about any problems it finds with your + `setup.py` or `setup.cfg`. Run it multiple times until you have fixed all + the problems. -* 3: add the following arguments to the setup() call in your setup.py: +* 3: add a `import versioneer` to your setup.py, and add the following + arguments to the setup() call: version=versioneer.get_version(), cmdclass=versioneer.get_cmdclass(), -* 4: now run `setup.py versioneer`, which will create `_version.py`, and - will modify your `__init__.py` to define `__version__` (by calling a - function from `_version.py`). It will also modify your `MANIFEST.in` to - include both `versioneer.py` and the generated `_version.py` in sdist - tarballs. - -* 5: commit these changes to your VCS. To make sure you won't forget, - `setup.py versioneer` will mark everything it touched for addition. +* 4: commit these changes to your VCS. To make sure you won't forget, + `versioneer install` will mark everything it touched for addition using + `git add`. Don't forget to add `setup.py` and `setup.cfg` too. ## Post-Installation Usage @@ -163,9 +204,8 @@ * 1: git tag 1.0 * 2: git push; git push --tags -Currently, all version strings must be based upon a tag. Versioneer will -report "unknown" until your tree has at least one tag in its history. This -restriction will be fixed eventually (see issue #12). +Versioneer will report "0+untagged.NUMCOMMITS.gHASH" until your tree has at +least one tag in its history. ## Version-String Flavors @@ -174,52 +214,116 @@ `get_versions()` function. From the "outside" (e.g. in `setup.py`), you can import the top-level `versioneer.py` and run `get_versions()`. -Both functions return a dictionary with different keys for different flavors -of the version string: +Both functions return a dictionary with different flavors of version +information: + +* `['version']`: A condensed version string, rendered using the selected + style. This is the most commonly used value for the project's version + string. The default "pep440" style yields strings like `0.11`, + `0.11+2.g1076c97`, or `0.11+2.g1076c97.dirty`. See the "Styles" section + below for alternative styles. + +* `['full-revisionid']`: detailed revision identifier. For Git, this is the + full SHA1 commit id, e.g. "1076c978a8d3cfc70f408fe5974aa6c092c949ac". + +* `['dirty']`: a boolean, True if the tree has uncommitted changes. Note that + this is only accurate if run in a VCS checkout, otherwise it is likely to + be False or None -* `['version']`: condensed tag+distance+shortid+dirty identifier. For git, - this uses the output of `git describe --tags --dirty --always` but strips - the tag_prefix. For example "0.11-2-g1076c97-dirty" indicates that the tree - is like the "1076c97" commit but has uncommitted changes ("-dirty"), and - that this commit is two revisions ("-2-") beyond the "0.11" tag. For - released software (exactly equal to a known tag), the identifier will only - contain the stripped tag, e.g. "0.11". +* `['error']`: if the version string could not be computed, this will be set + to a string describing the problem, otherwise it will be None. It may be + useful to throw an exception in setup.py if this is set, to avoid e.g. + creating tarballs with a version string of "unknown". -* `['full']`: detailed revision identifier. For Git, this is the full SHA1 - commit id, followed by "-dirty" if the tree contains uncommitted changes, - e.g. "1076c978a8d3cfc70f408fe5974aa6c092c949ac-dirty". +If the underlying VCS supports it and that information is available, this will +also be included: -Some variants are more useful than others. Including `full` in a bug report -should allow developers to reconstruct the exact code being tested (or -indicate the presence of local changes that should be shared with the +* `['branch']`: A string with the VCS branch name the version was built on. + +Some variants are more useful than others. Including `full-revisionid` in a +bug report should allow developers to reconstruct the exact code being tested +(or indicate the presence of local changes that should be shared with the developers). `version` is suitable for display in an "about" box or a CLI `--version` output: it can be easily compared against release notes and lists -of bugs fixed in various releases. - -In the future, this will also include a -[PEP-0440](http://legacy.python.org/dev/peps/pep-0440/) -compatible flavor -(e.g. `1.2.post0.dev123`). This loses a lot of information (and has no room -for a hash-based revision id), but is safe to use in a `setup.py` -"`version=`" argument. It also enables tools like *pip* to compare version -strings and evaluate compatibility constraint declarations. +of bugs fixed in various releases. Augmenting that with the `branch` +information if it is available will give additional hints during bug reporting +what kind of setup a user was running. -The `setup.py versioneer` command adds the following text to your -`__init__.py` to place a basic version in `YOURPROJECT.__version__`: +The installer adds the following text to your `__init__.py` to place a basic +version in `YOURPROJECT.__version__`: from ._version import get_versions - __version = get_versions()['version'] + __version__ = get_versions()['version'] del get_versions +## Styles + +The setup.cfg `style=` configuration controls how the VCS information is +rendered into a version string. + +The default style, "pep440", produces a PEP440-compliant string, equal to the +un-prefixed tag name for actual releases, and containing an additional "local +version" section with more detail for in-between builds. For Git, this is +TAG[+DISTANCE.gHEX[.dirty]] , using information from `git describe --tags +--dirty --always`. For example "0.11+2.g1076c97.dirty" indicates that the +tree is like the "1076c97" commit but has uncommitted changes (".dirty"), and +that this commit is two revisions ("+2") beyond the "0.11" tag. For released +software (exactly equal to a known tag), the identifier will only contain the +stripped tag, e.g. "0.11". + +Other styles are available. See details.md in the Versioneer source tree for +descriptions. + +## Debugging + +Versioneer tries to avoid fatal errors: if something goes wrong, it will tend +to return a version of "0+unknown". To investigate the problem, run `setup.py +version`, which will run the version-lookup code in a verbose mode, and will +display the full contents of `get_versions()` (including the `error` string, +which may help identify what went wrong). + ## Updating Versioneer To upgrade your project to a new release of Versioneer, do the following: * install the new Versioneer (`pip install -U versioneer` or equivalent) -* re-run `versioneer-installer` in your source tree to replace `versioneer.py` -* edit `setup.py`, if necessary, to include any new configuration settings indicated by the release notes -* re-run `setup.py versioneer` to replace `SRC/_version.py` +* edit `setup.cfg`, if necessary, to include any new configuration settings + indicated by the release notes +* re-run `versioneer install` in your source tree, to replace + `SRC/_version.py` * commit any changed files +### Upgrading to 0.15 + +Starting with this version, Versioneer is configured with a `[versioneer]` +section in your `setup.cfg` file. Earlier versions required the `setup.py` to +set attributes on the `versioneer` module immediately after import. The new +version will refuse to run (raising an exception during import) until you +have provided the necessary `setup.cfg` section. + +In addition, the Versioneer package provides an executable named +`versioneer`, and the installation process is driven by running `versioneer +install`. In 0.14 and earlier, the executable was named +`versioneer-installer` and was run without an argument. + +### Upgrading to 0.14 + +0.14 changes the format of the version string. 0.13 and earlier used +hyphen-separated strings like "0.11-2-g1076c97-dirty". 0.14 and beyond use a +plus-separated "local version" section strings, with dot-separated +components, like "0.11+2.g1076c97". PEP440-strict tools did not like the old +format, but should be ok with the new one. + +### Upgrading from 0.11 to 0.12 + +Nothing special. + +### Upgrading from 0.10 to 0.11 + +You must add a `versioneer.VCS = "git"` to your `setup.py` before re-running +`setup.py setup_versioneer`. This will enable the use of additional +version-control systems (SVN, etc) in the future. + ## Future Directions This tool is designed to make it easily extended to other version-control @@ -236,52 +340,221 @@ ## License -To make Versioneer easier to embed, all its code is hereby released into the -public domain. The `_version.py` that it creates is also in the public -domain. +To make Versioneer easier to embed, all its code is dedicated to the public +domain. The `_version.py` that it creates is also in the public domain. +Specifically, both are released under the Creative Commons "Public Domain +Dedication" license (CC0-1.0), as described in +https://creativecommons.org/publicdomain/zero/1.0/ . """ -import os, sys, re -from distutils.core import Command -from distutils.command.sdist import sdist as _sdist -from distutils.command.build import build as _build -from distutils.command.build_py import build_py as _build_py +from __future__ import print_function +try: + import configparser +except ImportError: + import ConfigParser as configparser +import errno +import json +import os +import re +import subprocess +import sys + + +class VersioneerConfig: + pass + + +def get_root(): + # we require that all commands are run from the project root, i.e. the + # directory that contains setup.py, setup.cfg, and versioneer.py . + root = os.path.realpath(os.path.abspath(os.getcwd())) + setup_py = os.path.join(root, "setup.py") + versioneer_py = os.path.join(root, "versioneer.py") + if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): + # allow 'python path/to/setup.py COMMAND' + root = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0]))) + setup_py = os.path.join(root, "setup.py") + versioneer_py = os.path.join(root, "versioneer.py") + if not (os.path.exists(setup_py) or os.path.exists(versioneer_py)): + err = ("Versioneer was unable to run the project root directory. " + "Versioneer requires setup.py to be executed from " + "its immediate directory (like 'python setup.py COMMAND'), " + "or in a way that lets it use sys.argv[0] to find the root " + "(like 'python path/to/setup.py COMMAND').") + raise VersioneerBadRootError(err) + try: + # Certain runtime workflows (setup.py install/develop in a setuptools + # tree) execute all dependencies in a single python process, so + # "versioneer" may be imported multiple times, and python's shared + # module-import table will cache the first one. So we can't use + # os.path.dirname(__file__), as that will find whichever + # versioneer.py was first imported, even in later projects. + me = os.path.realpath(os.path.abspath(__file__)) + if os.path.splitext(me)[0] != os.path.splitext(versioneer_py)[0]: + print("Warning: build in %s is using versioneer.py from %s" + % (os.path.dirname(me), versioneer_py)) + except NameError: + pass + return root + + +def get_config_from_root(root): + # This might raise EnvironmentError (if setup.cfg is missing), or + # configparser.NoSectionError (if it lacks a [versioneer] section), or + # configparser.NoOptionError (if it lacks "VCS="). See the docstring at + # the top of versioneer.py for instructions on writing your setup.cfg . + setup_cfg = os.path.join(root, "setup.cfg") + parser = configparser.SafeConfigParser() + with open(setup_cfg, "r") as f: + parser.readfp(f) + VCS = parser.get("versioneer", "VCS") # mandatory + + def get(parser, name): + if parser.has_option("versioneer", name): + return parser.get("versioneer", name) + return None + cfg = VersioneerConfig() + cfg.VCS = VCS + cfg.style = get(parser, "style") or "" + cfg.versionfile_source = get(parser, "versionfile_source") + cfg.versionfile_build = get(parser, "versionfile_build") + cfg.tag_prefix = get(parser, "tag_prefix") + if cfg.tag_prefix in ("''", '""'): + cfg.tag_prefix = "" + cfg.parentdir_prefix = get(parser, "parentdir_prefix") + cfg.verbose = get(parser, "verbose") + cfg.lookupfile = get(parser, "lookupfile") + return cfg -versionfile_source = None -versionfile_build = None -tag_prefix = None -parentdir_prefix = None -lookupfile = None -VCS = "git" +class NotThisMethod(Exception): + pass +# these dictionaries contain VCS-specific tools +LONG_VERSION_PY = {} +HANDLERS = {} -LONG_VERSION_PY = ''' + +def register_vcs_handler(vcs, method): # decorator + def decorate(f): + if vcs not in HANDLERS: + HANDLERS[vcs] = {} + HANDLERS[vcs][method] = f + return f + return decorate + + +def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False): + """Call the given command(s).""" + assert isinstance(commands, list) + p = None + for c in commands: + try: + dispcmd = str([c] + args) + # remember shell=False, so use git.cmd on windows, not just git + p = subprocess.Popen([c] + args, cwd=cwd, stdout=subprocess.PIPE, + stderr=(subprocess.PIPE if hide_stderr + else None)) + break + except EnvironmentError: + e = sys.exc_info()[1] + if e.errno == errno.ENOENT: + continue + if verbose: + print("unable to run %s" % dispcmd) + print(e) + return None + else: + if verbose: + print("unable to find command, tried %s" % (commands,)) + return None + stdout = p.communicate()[0].strip() + if sys.version_info[0] >= 3: + stdout = stdout.decode() + if p.returncode != 0: + if verbose: + print("unable to run %s (error)" % dispcmd) + return None + return stdout +LONG_VERSION_PY['git'] = ''' # This file helps to compute a version number in source trees obtained from # git-archive tarball (such as those provided by githubs download-from-tag -# feature). Distribution tarballs (build by setup.py sdist) and build +# feature). Distribution tarballs (built by setup.py sdist) and build # directories (produced by setup.py build) will contain a much shorter file # that just contains the computed version number. # This file is released into the public domain. Generated by -# versioneer-0.10 (https://github.com/warner/python-versioneer) - -# these strings will be replaced by git during git-archive -git_refnames = "%(DOLLAR)sFormat:%%d%(DOLLAR)s" -git_full = "%(DOLLAR)sFormat:%%H%(DOLLAR)s" +# versioneer-0.15+dev (https://github.com/warner/python-versioneer) +"""Git implementation of _version.py.""" +import errno +import os +import re import subprocess import sys -import errno + + +def get_keywords(): + """Get the keywords needed to look up the version information.""" + # these strings will be replaced by git during git-archive. + # setup.py/versioneer.py will grep for the variable names, so they must + # each be defined on a line of their own. _version.py will just call + # get_keywords(). + git_refnames = "%(DOLLAR)sFormat:%%d%(DOLLAR)s" + git_full = "%(DOLLAR)sFormat:%%H%(DOLLAR)s" + keywords = {"refnames": git_refnames, "full": git_full} + return keywords + + +class VersioneerConfig: + + """Container for Versioneer configuration parameters.""" + + +def get_config(): + """Create, populate and return the VersioneerConfig() object.""" + # these strings are filled in when 'setup.py versioneer' creates + # _version.py + cfg = VersioneerConfig() + cfg.VCS = "git" + cfg.style = "%(STYLE)s" + cfg.tag_prefix = "%(TAG_PREFIX)s" + cfg.parentdir_prefix = "%(PARENTDIR_PREFIX)s" + cfg.versionfile_source = "%(VERSIONFILE_SOURCE)s" + cfg.lookupfile = None + cfg.verbose = False + return cfg + + +class NotThisMethod(Exception): + + """Exception raised if a method is not valid for the current scenario.""" + + +LONG_VERSION_PY = {} +HANDLERS = {} + + +def register_vcs_handler(vcs, method): # decorator + """Decorator to mark a method as the handler for a particular VCS.""" + def decorate(f): + """Store f in HANDLERS[vcs][method].""" + if vcs not in HANDLERS: + HANDLERS[vcs] = {} + HANDLERS[vcs][method] = f + return f + return decorate def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False): + """Call the given command(s).""" assert isinstance(commands, list) p = None for c in commands: try: + dispcmd = str([c] + args) # remember shell=False, so use git.cmd on windows, not just git p = subprocess.Popen([c] + args, cwd=cwd, stdout=subprocess.PIPE, stderr=(subprocess.PIPE if hide_stderr @@ -292,7 +565,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False): if e.errno == errno.ENOENT: continue if verbose: - print("unable to run %%s" %% args[0]) + print("unable to run %%s" %% dispcmd) print(e) return None else: @@ -300,59 +573,67 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False): print("unable to find command, tried %%s" %% (commands,)) return None stdout = p.communicate()[0].strip() - if sys.version >= '3': + if sys.version_info[0] >= 3: stdout = stdout.decode() if p.returncode != 0: if verbose: - print("unable to run %%s (error)" %% args[0]) + print("unable to run %%s (error)" %% dispcmd) return None return stdout -import sys -import re -import os.path +def versions_from_parentdir(parentdir_prefix, root, verbose): + """Try to determine the version from the parent directory name. -def get_gits(root, verbose=False): - if not os.path.exists(os.path.join(root, ".git")): + Source tarballs conventionally unpack into a directory that includes + both the project name and a version string. + """ + dirname = os.path.basename(root) + if not dirname.startswith(parentdir_prefix): if verbose: - print("no .git in %%s" %% root) - return None - - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - return GITS + print("guessing rootdir is '%%s', but '%%s' doesn't start with " + "prefix '%%s'" %% (root, dirname, parentdir_prefix)) + raise NotThisMethod("rootdir doesn't start with parentdir_prefix") + return {"version": dirname[len(parentdir_prefix):], + "full-revisionid": None, + "dirty": False, "error": None} -def get_expanded_variables(versionfile_abs): +@register_vcs_handler("git", "get_keywords") +def git_get_keywords(versionfile_abs): + """Extract version information from the given file.""" # the code embedded in _version.py can just fetch the value of these - # variables. When used from setup.py, we don't want to import - # _version.py, so we do it with a regexp instead. This function is not - # used from _version.py. - variables = {} + # keywords. When used from setup.py, we don't want to import _version.py, + # so we do it with a regexp instead. This function is not used from + # _version.py. + keywords = {} try: - f = open(versionfile_abs,"r") + f = open(versionfile_abs, "r") for line in f.readlines(): if line.strip().startswith("git_refnames ="): mo = re.search(r'=\s*"(.*)"', line) if mo: - variables["refnames"] = mo.group(1) + keywords["refnames"] = mo.group(1) if line.strip().startswith("git_full ="): mo = re.search(r'=\s*"(.*)"', line) if mo: - variables["full"] = mo.group(1) + keywords["full"] = mo.group(1) f.close() except EnvironmentError: pass - return variables + return keywords + -def versions_from_expanded_variables(variables, tag_prefix, verbose=False): - refnames = variables["refnames"].strip() +@register_vcs_handler("git", "keywords") +def git_versions_from_keywords(keywords, tag_prefix, verbose): + """Get version information from git keywords.""" + if not keywords: + raise NotThisMethod("no keywords at all, weird") + refnames = keywords["refnames"].strip() if refnames.startswith("$Format"): if verbose: - print("variables are unexpanded, not using") - return {} # unexpanded, so not in an unpacked git-archive tarball + print("keywords are unexpanded, not using") + raise NotThisMethod("unexpanded keywords, not a git-archive tarball") refs = set([r.strip() for r in refnames.strip("()").split(",")]) # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of # just "foo-1.0". If we see a "tag: " prefix, prefer those. @@ -370,15 +651,13 @@ def versions_from_expanded_variables(variables, tag_prefix, verbose=False): if verbose: print("discarding '%%s', no digits" %% ",".join(refs-tags)) - branches = [r for r in refs if not r.startswith(TAG) and r != "HEAD" and not r.startswith("refs/")] + branches = [r for r in refs if not r.startswith(TAG) + and r != "HEAD" and not r.startswith("refs/")] + if verbose: + print("likely branches: %%s" %% ",".join(sorted(branches))) + branch = None if branches: branch = branches[0] - else: - branch = "unknown" - - if verbose: - print("likely tags: %s" % ",".join(sorted(tags))) - print("likely branches: %s" % ",".join(sorted(branches))) if verbose: print("likely tags: %%s" %% ",".join(sorted(tags))) @@ -388,250 +667,515 @@ def versions_from_expanded_variables(variables, tag_prefix, verbose=False): r = ref[len(tag_prefix):] if verbose: print("picking %%s" %% r) - return { "version": r, - "full": variables["full"].strip(), - "branch": branch} - # no suitable tags, so we use the full revision id + + result = {"version": r, + "full-revisionid": keywords["full"].strip(), + "dirty": False, "error": None} + if branch is not None: + result["branch"] = branch + return result + # no suitable tags, so version is "0+unknown", but full hex is still there if verbose: - print("no suitable tags, using full revision id") - return { "version": variables["full"].strip(), - "full": variables["full"].strip(), - "branch": "unknown"} + print("no suitable tags, using unknown + full revision id") + return {"version": "0+unknown", + "full-revisionid": keywords["full"].strip(), + "dirty": False, "error": "no suitable tags"} + + +@register_vcs_handler("git", "pieces_from_vcs") +def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): + """Get version from 'git describe' in the root of the source tree. + + This only gets called if the git-archive 'subst' keywords were *not* + expanded, and _version.py hasn't already been rewritten with a short + version string, meaning we're inside a checked out source tree. + """ + if not os.path.exists(os.path.join(root, ".git")): + if verbose: + print("no .git in %%s" %% root) + raise NotThisMethod("no .git directory") -def versions_from_lookup(lookup, root, verbose=False): - GITS = get_gits(root, verbose=verbose) - if GITS is None: - return {} + GITS = ["git"] + if sys.platform == "win32": + GITS = ["git.cmd", "git.exe"] + # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] + # if there isn't one, this yields HEX[-dirty] (no NUM) + describe_out = run_command(GITS, ["describe", "--tags", "--dirty", + "--always", "--long", + "--match", "%%s*" %% tag_prefix], + cwd=root) + # --long was added in git-1.5.5 + if describe_out is None: + raise NotThisMethod("'git describe' failed") + describe_out = describe_out.strip() + full_out = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) + if full_out is None: + raise NotThisMethod("'git rev-parse' failed") + full_out = full_out.strip() + + pieces = {} + pieces["long"] = full_out + pieces["short"] = full_out[:7] # maybe improved later + pieces["error"] = None + + # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] + # TAG might have hyphens. + git_describe = describe_out + + # look for -dirty suffix + dirty = git_describe.endswith("-dirty") + pieces["dirty"] = dirty + if dirty: + git_describe = git_describe[:git_describe.rindex("-dirty")] + + # figure out our branch + abbrev_ref_out = run_command(GITS, + ["rev-parse", "--abbrev-ref", "HEAD"], + cwd=root) + if abbrev_ref_out is not None: + pieces["branch"] = abbrev_ref_out.strip() + + # now we have TAG-NUM-gHEX or HEX + + if "-" in git_describe: + # TAG-NUM-gHEX + mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) + if not mo: + # unparseable. Maybe git-describe is misbehaving? + pieces["error"] = ("unable to parse git-describe output: '%%s'" + %% describe_out) + return pieces + + # tag + full_tag = mo.group(1) + if not full_tag.startswith(tag_prefix): + if verbose: + fmt = "tag '%%s' doesn't start with prefix '%%s'" + print(fmt %% (full_tag, tag_prefix)) + pieces["error"] = ("tag '%%s' doesn't start with prefix '%%s'" + %% (full_tag, tag_prefix)) + return pieces + pieces["closest-tag"] = full_tag[len(tag_prefix):] + + # distance: number of commits since tag + pieces["distance"] = int(mo.group(2)) + + # commit: short hex revision ID + pieces["short"] = mo.group(3) + + else: + # HEX: no tags + pieces["closest-tag"] = None + count_out = run_command(GITS, ["rev-list", "HEAD", "--count"], + cwd=root) + pieces["distance"] = int(count_out) # total number of commits + + return pieces + + +@register_vcs_handler("git", "parse_lookup_file") +def git_parse_lookup_file(path): + """Parse a versioneer lookup file. + + This file allows definition of branch specific data like virtual tags or + custom styles to use for version rendering. + """ + if not os.path.exists(path): + return [] + + import re + lookup = [] + with open(path, "r") as f: + for line in f: + if '#' in line: + line = line[:line.rindex("#")] + line = line.strip() + if not line: + continue + + try: + split_line = map(lambda x: x.strip(), line.split()) + if not len(split_line): + continue + + matcher = re.compile(split_line[0]) + + if len(split_line) == 1: + entry = [matcher, None, None, None] + elif len(split_line) == 2: + render = split_line[1] + entry = [matcher, render, None, None] + elif len(split_line) == 3: + tag, ref_commit = split_line[1:] + entry = [matcher, None, tag, ref_commit] + elif len(split_line) == 4: + tag, ref_commit, render = split_line[1:] + entry = [matcher, render, tag, ref_commit] + else: + continue + + lookup.append(entry) + except: + break + return lookup + + +@register_vcs_handler("git", "pieces_from_lookup") +def git_pieces_from_lookup(lookup, root, verbose, run_command=run_command): + """Extract version information based on provided lookup data.""" + GITS = ["git"] + if sys.platform == "win32": + GITS = ["git.cmd", "git.exe"] stdout = run_command(GITS, ["rev-parse", "--abbrev-ref", "HEAD"], cwd=root) if stdout is None: - return {} + raise NotThisMethod("git rev-parse --abbrev-ref HEAD failed") current_branch = stdout.strip() - for matcher, tag, ref_commit in lookup: + for matcher, render, tag, ref_commit in lookup: if matcher.match(current_branch): if tag is None or ref_commit is None: - return {} + raise NotThisMethod("tag or ref_commit is unset for " + "this branch") - stdout = run_command(GITS, ["rev-list", "%%s..HEAD" %% ref_commit, "--count"], cwd=root) + stdout = run_command(GITS, + ["rev-list", "%%s..HEAD" %% ref_commit, + "--count"], + cwd=root) if stdout is None: - return {} - num_commits = stdout.strip() - - stdout =run_command(GITS, ["rev-parse", "--short", "HEAD"], cwd=root) + raise NotThisMethod("git rev-list %%s..HEAD " + "--count failed" %% ref_commit) + try: + num_commits = int(stdout.strip()) + except ValueError: + raise NotThisMethod("git rev-list %%s..HEAD --count didn't " + "return a valid number" %% ref_commit) + + stdout = run_command(GITS, + ["rev-parse", "--short", "HEAD"], + cwd=root) if stdout is None: - return {} + raise NotThisMethod("git describe rev-parse " + "--short HEAD failed") short_hash = stdout.strip() - stdout = run_command(GITS, ["describe", "--tags", "--dirty", "--always"], cwd=root) + stdout = run_command(GITS, + ["describe", "--tags", + "--dirty", "--always"], + cwd=root) if stdout is None: - return {} + raise NotThisMethod("git describe --tags --dirty " + "--always failed") dirty = stdout.strip().endswith("-dirty") stdout = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) if stdout is None: - return {} + raise NotThisMethod("git rev-parse HEAD failed") full = stdout.strip() - version = "%%s-%%s-g%%s" %% (tag, num_commits, short_hash) - if dirty: - version += "-dirty" - full += "-dirty" - return {"version": version, "full": full, "branch": current_branch} + return { + "long": full, + "short": short_hash, + "dirty": dirty, + "branch": current_branch, + "closest-tag": tag, + "distance": num_commits, + "error": None, + "render": render + } - return {} + raise NotThisMethod("no matching lookup definition found") -def versions_from_vcs(tag_prefix, root, verbose=False): - # this runs 'git' from the root of the source tree. This only gets called - # if the git-archive 'subst' variables were *not* expanded, and - # _version.py hasn't already been rewritten with a short version string, - # meaning we're inside a checked out source tree. - GITS = get_gits(root, verbose=verbose) - if GITS is None: - return {} +def plus_or_dot(pieces): + """Return a + if we don't already have one, else return a .""" + if "+" in pieces.get("closest-tag", ""): + return "." + return "+" - stdout = run_command(GITS, ["describe", "--tags", "--dirty", "--always"], - cwd=root) - if stdout is None: - return {} - if not stdout.startswith(tag_prefix): - if verbose: - print("tag '%%s' doesn't start with prefix '%%s'" %% (stdout, tag_prefix)) - return {} - tag = stdout[len(tag_prefix):] - stdout = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if stdout is None: - return {} - full = stdout.strip() - if tag.endswith("-dirty"): - full += "-dirty" - stdout = run_command(GITS, ["rev-parse", "--abbrev-ref", "HEAD"], - cwd=root) - if stdout is None: - branch = None +def render_pep440(pieces): + """Build up version string, with post-release "local version identifier". + + Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you + get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty + + Exceptions: + 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"] or pieces["dirty"]: + rendered += plus_or_dot(pieces) + rendered += "%%d.g%%s" %% (pieces["distance"], pieces["short"]) + if pieces["dirty"]: + rendered += ".dirty" + else: + # exception #1 + rendered = "0+untagged.%%d.g%%s" %% (pieces["distance"], + pieces["short"]) + if pieces["dirty"]: + rendered += ".dirty" + return rendered + + +def render_pep440_pre(pieces): + """TAG[.post.devDISTANCE] -- No -dirty. + + Exceptions: + 1: no tags. 0.post.devDISTANCE + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"]: + rendered += ".post.dev%%d" %% pieces["distance"] + else: + # exception #1 + rendered = "0.post.dev%%d" %% pieces["distance"] + return rendered + + +def render_pep440_post(pieces): + """TAG[.postDISTANCE[.dev0]+gHEX] . + + The ".dev0" means dirty. Note that .dev0 sorts backwards + (a dirty tree will appear "older" than the corresponding clean one), + but you shouldn't be releasing software with -dirty anyways. + + Exceptions: + 1: no tags. 0.postDISTANCE[.dev0] + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"] or pieces["dirty"]: + rendered += ".post%%d" %% pieces["distance"] + if pieces["dirty"]: + rendered += ".dev0" + rendered += plus_or_dot(pieces) + rendered += "g%%s" %% pieces["short"] else: - branch = stdout.strip() - return {"version": tag, "full": full, "branch": branch} + # exception #1 + rendered = "0.post%%d" %% pieces["distance"] + if pieces["dirty"]: + rendered += ".dev0" + rendered += "+g%%s" %% pieces["short"] + return rendered + + +def render_pep440_dev(pieces): + """TAG[.devDISTANCE]+gHEX[.dirty] . + + Exceptions: + 1: no tags. 0.devDISTANCE+gHEX[.dirty] + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"]: + rendered += ".dev%%d" %% pieces["distance"] + rendered += plus_or_dot(pieces) + else: + # exception #1 + rendered = "0.dev%%d" %% pieces["distance"] + rendered += "+" + rendered += "g%%s" %% pieces["short"] + if pieces["dirty"]: + rendered += ".dirty" + return rendered + + +def render_pep440_old(pieces): + """TAG[.postDISTANCE[.dev0]] . + + The ".dev0" means dirty. + + Eexceptions: + 1: no tags. 0.postDISTANCE[.dev0] + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"] or pieces["dirty"]: + rendered += ".post%%d" %% pieces["distance"] + if pieces["dirty"]: + rendered += ".dev0" + else: + # exception #1 + rendered = "0.post%%d" %% pieces["distance"] + if pieces["dirty"]: + rendered += ".dev0" + return rendered -def versions_from_parentdir(parentdir_prefix, root, verbose=False): - # Source tarballs conventionally unpack into a directory that includes - # both the project name and a version string. - dirname = os.path.basename(root) - if not dirname.startswith(parentdir_prefix): - if verbose: - print("guessing rootdir is '%%s', but '%%s' doesn't start with prefix '%%s'" %% - (root, dirname, parentdir_prefix)) - return None - return {"version": dirname[len(parentdir_prefix):], "full": "", "branch": ""} +def render_git_describe(pieces): + """TAG[-DISTANCE-gHEX][-dirty]. -tag_prefix = "%(TAG_PREFIX)s" -parentdir_prefix = "%(PARENTDIR_PREFIX)s" -versionfile_source = "%(VERSIONFILE_SOURCE)s" -lookupfile = %(LOOKUPFILE)s + Like 'git describe --tags --dirty --always'. -def parse_lookup_file(root, lookup_path=None): - if not lookup_path: - lookup_path = lookupfile - if not lookup_path: - return [] + Exceptions: + 1: no tags. HEX[-dirty] (note: no 'g' prefix) + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"]: + rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"]) + else: + # exception #1 + rendered = pieces["short"] + if pieces["dirty"]: + rendered += "-dirty" + return rendered - path = os.path.join(root, lookup_path) - if not os.path.exists(path): - return [] - import re - lookup = [] - with open(os.path.join(root, lookup_path), "r") as f: - for line in f: - if '#' in line: - line = line[:line.rindex('#')] - line = line.strip() - try: - split_line = line.split() - if len(split_line) == 3: - pattern, tag, ref_commit = split_line - lookup.append([re.compile(pattern), tag, ref_commit]) - elif len(split_line) >= 1: - lookup.append([re.compile(split_line[0]), None, None]) - except: - break - return lookup +def render_git_describe_long(pieces): + """TAG-DISTANCE-gHEX[-dirty]. + + Like 'git describe --tags --dirty --always -long'. + The distance/hash is unconditional. -def get_versions(default={"version": "unknown", "full": "", "branch": "unknown"}, lookup_path=None, verbose=False): + Exceptions: + 1: no tags. HEX[-dirty] (note: no 'g' prefix) + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + rendered += "-%%d-g%%s" %% (pieces["distance"], pieces["short"]) + else: + # exception #1 + rendered = pieces["short"] + if pieces["dirty"]: + rendered += "-dirty" + return rendered + + +def render(pieces, style): + """Render the given version pieces into the requested style.""" + if pieces["error"]: + return {"version": "unknown", + "full-revisionid": pieces.get("long"), + "dirty": None, + "error": pieces["error"]} + + if "render" in pieces and pieces["render"] is not None: + style = pieces["render"] + + if not style or style == "default": + style = "pep440" # the default + + if style == "pep440": + rendered = render_pep440(pieces) + elif style == "pep440-pre": + rendered = render_pep440_pre(pieces) + elif style == "pep440-post": + rendered = render_pep440_post(pieces) + elif style == "pep440-old": + rendered = render_pep440_old(pieces) + elif style == "pep440-dev": + rendered = render_pep440_dev(pieces) + elif style == "git-describe": + rendered = render_git_describe(pieces) + elif style == "git-describe-long": + rendered = render_git_describe_long(pieces) + else: + raise ValueError("unknown style '%%s'" %% style) + + result = {"version": rendered, "full-revisionid": pieces["long"], + "dirty": pieces["dirty"], "error": None} + if "branch" in pieces and pieces["branch"] is not None: + result["branch"] = pieces["branch"] + return result + + +def get_versions(): + """Get version information or return default if unable to do so.""" # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have # __file__, we can work backwards from there to the root. Some # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which - # case we can only use expanded variables. + # case we can only use expanded keywords. - variables = { "refnames": git_refnames, "full": git_full } - ver = versions_from_expanded_variables(variables, tag_prefix, verbose) - if ver: - return ver + cfg = get_config() + verbose = cfg.verbose try: - root = os.path.abspath(__file__) + return git_versions_from_keywords(get_keywords(), cfg.tag_prefix, + verbose) + except NotThisMethod: + pass + + try: + root = os.path.realpath(__file__) # versionfile_source is the relative path from the top of the source # tree (where the .git directory might live) to this file. Invert # this to find the root from __file__. - for i in range(len(versionfile_source.split("/"))): + for i in cfg.versionfile_source.split('/'): root = os.path.dirname(root) except NameError: - return default - - lookup = parse_lookup_file(root, lookup_path=lookup_path) - return (versions_from_lookup(lookup, root, verbose) - or versions_from_vcs(tag_prefix, root, verbose) - or versions_from_parentdir(parentdir_prefix, root, verbose) - or default) - -''' - - -import subprocess -import sys -import errno - - -def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False): - assert isinstance(commands, list) - p = None - for c in commands: + return {"version": "0+unknown", "full-revisionid": None, + "dirty": None, + "error": "unable to find root of source tree"} + + lookupfile = cfg.lookupfile if cfg.lookupfile is not None \ + else ".versioneer-lookup" + lookuppath = os.path.join(root, lookupfile) + if os.path.exists(lookuppath): try: - # remember shell=False, so use git.cmd on windows, not just git - p = subprocess.Popen([c] + args, cwd=cwd, stdout=subprocess.PIPE, - stderr=(subprocess.PIPE if hide_stderr - else None)) - break - except EnvironmentError: - e = sys.exc_info()[1] - if e.errno == errno.ENOENT: - continue - if verbose: - print("unable to run %s" % args[0]) - print(e) - return None - else: - if verbose: - print("unable to find command, tried %s" % (commands,)) - return None - stdout = p.communicate()[0].strip() - if sys.version >= '3': - stdout = stdout.decode() - if p.returncode != 0: - if verbose: - print("unable to run %s (error)" % args[0]) - return None - return stdout - + lookup_data = git_parse_lookup_file(lookuppath) + pieces = git_pieces_from_lookup(lookup_data, root, verbose) + return render(pieces, cfg.style) + except NotThisMethod: + pass -import sys -import re -import os.path + try: + pieces = git_pieces_from_vcs(cfg.tag_prefix, root, verbose) + return render(pieces, cfg.style) + except NotThisMethod: + pass -def get_gits(root, verbose=False): - if not os.path.exists(os.path.join(root, ".git")): - if verbose: - print("no .git in %s" % root) - return None + try: + if cfg.parentdir_prefix: + return versions_from_parentdir(cfg.parentdir_prefix, root, verbose) + except NotThisMethod: + pass - GITS = ["git"] - if sys.platform == "win32": - GITS = ["git.cmd", "git.exe"] - return GITS + return {"version": "0+unknown", "full-revisionid": None, + "dirty": None, + "error": "unable to compute version"} +''' -def get_expanded_variables(versionfile_abs): +@register_vcs_handler("git", "get_keywords") +def git_get_keywords(versionfile_abs): + """Extract version information from the given file.""" # the code embedded in _version.py can just fetch the value of these - # variables. When used from setup.py, we don't want to import - # _version.py, so we do it with a regexp instead. This function is not - # used from _version.py. - variables = {} + # keywords. When used from setup.py, we don't want to import _version.py, + # so we do it with a regexp instead. This function is not used from + # _version.py. + keywords = {} try: - f = open(versionfile_abs,"r") + f = open(versionfile_abs, "r") for line in f.readlines(): if line.strip().startswith("git_refnames ="): mo = re.search(r'=\s*"(.*)"', line) if mo: - variables["refnames"] = mo.group(1) + keywords["refnames"] = mo.group(1) if line.strip().startswith("git_full ="): mo = re.search(r'=\s*"(.*)"', line) if mo: - variables["full"] = mo.group(1) + keywords["full"] = mo.group(1) f.close() except EnvironmentError: pass - return variables + return keywords + -def versions_from_expanded_variables(variables, tag_prefix, verbose=False): - refnames = variables["refnames"].strip() +@register_vcs_handler("git", "keywords") +def git_versions_from_keywords(keywords, tag_prefix, verbose): + """Get version information from git keywords.""" + if not keywords: + raise NotThisMethod("no keywords at all, weird") + refnames = keywords["refnames"].strip() if refnames.startswith("$Format"): if verbose: - print("variables are unexpanded, not using") - return {} # unexpanded, so not in an unpacked git-archive tarball + print("keywords are unexpanded, not using") + raise NotThisMethod("unexpanded keywords, not a git-archive tarball") refs = set([r.strip() for r in refnames.strip("()").split(",")]) # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of # just "foo-1.0". If we see a "tag: " prefix, prefer those. @@ -649,154 +1193,255 @@ def versions_from_expanded_variables(variables, tag_prefix, verbose=False): if verbose: print("discarding '%s', no digits" % ",".join(refs-tags)) - branches = [r for r in refs if not r.startswith(TAG) and r != "HEAD" and not r.startswith("refs/")] + branches = [r for r in refs if not r.startswith(TAG) + and r != "HEAD" and not r.startswith("refs/")] + if verbose: + print("likely branches: %s" % ",".join(sorted(branches))) + branch = None if branches: branch = branches[0] - else: - branch = "unknown" if verbose: print("likely tags: %s" % ",".join(sorted(tags))) - print("likely branches: %s" % ",".join(sorted(branches))) - for ref in sorted(tags): # sorting will prefer e.g. "2.0" over "2.0rc1" if ref.startswith(tag_prefix): r = ref[len(tag_prefix):] if verbose: print("picking %s" % r) - return { "version": r, - "full": variables["full"].strip(), - "branch": branch } - # no suitable tags, so we use the full revision id + + result = {"version": r, + "full-revisionid": keywords["full"].strip(), + "dirty": False, "error": None} + if branch is not None: + result["branch"] = branch + return result + # no suitable tags, so version is "0+unknown", but full hex is still there if verbose: - print("no suitable tags, using full revision id") - return { "version": variables["full"].strip(), - "full": variables["full"].strip(), - "branch": "unknown"} + print("no suitable tags, using unknown + full revision id") + return {"version": "0+unknown", + "full-revisionid": keywords["full"].strip(), + "dirty": False, "error": "no suitable tags"} -def versions_from_lookup(lookup, root, verbose=False): - GITS = get_gits(root, verbose=verbose) - if GITS is None: - return {} +@register_vcs_handler("git", "pieces_from_vcs") +def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command): + """Get version from 'git describe' in the root of the source tree. - stdout = run_command(GITS, ["rev-parse", "--abbrev-ref", "HEAD"], - cwd=root) - if stdout is None: - return {} + This only gets called if the git-archive 'subst' keywords were *not* + expanded, and _version.py hasn't already been rewritten with a short + version string, meaning we're inside a checked out source tree. + """ + if not os.path.exists(os.path.join(root, ".git")): + if verbose: + print("no .git in %s" % root) + raise NotThisMethod("no .git directory") - current_branch = stdout.strip() - for matcher, tag, ref_commit in lookup: - if matcher.match(current_branch): - if tag is None or ref_commit is None: - return {} + GITS = ["git"] + if sys.platform == "win32": + GITS = ["git.cmd", "git.exe"] + # if there is a tag matching tag_prefix, this yields TAG-NUM-gHEX[-dirty] + # if there isn't one, this yields HEX[-dirty] (no NUM) + describe_out = run_command(GITS, ["describe", "--tags", "--dirty", + "--always", "--long", + "--match", "%s*" % tag_prefix], + cwd=root) + # --long was added in git-1.5.5 + if describe_out is None: + raise NotThisMethod("'git describe' failed") + describe_out = describe_out.strip() + full_out = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) + if full_out is None: + raise NotThisMethod("'git rev-parse' failed") + full_out = full_out.strip() + + pieces = {} + pieces["long"] = full_out + pieces["short"] = full_out[:7] # maybe improved later + pieces["error"] = None + + # parse describe_out. It will be like TAG-NUM-gHEX[-dirty] or HEX[-dirty] + # TAG might have hyphens. + git_describe = describe_out + + # look for -dirty suffix + dirty = git_describe.endswith("-dirty") + pieces["dirty"] = dirty + if dirty: + git_describe = git_describe[:git_describe.rindex("-dirty")] + + # figure out our branch + abbrev_ref_out = run_command(GITS, + ["rev-parse", "--abbrev-ref", "HEAD"], + cwd=root) + if abbrev_ref_out is not None: + pieces["branch"] = abbrev_ref_out.strip() + + # now we have TAG-NUM-gHEX or HEX + + if "-" in git_describe: + # TAG-NUM-gHEX + mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe) + if not mo: + # unparseable. Maybe git-describe is misbehaving? + pieces["error"] = ("unable to parse git-describe output: '%s'" + % describe_out) + return pieces + + # tag + full_tag = mo.group(1) + if not full_tag.startswith(tag_prefix): + if verbose: + fmt = "tag '%s' doesn't start with prefix '%s'" + print(fmt % (full_tag, tag_prefix)) + pieces["error"] = ("tag '%s' doesn't start with prefix '%s'" + % (full_tag, tag_prefix)) + return pieces + pieces["closest-tag"] = full_tag[len(tag_prefix):] - stdout = run_command(GITS, ["rev-list", "%s..HEAD" % ref_commit, "--count"], cwd=root) - if stdout is None: - return {} - num_commits = stdout.strip() + # distance: number of commits since tag + pieces["distance"] = int(mo.group(2)) - stdout =run_command(GITS, ["rev-parse", "--short", "HEAD"], cwd=root) - if stdout is None: - return {} - short_hash = stdout.strip() + # commit: short hex revision ID + pieces["short"] = mo.group(3) - stdout = run_command(GITS, ["describe", "--tags", "--dirty", "--always"], cwd=root) - if stdout is None: - return {} - dirty = stdout.strip().endswith("-dirty") + else: + # HEX: no tags + pieces["closest-tag"] = None + count_out = run_command(GITS, ["rev-list", "HEAD", "--count"], + cwd=root) + pieces["distance"] = int(count_out) # total number of commits - stdout = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if stdout is None: - return {} - full = stdout.strip() + return pieces - version = "%s-%s-g%s" % (tag, num_commits, short_hash) - if dirty: - version += "-dirty" - full += "-dirty" - return {"version": version, "full": full, "branch": current_branch} - return {} +@register_vcs_handler("git", "parse_lookup_file") +def git_parse_lookup_file(path): + """Parse a versioneer lookup file. + This file allows definition of branch specific data like virtual tags or + custom styles to use for version rendering. + """ + if not os.path.exists(path): + return [] -def versions_from_vcs(tag_prefix, root, verbose=False): - # this runs 'git' from the root of the source tree. This only gets called - # if the git-archive 'subst' variables were *not* expanded, and - # _version.py hasn't already been rewritten with a short version string, - # meaning we're inside a checked out source tree. + import re + lookup = [] + with open(path, "r") as f: + for line in f: + if '#' in line: + line = line[:line.rindex("#")] + line = line.strip() + if not line: + continue - GITS = get_gits(root, verbose=verbose) - if GITS is None: - return {} + try: + split_line = map(lambda x: x.strip(), line.split()) + if not len(split_line): + continue + + matcher = re.compile(split_line[0]) + + if len(split_line) == 1: + entry = [matcher, None, None, None] + elif len(split_line) == 2: + render = split_line[1] + entry = [matcher, render, None, None] + elif len(split_line) == 3: + tag, ref_commit = split_line[1:] + entry = [matcher, None, tag, ref_commit] + elif len(split_line) == 4: + tag, ref_commit, render = split_line[1:] + entry = [matcher, render, tag, ref_commit] + else: + continue + + lookup.append(entry) + except: + break + return lookup - stdout = run_command(GITS, ["describe", "--tags", "--dirty", "--always"], - cwd=root) - if stdout is None: - return {} - if not stdout.startswith(tag_prefix): - if verbose: - print("tag '%s' doesn't start with prefix '%s'" % (stdout, tag_prefix)) - return {} - tag = stdout[len(tag_prefix):] - stdout = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) - if stdout is None: - return {} - full = stdout.strip() - if tag.endswith("-dirty"): - full += "-dirty" + +@register_vcs_handler("git", "pieces_from_lookup") +def git_pieces_from_lookup(lookup, root, verbose, run_command=run_command): + """Extract version information based on provided lookup data.""" + GITS = ["git"] + if sys.platform == "win32": + GITS = ["git.cmd", "git.exe"] stdout = run_command(GITS, ["rev-parse", "--abbrev-ref", "HEAD"], cwd=root) if stdout is None: - branch = None - else: - branch = stdout.strip() - return {"version": tag, "full": full, "branch": branch} + raise NotThisMethod("git rev-parse --abbrev-ref HEAD failed") + current_branch = stdout.strip() + for matcher, render, tag, ref_commit in lookup: + if matcher.match(current_branch): + if tag is None or ref_commit is None: + raise NotThisMethod("tag or ref_commit is unset for " + "this branch") -def versions_from_parentdir(parentdir_prefix, root, verbose=False): - # Source tarballs conventionally unpack into a directory that includes - # both the project name and a version string. - dirname = os.path.basename(root) - if not dirname.startswith(parentdir_prefix): - if verbose: - print("guessing rootdir is '%s', but '%s' doesn't start with prefix '%s'" % - (root, dirname, parentdir_prefix)) - return None - return {"version": dirname[len(parentdir_prefix):], "full": "", "branch": ""} -import os.path -import sys + stdout = run_command(GITS, + ["rev-list", "%s..HEAD" % ref_commit, + "--count"], + cwd=root) + if stdout is None: + raise NotThisMethod("git rev-list %s..HEAD " + "--count failed" % ref_commit) + try: + num_commits = int(stdout.strip()) + except ValueError: + raise NotThisMethod("git rev-list %s..HEAD --count didn't " + "return a valid number" % ref_commit) + + stdout = run_command(GITS, + ["rev-parse", "--short", "HEAD"], + cwd=root) + if stdout is None: + raise NotThisMethod("git describe rev-parse " + "--short HEAD failed") + short_hash = stdout.strip() -# os.path.relpath only appeared in Python-2.6 . Define it here for 2.5. -def os_path_relpath(path, start=os.path.curdir): - """Return a relative version of a path""" + stdout = run_command(GITS, + ["describe", "--tags", + "--dirty", "--always"], + cwd=root) + if stdout is None: + raise NotThisMethod("git describe --tags --dirty " + "--always failed") + dirty = stdout.strip().endswith("-dirty") - if not path: - raise ValueError("no path specified") + stdout = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) + if stdout is None: + raise NotThisMethod("git rev-parse HEAD failed") + full = stdout.strip() - start_list = [x for x in os.path.abspath(start).split(os.path.sep) if x] - path_list = [x for x in os.path.abspath(path).split(os.path.sep) if x] + return { + "long": full, + "short": short_hash, + "dirty": dirty, + "branch": current_branch, + "closest-tag": tag, + "distance": num_commits, + "error": None, + "render": render + } - # Work out how much of the filepath is shared by start and path. - i = len(os.path.commonprefix([start_list, path_list])) + raise NotThisMethod("no matching lookup definition found") - rel_list = [os.path.pardir] * (len(start_list)-i) + path_list[i:] - if not rel_list: - return os.path.curdir - return os.path.join(*rel_list) def do_vcs_install(manifest_in, versionfile_source, ipy): GITS = ["git"] if sys.platform == "win32": GITS = ["git.cmd", "git.exe"] - files = [manifest_in, versionfile_source, ipy] + files = [manifest_in, versionfile_source] + if ipy: + files.append(ipy) try: me = __file__ if me.endswith(".pyc") or me.endswith(".pyo"): me = os.path.splitext(me)[0] + ".py" - versioneer_file = os_path_relpath(me) + versioneer_file = os.path.relpath(me) except NameError: versioneer_file = "versioneer.py" files.append(versioneer_file) @@ -809,7 +1454,7 @@ def do_vcs_install(manifest_in, versionfile_source, ipy): present = True f.close() except EnvironmentError: - pass + pass if not present: f = open(".gitattributes", "a+") f.write("%s export-subst\n" % versionfile_source) @@ -817,221 +1462,525 @@ def do_vcs_install(manifest_in, versionfile_source, ipy): files.append(".gitattributes") run_command(GITS, ["add", "--"] + files) + +def versions_from_parentdir(parentdir_prefix, root, verbose): + """Try to determine the version from the parent directory name. + + Source tarballs conventionally unpack into a directory that includes + both the project name and a version string. + """ + dirname = os.path.basename(root) + if not dirname.startswith(parentdir_prefix): + if verbose: + print("guessing rootdir is '%s', but '%s' doesn't start with " + "prefix '%s'" % (root, dirname, parentdir_prefix)) + raise NotThisMethod("rootdir doesn't start with parentdir_prefix") + return {"version": dirname[len(parentdir_prefix):], + "full-revisionid": None, + "dirty": False, "error": None} + SHORT_VERSION_PY = """ -# This file was generated by 'versioneer.py' (0.10) from +# This file was generated by 'versioneer.py' (0.15+dev) from # revision-control system data, or from the parent directory name of an # unpacked source archive. Distribution tarballs contain a pre-generated copy # of this file. -version_version = '%(version)s' -version_full = '%(full)s' -version_branch = '%(branch)s' -def get_versions(default={}, verbose=False): - return {'version': version_version, 'full': version_full, 'branch': version_branch} +import json +import sys + +version_json = ''' +%s +''' # END VERSION_JSON + +def get_versions(): + return json.loads(version_json) """ -DEFAULT = {"version": "unknown", "full": "unknown", "branch": "unknown"} def versions_from_file(filename): - versions = {} try: - f = open(filename) + with open(filename) as f: + contents = f.read() except EnvironmentError: - return versions - for line in f.readlines(): - mo = re.match("version_version = '([^']+)'", line) - if mo: - versions["version"] = mo.group(1) - mo = re.match("version_full = '([^']+)'", line) - if mo: - versions["full"] = mo.group(1) - mo = re.match("version_branch = '([^']+)'", line) - if mo: - versions["branch"] = mo.group(1) - f.close() - return versions + raise NotThisMethod("unable to read _version.py") + mo = re.search(r"version_json = '''\n(.*)''' # END VERSION_JSON", + contents, re.M | re.S) + if not mo: + raise NotThisMethod("no version_json in _version.py") + return json.loads(mo.group(1)) + def write_to_version_file(filename, versions): - f = open(filename, "w") - f.write(SHORT_VERSION_PY % versions) - f.close() + os.unlink(filename) + contents = json.dumps(versions, sort_keys=True, + indent=1, separators=(",", ": ")) + with open(filename, "w") as f: + f.write(SHORT_VERSION_PY % contents) + print("set %s to '%s'" % (filename, versions["version"])) -def get_root(): - try: - return os.path.dirname(os.path.abspath(__file__)) - except NameError: - return os.path.dirname(os.path.abspath(sys.argv[0])) -def parse_lookup_file(root, lookup_path=None): - if not lookup_path: - lookup_path = lookupfile +def plus_or_dot(pieces): + """Return a + if we don't already have one, else return a .""" + if "+" in pieces.get("closest-tag", ""): + return "." + return "+" - path = os.path.join(root, lookup_path) - if not os.path.exists(path): - return [] - import re - lookup = [] - with open(os.path.join(root, lookup_path), "r") as f: - for line in f: - if '#' in line: - line = line[:line.rindex("#")] - line = line.strip() - try: - split_line = line.split() - if len(split_line) == 3: - pattern, tag, ref_commit = split_line - lookup.append([re.compile(pattern), tag, ref_commit]) - elif len(split_line) >= 1: - lookup.append([re.compile(split_line[0]), None, None]) - except: - break - return lookup +def render_pep440(pieces): + """Build up version string, with post-release "local version identifier". -def get_versions(default=DEFAULT, verbose=False): - # returns dict with three keys: 'version', 'full' and 'branch' - assert versionfile_source is not None, "please set versioneer.versionfile_source" - assert tag_prefix is not None, "please set versioneer.tag_prefix" - assert parentdir_prefix is not None, "please set versioneer.parentdir_prefix" - - # I am in versioneer.py, which must live at the top of the source tree, - # which we use to compute the root directory. py2exe/bbfreeze/non-CPython - # don't have __file__, in which case we fall back to sys.argv[0] (which - # ought to be the setup.py script). We prefer __file__ since that's more - # robust in cases where setup.py was invoked in some weird way (e.g. pip) - root = get_root() - versionfile_abs = os.path.join(root, versionfile_source) + Our goal: TAG[+DISTANCE.gHEX[.dirty]] . Note that if you + get a tagged build and then dirty it, you'll get TAG+0.gHEX.dirty - if lookupfile: - lookup = parse_lookup_file(root, lookup_path = lookupfile) + Exceptions: + 1: no tags. git_describe was just HEX. 0+untagged.DISTANCE.gHEX[.dirty] + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"] or pieces["dirty"]: + rendered += plus_or_dot(pieces) + rendered += "%d.g%s" % (pieces["distance"], pieces["short"]) + if pieces["dirty"]: + rendered += ".dirty" + else: + # exception #1 + rendered = "0+untagged.%d.g%s" % (pieces["distance"], + pieces["short"]) + if pieces["dirty"]: + rendered += ".dirty" + return rendered + + +def render_pep440_pre(pieces): + """TAG[.post.devDISTANCE] -- No -dirty. + + Exceptions: + 1: no tags. 0.post.devDISTANCE + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"]: + rendered += ".post.dev%d" % pieces["distance"] + else: + # exception #1 + rendered = "0.post.dev%d" % pieces["distance"] + return rendered + + +def render_pep440_post(pieces): + """TAG[.postDISTANCE[.dev0]+gHEX] . + + The ".dev0" means dirty. Note that .dev0 sorts backwards + (a dirty tree will appear "older" than the corresponding clean one), + but you shouldn't be releasing software with -dirty anyways. + + Exceptions: + 1: no tags. 0.postDISTANCE[.dev0] + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"] or pieces["dirty"]: + rendered += ".post%d" % pieces["distance"] + if pieces["dirty"]: + rendered += ".dev0" + rendered += plus_or_dot(pieces) + rendered += "g%s" % pieces["short"] else: - lookup = None - - # extract version from first of _version.py, 'git describe', parentdir. - # This is meant to work for developers using a source checkout, for users - # of a tarball created by 'setup.py sdist', and for users of a - # tarball/zipball created by 'git archive' or github's download-from-tag - # feature. - - variables = get_expanded_variables(versionfile_abs) - if variables: - ver = versions_from_expanded_variables(variables, tag_prefix) - if ver: - if verbose: print("got version from expanded variable %s" % ver) + # exception #1 + rendered = "0.post%d" % pieces["distance"] + if pieces["dirty"]: + rendered += ".dev0" + rendered += "+g%s" % pieces["short"] + return rendered + + +def render_pep440_dev(pieces): + """TAG[.devDISTANCE]+gHEX[.dirty] . + + Exceptions: + 1: no tags. 0.devDISTANCE+gHEX[.dirty] + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"]: + rendered += ".dev%d" % pieces["distance"] + rendered += plus_or_dot(pieces) + else: + # exception #1 + rendered = "0.dev%d" % pieces["distance"] + rendered += "+" + rendered += "g%s" % pieces["short"] + if pieces["dirty"]: + rendered += ".dirty" + return rendered + + +def render_pep440_old(pieces): + """TAG[.postDISTANCE[.dev0]] . + + The ".dev0" means dirty. + + Eexceptions: + 1: no tags. 0.postDISTANCE[.dev0] + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"] or pieces["dirty"]: + rendered += ".post%d" % pieces["distance"] + if pieces["dirty"]: + rendered += ".dev0" + else: + # exception #1 + rendered = "0.post%d" % pieces["distance"] + if pieces["dirty"]: + rendered += ".dev0" + return rendered + + +def render_git_describe(pieces): + """TAG[-DISTANCE-gHEX][-dirty]. + + Like 'git describe --tags --dirty --always'. + + Exceptions: + 1: no tags. HEX[-dirty] (note: no 'g' prefix) + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + if pieces["distance"]: + rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) + else: + # exception #1 + rendered = pieces["short"] + if pieces["dirty"]: + rendered += "-dirty" + return rendered + + +def render_git_describe_long(pieces): + """TAG-DISTANCE-gHEX[-dirty]. + + Like 'git describe --tags --dirty --always -long'. + The distance/hash is unconditional. + + Exceptions: + 1: no tags. HEX[-dirty] (note: no 'g' prefix) + """ + if pieces["closest-tag"]: + rendered = pieces["closest-tag"] + rendered += "-%d-g%s" % (pieces["distance"], pieces["short"]) + else: + # exception #1 + rendered = pieces["short"] + if pieces["dirty"]: + rendered += "-dirty" + return rendered + + +def render(pieces, style): + """Render the given version pieces into the requested style.""" + if pieces["error"]: + return {"version": "unknown", + "full-revisionid": pieces.get("long"), + "dirty": None, + "error": pieces["error"]} + + if "render" in pieces and pieces["render"] is not None: + style = pieces["render"] + + if not style or style == "default": + style = "pep440" # the default + + if style == "pep440": + rendered = render_pep440(pieces) + elif style == "pep440-pre": + rendered = render_pep440_pre(pieces) + elif style == "pep440-post": + rendered = render_pep440_post(pieces) + elif style == "pep440-old": + rendered = render_pep440_old(pieces) + elif style == "pep440-dev": + rendered = render_pep440_dev(pieces) + elif style == "git-describe": + rendered = render_git_describe(pieces) + elif style == "git-describe-long": + rendered = render_git_describe_long(pieces) + else: + raise ValueError("unknown style '%s'" % style) + + result = {"version": rendered, "full-revisionid": pieces["long"], + "dirty": pieces["dirty"], "error": None} + if "branch" in pieces and pieces["branch"] is not None: + result["branch"] = pieces["branch"] + return result + + +class VersioneerBadRootError(Exception): + pass + + +def get_versions(verbose=False): + # returns dict with two keys: 'version' and 'full' + + if "versioneer" in sys.modules: + # see the discussion in cmdclass.py:get_cmdclass() + del sys.modules["versioneer"] + + root = get_root() + cfg = get_config_from_root(root) + + assert cfg.VCS is not None, "please set [versioneer]VCS= in setup.cfg" + handlers = HANDLERS.get(cfg.VCS) + assert handlers, "unrecognized VCS '%s'" % cfg.VCS + verbose = verbose or cfg.verbose + assert cfg.versionfile_source is not None, \ + "please set versioneer.versionfile_source" + assert cfg.tag_prefix is not None, "please set versioneer.tag_prefix" + + versionfile_abs = os.path.join(root, cfg.versionfile_source) + + # extract version from first of: _version.py, VCS command (e.g. 'git + # describe'), parentdir. This is meant to work for developers using a + # source checkout, for users of a tarball created by 'setup.py sdist', + # and for users of a tarball/zipball created by 'git archive' or github's + # download-from-tag feature or the equivalent in other VCSes. + + get_keywords_f = handlers.get("get_keywords") + from_keywords_f = handlers.get("keywords") + if get_keywords_f and from_keywords_f: + try: + keywords = get_keywords_f(versionfile_abs) + ver = from_keywords_f(keywords, cfg.tag_prefix, verbose) + if verbose: + print("got version from expanded keyword %s" % ver) return ver + except NotThisMethod: + pass - ver = versions_from_file(versionfile_abs) - if ver: - if verbose: print("got version from file %s %s" % (versionfile_abs,ver)) + try: + ver = versions_from_file(versionfile_abs) + if verbose: + print("got version from file %s %s" % (versionfile_abs, ver)) return ver + except NotThisMethod: + pass - if lookup: - ver = versions_from_lookup(lookup, root, verbose=verbose) - if ver: - if verbose: print("got version from lookup %s" % ver) + lookupfile = cfg.lookupfile if cfg.lookupfile is not None \ + else ".versioneer-lookup" + lookuppath = os.path.join(root, lookupfile) + if os.path.exists(lookuppath): + parse_lookup_file_f = handlers.get("parse_lookup_file") + versions_from_lookup_f = handlers.get("pieces_from_lookup") + if parse_lookup_file_f and versions_from_lookup_f: + try: + lookup_data = parse_lookup_file_f(lookuppath) + pieces = versions_from_lookup_f(lookup_data, root, verbose) + ver = render(pieces, cfg.style) + if verbose: + print("got version from lookup file") + return ver + except NotThisMethod: + pass + elif verbose: + print("lookup file %s doesn't exist") + + from_vcs_f = handlers.get("pieces_from_vcs") + if from_vcs_f: + try: + pieces = from_vcs_f(cfg.tag_prefix, root, verbose) + ver = render(pieces, cfg.style) + if verbose: + print("got version from VCS %s" % ver) return ver + except NotThisMethod: + pass - ver = versions_from_vcs(tag_prefix, root, verbose) - if ver: - if verbose: print("got version from git %s" % ver) - return ver + try: + if cfg.parentdir_prefix: + ver = versions_from_parentdir(cfg.parentdir_prefix, root, verbose) + if verbose: + print("got version from parentdir %s" % ver) + return ver + except NotThisMethod: + pass - ver = versions_from_parentdir(parentdir_prefix, root, verbose) - if ver: - if verbose: print("got version from parentdir %s" % ver) - return ver + if verbose: + print("unable to compute version") - if verbose: print("got version from default %s" % ver) - return default + return {"version": "0+unknown", "full-revisionid": None, + "dirty": None, "error": "unable to compute version"} -def get_version(verbose=False): - return get_versions(verbose=verbose)["version"] -class cmd_version(Command): - description = "report generated version string" - user_options = [] - boolean_options = [] - def initialize_options(self): - pass - def finalize_options(self): - pass - def run(self): - ver = get_version(verbose=True) - print("Version is currently: %s" % ver) - -class cmd_build_py(_build_py): - def run(self): - _build_py.run(self) - - versions = get_versions(verbose=True) - # now locate _version.py in the new build/ directory and replace it - # with an updated value - target_versionfile = os.path.join(self.build_lib, versionfile_build) - print("UPDATING %s" % target_versionfile) - if os.path.exists(target_versionfile): - os.unlink(target_versionfile) - f = open(target_versionfile, "w") - f.write(SHORT_VERSION_PY % versions) - f.close() +def get_version(): + return get_versions()["version"] -class cmd_build(_build): - def run(self): - _build.run(self) - - versions = get_versions(verbose=True) - # now locate _version.py in the new build/ directory and replace it - # with an updated value - target_versionfile = os.path.join(self.build_lib, versionfile_build) - print("UPDATING %s" % target_versionfile) - if os.path.exists(target_versionfile): - os.unlink(target_versionfile) - f = open(target_versionfile, "w") - f.write(SHORT_VERSION_PY % versions) - f.close() -if 'cx_Freeze' in sys.modules: # cx_freeze enabled? - from cx_Freeze.dist import build_exe as _build_exe +def get_cmdclass(): + if "versioneer" in sys.modules: + del sys.modules["versioneer"] + # this fixes the "python setup.py develop" case (also 'install' and + # 'easy_install .'), in which subdependencies of the main project are + # built (using setup.py bdist_egg) in the same python process. Assume + # a main project A and a dependency B, which use different versions + # of Versioneer. A's setup.py imports A's Versioneer, leaving it in + # sys.modules by the time B's setup.py is executed, causing B to run + # with the wrong versioneer. Setuptools wraps the sub-dep builds in a + # sandbox that restores sys.modules to it's pre-build state, so the + # parent is protected against the child's "import versioneer". By + # removing ourselves from sys.modules here, before the child build + # happens, we protect the child from the parent's versioneer too. + # Also see https://github.com/warner/python-versioneer/issues/52 + + cmds = {} + + # we add "version" to both distutils and setuptools + from distutils.core import Command + + class cmd_version(Command): + description = "report generated version string" + user_options = [] + boolean_options = [] + + def initialize_options(self): + pass + + def finalize_options(self): + pass - class cmd_build_exe(_build_exe): def run(self): - versions = get_versions(verbose=True) - target_versionfile = versionfile_source + vers = get_versions(verbose=True) + print("Version: %s" % vers["version"]) + print(" full-revisionid: %s" % vers.get("full-revisionid")) + if "branch" in vers: + print(" branch: %s" % vers["branch"]) + print(" dirty: %s" % vers.get("dirty")) + if vers["error"]: + print(" error: %s" % vers["error"]) + cmds["version"] = cmd_version + + # we override "build_py" in both distutils and setuptools + # + # most invocation pathways end up running build_py: + # distutils/build -> build_py + # distutils/install -> distutils/build ->.. + # setuptools/bdist_wheel -> distutils/install ->.. + # setuptools/bdist_egg -> distutils/install_lib -> build_py + # setuptools/install -> bdist_egg ->.. + # setuptools/develop -> ? + + from distutils.command.build_py import build_py as _build_py + + class cmd_build_py(_build_py): + def run(self): + root = get_root() + cfg = get_config_from_root(root) + versions = get_versions() + _build_py.run(self) + # now locate _version.py in the new build/ directory and replace + # it with an updated value + if cfg.versionfile_build: + target_versionfile = os.path.join(self.build_lib, + cfg.versionfile_build) + print("UPDATING %s" % target_versionfile) + write_to_version_file(target_versionfile, versions) + cmds["build_py"] = cmd_build_py + + if "cx_Freeze" in sys.modules: # cx_freeze enabled? + from cx_Freeze.dist import build_exe as _build_exe + + class cmd_build_exe(_build_exe): + def run(self): + root = get_root() + cfg = get_config_from_root(root) + versions = get_versions() + target_versionfile = cfg.versionfile_source + print("UPDATING %s" % target_versionfile) + write_to_version_file(target_versionfile, versions) + + _build_exe.run(self) + os.unlink(target_versionfile) + with open(cfg.versionfile_source, "w") as f: + LONG = LONG_VERSION_PY[cfg.VCS] + f.write(LONG % + {"DOLLAR": "$", + "STYLE": cfg.style, + "TAG_PREFIX": cfg.tag_prefix, + "PARENTDIR_PREFIX": cfg.parentdir_prefix, + "VERSIONFILE_SOURCE": cfg.versionfile_source, + }) + cmds["build_exe"] = cmd_build_exe + del cmds["build_py"] + + # we override different "sdist" commands for both environments + if "setuptools" in sys.modules: + from setuptools.command.sdist import sdist as _sdist + else: + from distutils.command.sdist import sdist as _sdist + + class cmd_sdist(_sdist): + def run(self): + versions = get_versions() + self._versioneer_generated_versions = versions + # unless we update this, the command will keep using the old + # version + self.distribution.metadata.version = versions["version"] + return _sdist.run(self) + + def make_release_tree(self, base_dir, files): + root = get_root() + cfg = get_config_from_root(root) + _sdist.make_release_tree(self, base_dir, files) + # now locate _version.py in the new base_dir directory + # (remembering that it may be a hardlink) and replace it with an + # updated value + target_versionfile = os.path.join(base_dir, cfg.versionfile_source) print("UPDATING %s" % target_versionfile) - os.unlink(target_versionfile) - f = open(target_versionfile, "w") - f.write(SHORT_VERSION_PY % versions) - f.close() - _build_exe.run(self) - os.unlink(target_versionfile) - f = open(versionfile_source, "w") - f.write(LONG_VERSION_PY % {"DOLLAR": "$", - "TAG_PREFIX": tag_prefix, - "PARENTDIR_PREFIX": parentdir_prefix, - "VERSIONFILE_SOURCE": versionfile_source, - "LOOKUPFILE": '"%s"' % lookupfile if lookupfile is not None else "None", - }) - f.close() - -class cmd_sdist(_sdist): - def run(self): - versions = get_versions(verbose=True) - self._versioneer_generated_versions = versions - # unless we update this, the command will keep using the old version - self.distribution.metadata.version = versions["version"] - return _sdist.run(self) - - def make_release_tree(self, base_dir, files): - _sdist.make_release_tree(self, base_dir, files) - # now locate _version.py in the new base_dir directory (remembering - # that it may be a hardlink) and replace it with an updated value - target_versionfile = os.path.join(base_dir, versionfile_source) - print("UPDATING %s" % target_versionfile) - os.unlink(target_versionfile) - f = open(target_versionfile, "w") - f.write(SHORT_VERSION_PY % self._versioneer_generated_versions) - f.close() + write_to_version_file(target_versionfile, + self._versioneer_generated_versions) + cmds["sdist"] = cmd_sdist + + return cmds + + +CONFIG_ERROR = """ +setup.cfg is missing the necessary Versioneer configuration. You need +a section like: + + [versioneer] + VCS = git + style = pep440 + versionfile_source = src/myproject/_version.py + versionfile_build = myproject/_version.py + tag_prefix = + parentdir_prefix = myproject- + +You will also need to edit your setup.py to use the results: + + import versioneer + setup(version=versioneer.get_version(), + cmdclass=versioneer.get_cmdclass(), ...) + +Please read the docstring in ./versioneer.py for configuration instructions, +edit setup.cfg, and re-run the installer or 'python versioneer.py setup'. +""" + +SAMPLE_CONFIG = """ +# See the docstring in versioneer.py for instructions. Note that you must +# re-run 'versioneer.py setup' after changing this section, and commit the +# resulting files. + +[versioneer] +#VCS = git +#style = pep440 +#versionfile_source = +#versionfile_build = +#tag_prefix = +#parentdir_prefix = +#lookupfile = + +""" INIT_PY_SNIPPET = """ from ._version import get_versions @@ -1039,85 +1988,127 @@ def make_release_tree(self, base_dir, files): del get_versions """ -class cmd_update_files(Command): - description = "install/upgrade Versioneer files: __init__.py SRC/_version.py" - user_options = [] - boolean_options = [] - def initialize_options(self): - pass - def finalize_options(self): - pass - def run(self): - print(" creating %s" % versionfile_source) - f = open(versionfile_source, "w") - f.write(LONG_VERSION_PY % {"DOLLAR": "$", - "TAG_PREFIX": tag_prefix, - "PARENTDIR_PREFIX": parentdir_prefix, - "VERSIONFILE_SOURCE": versionfile_source, - "LOOKUPFILE": '"%s"' % lookupfile if lookupfile is not None else "None", - }) - f.close() - ipy = os.path.join(os.path.dirname(versionfile_source), "__init__.py") +def do_setup(): + root = get_root() + try: + cfg = get_config_from_root(root) + except (EnvironmentError, configparser.NoSectionError, + configparser.NoOptionError) as e: + if isinstance(e, (EnvironmentError, configparser.NoSectionError)): + print("Adding sample versioneer config to setup.cfg", + file=sys.stderr) + with open(os.path.join(root, "setup.cfg"), "a") as f: + f.write(SAMPLE_CONFIG) + print(CONFIG_ERROR, file=sys.stderr) + return 1 + + print(" creating %s" % cfg.versionfile_source) + with open(cfg.versionfile_source, "w") as f: + LONG = LONG_VERSION_PY[cfg.VCS] + f.write(LONG % {"DOLLAR": "$", + "STYLE": cfg.style, + "TAG_PREFIX": cfg.tag_prefix, + "PARENTDIR_PREFIX": cfg.parentdir_prefix, + "VERSIONFILE_SOURCE": cfg.versionfile_source, + }) + + ipy = os.path.join(os.path.dirname(cfg.versionfile_source), + "__init__.py") + if os.path.exists(ipy): try: - old = open(ipy, "r").read() + with open(ipy, "r") as f: + old = f.read() except EnvironmentError: old = "" if INIT_PY_SNIPPET not in old: print(" appending to %s" % ipy) - f = open(ipy, "a") - f.write(INIT_PY_SNIPPET) - f.close() + with open(ipy, "a") as f: + f.write(INIT_PY_SNIPPET) else: print(" %s unmodified" % ipy) - - # Make sure both the top-level "versioneer.py" and versionfile_source - # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so - # they'll be copied into source distributions. Pip won't be able to - # install the package without this. - manifest_in = os.path.join(get_root(), "MANIFEST.in") - simple_includes = set() - try: - for line in open(manifest_in, "r").readlines(): + else: + print(" %s doesn't exist, ok" % ipy) + ipy = None + + # Make sure both the top-level "versioneer.py" and versionfile_source + # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so + # they'll be copied into source distributions. Pip won't be able to + # install the package without this. + manifest_in = os.path.join(root, "MANIFEST.in") + simple_includes = set() + try: + with open(manifest_in, "r") as f: + for line in f: if line.startswith("include "): for include in line.split()[1:]: simple_includes.add(include) - except EnvironmentError: - pass - # That doesn't cover everything MANIFEST.in can do - # (http://docs.python.org/2/distutils/sourcedist.html#commands), so - # it might give some false negatives. Appending redundant 'include' - # lines is safe, though. - if "versioneer.py" not in simple_includes: - print(" appending 'versioneer.py' to MANIFEST.in") - f = open(manifest_in, "a") + except EnvironmentError: + pass + # That doesn't cover everything MANIFEST.in can do + # (http://docs.python.org/2/distutils/sourcedist.html#commands), so + # it might give some false negatives. Appending redundant 'include' + # lines is safe, though. + if "versioneer.py" not in simple_includes: + print(" appending 'versioneer.py' to MANIFEST.in") + with open(manifest_in, "a") as f: f.write("include versioneer.py\n") - f.close() - else: - print(" 'versioneer.py' already in MANIFEST.in") - if versionfile_source not in simple_includes: - print(" appending versionfile_source ('%s') to MANIFEST.in" % - versionfile_source) - f = open(manifest_in, "a") - f.write("include %s\n" % versionfile_source) - f.close() - else: - print(" versionfile_source already in MANIFEST.in") + else: + print(" 'versioneer.py' already in MANIFEST.in") + if cfg.versionfile_source not in simple_includes: + print(" appending versionfile_source ('%s') to MANIFEST.in" % + cfg.versionfile_source) + with open(manifest_in, "a") as f: + f.write("include %s\n" % cfg.versionfile_source) + else: + print(" versionfile_source already in MANIFEST.in") - # Make VCS-specific changes. For git, this means creating/changing - # .gitattributes to mark _version.py for export-time keyword - # substitution. - do_vcs_install(manifest_in, versionfile_source, ipy) + # Make VCS-specific changes. For git, this means creating/changing + # .gitattributes to mark _version.py for export-time keyword + # substitution. + do_vcs_install(manifest_in, cfg.versionfile_source, ipy) + return 0 -def get_cmdclass(): - cmds = {'version': cmd_version, - 'versioneer': cmd_update_files, - 'build': cmd_build, - 'build_py': cmd_build_py, - 'sdist': cmd_sdist, - } - if 'cx_Freeze' in sys.modules: # cx_freeze enabled? - cmds['build_exe'] = cmd_build_exe - del cmds['build'] - return cmds +def scan_setup_py(): + found = set() + setters = False + errors = 0 + with open("setup.py", "r") as f: + for line in f.readlines(): + if "import versioneer" in line: + found.add("import") + if "versioneer.get_cmdclass()" in line: + found.add("cmdclass") + if "versioneer.get_version()" in line: + found.add("get_version") + if "versioneer.VCS" in line: + setters = True + if "versioneer.versionfile_source" in line: + setters = True + if len(found) != 3: + print("") + print("Your setup.py appears to be missing some important items") + print("(but I might be wrong). Please make sure it has something") + print("roughly like the following:") + print("") + print(" import versioneer") + print(" setup( version=versioneer.get_version(),") + print(" cmdclass=versioneer.get_cmdclass(), ...)") + print("") + errors += 1 + if setters: + print("You should remove lines like 'versioneer.VCS = ' and") + print("'versioneer.versionfile_source = ' . This configuration") + print("now lives in setup.cfg, and should be removed from setup.py") + print("") + errors += 1 + return errors + +if __name__ == "__main__": + cmd = sys.argv[1] + if cmd == "setup": + errors = do_setup() + errors += scan_setup_py() + if errors: + sys.exit(1)